Marvin: G and T debug info

common/game/movealgo.cpp

@@ -493,6 +493,12 @@ void MoveAlgo::clearSpeed() {
   fallCount   = 0;
   }
 
+void MoveAlgo::startFall(const Tempest::Vec3& speed) {
+  fallSpeed = speed;
+  fallCount = 0;
+  setState(InAir);
+  }
+
 bool MoveAlgo::accessDamFly(float dx, float dz, char hitType) {
   if(flags!=Run && flags!=Falling && flags!=InAir)
     return false;
@@ -984,7 +990,11 @@ void MoveAlgo::onMoveFailed(const Tempest::Vec3& dp, const DynamicWorld::Collisi
     case Npc::GT_EnemyG:
     case Npc::GT_Way:
     case Npc::GT_Point: {
-      if(info.npc!=nullptr || info.preFall) {
+      if(npc.moveHint()==Npc::GT_Point && npc.isPlayer()) {
+        // marvin 'Y': give up on obstacle
+        npc.clearGoTo();
+        }
+      else if(info.npc!=nullptr || info.preFall) {
         npc.setDirection(npc.rotation()+stp);
         } else {
         auto jc = npc.tryJump();

common/game/movealgo.h

@@ -59,6 +59,7 @@ class MoveAlgo final {
 
     void    multSpeed(float s){ mulSpeed=s; }
     void    clearSpeed();
+    void    startFall(const Tempest::Vec3& speed);
     bool    accessDamFly(float dx, float dz, char hitType);
 
     bool    testSlide(const Tempest::Vec3& p, DynamicWorld::CollisionTest& out) const;

common/game/playercontrol.cpp

@@ -6,6 +6,7 @@
 #include "world/objects/item.h"
 #include "world/objects/interactive.h"
 #include "world/world.h"
+#include "game/damagecalculator.h"
 #include "ui/dialogmenu.h"
 #include "ui/inventorymenu.h"
 #include "gothic.h"
@@ -45,7 +46,7 @@ void PlayerControl::setTarget(Npc *other) {
     }
   }
 
-void PlayerControl::onKeyPressed(KeyCodec::Action a, Tempest::KeyEvent::KeyType key, KeyCodec::Mapping mapping) {
+void PlayerControl::onKeyPressed(KeyCodec::Action a, Tempest::KeyEvent::KeyType key, KeyCodec::Mapping mapping, Tempest::Event::Modifier mod) {
   auto       w    = Gothic::inst().world();
   auto       c    = Gothic::inst().camera();
   auto       pl   = w  ? w->player() : nullptr;
@@ -195,6 +196,18 @@ void PlayerControl::onKeyPressed(KeyCodec::Action a, Tempest::KeyEvent::KeyType
 
   if(a==Action::K_O && Gothic::inst().isMarvinEnabled())
     marvinO();
+  if(a==Action::K_K && Gothic::inst().isMarvinEnabled())
+    marvinK();
+  if(a==Action::K_F8 && Gothic::inst().isMarvinEnabled())
+    marvinF8();
+  if(key==Tempest::KeyEvent::K_H && Gothic::inst().isMarvinEnabled() && Gothic::inst().settingsGetI("GAME","usePotionKeys")==0)
+    marvinH(mod);
+  if(a==Action::K_Y && Gothic::inst().isMarvinEnabled())
+    marvinY();
+  if(a==Action::K_G && Gothic::inst().isMarvinEnabled())
+    marvinG(mod);
+  if(a==Action::K_T && Gothic::inst().isMarvinEnabled())
+    marvinT(mod);
 
   ctrl[a] = true;
   }
@@ -446,33 +459,32 @@ void PlayerControl::clearInput() {
   std::memset(wctrl,0,sizeof(wctrl));
   }
 
-void PlayerControl::marvinF8(uint64_t dt) {
+void PlayerControl::marvinF8() {
   auto w = Gothic::inst().world();
   if(w==nullptr || w->player()==nullptr)
     return;
 
+  // reset position, like oCNpc::ResetPos
   auto& pl  = *w->player();
-  auto  pos = pl.position();
+  auto  pos = pl.position() + Tempest::Vec3(0,150,0);
   float rot = pl.rotationRad();
-  float s   = std::sin(rot), c = std::cos(rot);
-
-  Tempest::Vec3 dp(c,0.8f,s);
-  pos += dp*6000*float(dt)/1000.f;
+  // forward impulse 30000, player mass 80
+  auto  dp  = Tempest::Vec3(std::cos(rot), 0, std::sin(rot)) * (30000.f/80.f/1000.f);
 
   pl.changeAttribute(ATR_HITPOINTS,pl.attribute(ATR_HITPOINTSMAX),false);
   pl.changeAttribute(ATR_MANA,     pl.attribute(ATR_MANAMAX),     false);
   pl.clearState(false);
-  pl.clearSpeed();
   pl.clearAiQueue();
   pl.setPosition(pos);
   pl.setInteraction(nullptr,true);
   pl.setAnim(AnimationSolver::Idle);
+  pl.startFall(dp);
 
   if(auto c = Gothic::inst().camera())
     c->reset();
   }
 
-void PlayerControl::marvinK(uint64_t dt) {
+void PlayerControl::marvinK() {
   auto w = Gothic::inst().world();
   if (w == nullptr || w->player() == nullptr)
     return;
@@ -483,13 +495,15 @@ void PlayerControl::marvinK(uint64_t dt) {
   float s = std::sin(rot), c = std::cos(rot);
 
   Tempest::Vec3 dp(c, 0.0f, s);
-  pos += dp * 6000 * float(dt) / 1000.f;
+  pos += dp * 300;
 
   pl.clearState(false);
   pl.clearSpeed();
   pl.setPosition(pos);
   pl.setInteraction(nullptr,true);
   // pl.setAnim(AnimationSolver::Idle); // Original G2 behaviour: K doesn't stop running
+  if(auto c = Gothic::inst().camera())
+    c->reset(&pl);
   }
 
 void PlayerControl::marvinO() {
@@ -502,6 +516,82 @@ void PlayerControl::marvinO() {
   w->setPlayer(target);
   }
 
+void PlayerControl::marvinH(Tempest::Event::Modifier mod) {
+  auto w = Gothic::inst().world();
+  if(w == nullptr || w->player() == nullptr)
+    return;
+
+  auto& pl = *w->player();
+  if(mod & Tempest::Event::M_Shift) {
+    // hit focus npc
+    if(auto npc = focus().npc)
+      npc->takeDamage(pl,nullptr);
+    return;
+    }
+  if(mod & Tempest::Event::M_Ctrl) {
+    // damage without attacker
+    DamageCalculator::Damage dmg = {};
+    dmg[zenkit::DamageType::FIRE]  = 5;
+    dmg[zenkit::DamageType::MAGIC] = 5;
+    auto ret = DamageCalculator::damageValue(pl,pl,nullptr,true,dmg,COLL_DOEVERYTHING);
+    if(ret.hasHit && !ret.invincible)
+      pl.changeAttribute(ATR_HITPOINTS,-ret.value,false);
+    return;
+    }
+  // hit self, like in vanilla
+  pl.takeDamage(pl,nullptr);
+  }
+
+void PlayerControl::marvinY() {
+  auto w = Gothic::inst().world();
+  if(w == nullptr || w->player() == nullptr)
+    return;
+
+  auto& pl = *w->player();
+  if(!pl.setInteraction(nullptr))
+    return;
+
+  float rot = pl.rotationRad();
+  float s = std::sin(rot), c = std::cos(rot);
+  pl.goToPoint(pl.position() + Tempest::Vec3(c, 0.0f, s) * 1000);
+  }
+
+void PlayerControl::marvinG(Tempest::Event::Modifier mod) {
+  auto w = Gothic::inst().world();
+  if(w == nullptr || w->player() == nullptr)
+    return;
+
+  // show ai of player or focus npc, only one at time
+  Npc* npc = w->player();
+  if(mod & Tempest::Event::M_Shift)
+    npc = focus().npc;
+  for(uint32_t i=0; i<w->npcCount(); ++i) {
+    auto n = w->npcById(i);
+    if(n!=nullptr && n!=npc)
+      n->dbgAi = false;
+    }
+  if(npc!=nullptr)
+    npc->dbgAi = !npc->dbgAi;
+  }
+
+void PlayerControl::marvinT(Tempest::Event::Modifier mod) {
+  auto w = Gothic::inst().world();
+  if(w == nullptr || w->player() == nullptr)
+    return;
+
+  if(mod & Tempest::Event::M_Shift) {
+    w->player()->dbgInfo = !w->player()->dbgInfo;
+    return;
+    }
+  auto f = focus();
+  if(f.npc!=nullptr)
+    f.npc->dbgInfo = !f.npc->dbgInfo;
+  else if(f.interactive!=nullptr)
+    f.interactive->dbgInfo = !f.interactive->dbgInfo;
+  else if(f.item!=nullptr)
+    f.item->dbgInfo = !f.item->dbgInfo;
+  }
+
 Focus PlayerControl::findFocus(const Focus* prev) const {
   auto w = Gothic::inst().world();
   auto c = Gothic::inst().camera();
@@ -568,10 +658,6 @@ bool PlayerControl::tickMove(uint64_t dt) {
   if(tickCameraMove(dt))
     return true;
 
-  if(ctrl[Action::K_F8] && Gothic::inst().isMarvinEnabled())
-    marvinF8(dt);
-  if(ctrl[Action::K_K] && Gothic::inst().isMarvinEnabled())
-    marvinK(dt);
   cacheFocus = ctrl[Action::ActionGeneric];
   if(camera!=nullptr)
     camera->setLookBack(ctrl[Action::LookBack]);

common/game/playercontrol.h

@@ -21,7 +21,7 @@ class PlayerControl final {
     PlayerControl(DialogMenu& dlg, InventoryMenu& inv);
     ~PlayerControl();
 
-    void  onKeyPressed (KeyCodec::Action a, Tempest::Event::KeyType key, KeyCodec::Mapping mapping);
+    void  onKeyPressed (KeyCodec::Action a, Tempest::Event::KeyType key, KeyCodec::Mapping mapping, Tempest::Event::Modifier mod = Tempest::Event::M_NoModifier);
     void  onKeyReleased(KeyCodec::Action a, KeyCodec::Mapping mapping);
     bool  isPressed(KeyCodec::Action a) const;
     void  onRotateMouse(float dAngleX, float dAngleY);
@@ -158,9 +158,13 @@ class PlayerControl final {
 
     void           setupSettings();
     bool           canInteract() const;
-    void           marvinF8(uint64_t dt);
-    void           marvinK(uint64_t dt);
+    void           marvinF8();
+    void           marvinK();
     void           marvinO();
+    void           marvinH(Tempest::Event::Modifier mod);
+    void           marvinY();
+    void           marvinG(Tempest::Event::Modifier mod);
+    void           marvinT(Tempest::Event::Modifier mod);
     void           toggleWalkMode();
     void           toggleSneakMode();
     void           moveFocus(FocusAction act);

common/graphics/mesh/pose.h

@@ -69,6 +69,8 @@ class Pose final {
     bool               isInAnim(std::string_view           sq) const;
     bool               isInAnim(const Animation::Sequence* sq) const;
     bool               hasAnim() const;
+    template<class F>
+    void               forEachLayer(F f) const { for(auto& i:lay) f(*i.seq, i.sAnim); }
     uint64_t           animationTotalTime() const;
     uint64_t           atkTotalTime() const;
 

common/mainwindow.cpp

@@ -282,6 +282,11 @@ void MainWindow::paintEvent(PaintEvent& event) {
       DbgPainter dbg(p,c->viewProj(),w(),h());
       player.drawVobRay(dbg);
       }
+
+    if(Gothic::inst().isMarvinEnabled() && c!=nullptr) {
+      DbgPainter dbg(p,c->viewProj(),w(),h());
+      world->drawDbgInfo(dbg);
+      }
     }
 
   if(auto wx = Gothic::inst().worldView()) {
@@ -455,7 +460,7 @@ void MainWindow::keyDownEvent(KeyEvent &event) {
 
   auto act     = keycodec.tr(event);
   auto mapping = keycodec.mapping(event);
-  player.onKeyPressed(act,event.key,mapping);
+  player.onKeyPressed(act,event.key,mapping,event.modifier);
 
   if(event.key==Event::K_F11) {
     auto tex = renderer.screenshoot(cmdId, Size(int(swapchain.w()),int(swapchain.h())));

common/utils/keycodec.cpp

@@ -127,6 +127,12 @@ KeyCodec::Action KeyCodec::tr(Tempest::KeyEvent const& e) const {
     return K_K;
   if(e.key == Tempest::Event::K_O)
     return K_O;
+  if(e.key == Tempest::Event::K_Y)
+    return K_Y;
+  if(e.key == Tempest::Event::K_G)
+    return K_G;
+  if(e.key == Tempest::Event::K_T)
+    return K_T;
   return Idle;
   }
 

common/utils/keycodec.h

@@ -67,6 +67,9 @@ class KeyCodec final {
       K_F8,    // Marvin Mode's F8
       K_K,     // Marvin Mode's K
       K_O,     // Marvin Mode's O
+      K_Y,     // Marvin Mode's Y
+      K_G,     // Marvin Mode's G
+      K_T,     // Marvin Mode's T
       K_Del, // Settings menu
 
       Last

common/world/aiqueue.h

@@ -34,6 +34,7 @@ class AiQueue {
     void     load(Serialize& fin);
 
     size_t   size() const { return aiActions.size(); }
+    auto     operator[](size_t i) const -> const AiAction& { return aiActions[i]; }
     void     clear();
     void     pushBack (AiAction&& a);
     void     pushFront(AiAction&& a);

common/world/objects/interactive.cpp

@@ -190,6 +190,12 @@ void Interactive::drawVobBox(DbgPainter& p) const {
     }
   }
 
+void Interactive::drawDbgInfo(DbgPainter& p) const {
+  // like oCVob::ShowDebugInfo for oCMobInter
+  auto pos = displayPosition();
+  p.drawText(pos, string_frm("ST:",state," SC:",schemeName()));
+  }
+
 void Interactive::drawVobRay(DbgPainter& p, const Npc& npc) const {
   auto head = npc.mapHeadBone();
 

common/world/objects/interactive.h

@@ -33,6 +33,7 @@ class Interactive : public Vob {
 
     void                drawVobBox(DbgPainter& p) const;
     void                drawVobRay(DbgPainter& p, const Npc& npc) const;
+    void                drawDbgInfo(DbgPainter& p) const;
 
     void                resetPositionToTA(int32_t state);
     void                updateAnimation(uint64_t dt);

common/world/objects/item.cpp

@@ -8,6 +8,7 @@
 #include "world/world.h"
 #include "utils/versioninfo.h"
 #include "utils/fileext.h"
+#include "utils/string_frm.h"
 #include "utils/dbgpainter.h"
 
 using namespace Tempest;
@@ -93,6 +94,11 @@ void Item::drawVobBox(DbgPainter& p) const {
     }
   }
 
+void Item::drawDbgInfo(DbgPainter& p) const {
+  auto pos = midPosition();
+  p.drawText(pos, string_frm(displayName()," x",count()));
+  }
+
 void Item::drawVobRay(DbgPainter& p, const Npc& npc) const {
   if(auto bbox = this->bBox()) {
     // npc eyesight height

common/world/objects/item.h

@@ -29,6 +29,7 @@ class Item : public Vob {
 
     void    drawVobBox(DbgPainter& p) const;
     void    drawVobRay(DbgPainter& p, const Npc& npc) const;
+    void    drawDbgInfo(DbgPainter& p) const;
 
     void    save(Serialize& fout) const override;