ladder in progress

#120

game/game/movealgo.cpp

@@ -43,10 +43,11 @@ void MoveAlgo::tickMobsi(uint64_t dt) {
     return;
 
   auto dp  = animMoveSpeed(dt);
+  if(!npc.interactive()->isLadder())
+    dp.y = 0;
+
   auto pos = npc.position();
-  pos.x+=dp.x;
-  //pos.x+=dp.y;
-  pos.z+=dp.z;
+  pos += dp;
   npc.setPosition(pos);
   setAsSlide(false);
   setInAir  (false);

game/game/playercontrol.cpp

@@ -44,6 +44,10 @@ void PlayerControl::onKeyPressed(KeyCodec::Action a, Tempest::KeyEvent::KeyType
       processPickLock(*pl,*inter,a);
       return;
       }
+    if(inter->isLadder()) {
+      processLadder(*pl,*inter,a);
+      return;
+      }
     }
 
   if(pl!=nullptr) {
@@ -787,12 +791,12 @@ void PlayerControl::implMoveMobsi(Npc& pl, uint64_t /*dt*/) {
     }
 
   if(inter->needToLockpick(pl) && !inter->isCracked()) {
-    ;
+    return;
     }
 
   if(inter->isStaticState() && !inter->isDetachState(pl)) {
     if(inter->canQuitAtState(pl,inter->stateId())) {
-      pl.setInteraction(nullptr,true);
+      pl.setInteraction(nullptr,false);
       }
     }
   }
@@ -840,6 +844,17 @@ void PlayerControl::processPickLock(Npc& pl, Interactive& inter, KeyCodec::Actio
     }
   }
 
+void PlayerControl::processLadder(Npc& pl, Interactive& inter, KeyCodec::Action key) {
+  if(key==KeyCodec::Back) {
+    pl.setInteraction(nullptr);
+    return;
+    }
+
+  if(key==KeyCodec::Forward) {
+    inter.nextState(pl);
+    }
+  }
+
 void PlayerControl::quitPicklock(Npc& pl) {
   inv.close();
   pickLockProgress = 0;

game/game/playercontrol.h

@@ -108,6 +108,7 @@ class PlayerControl final {
     void           implMove(uint64_t dt);
     void           implMoveMobsi(Npc& pl, uint64_t dt);
     void           processPickLock(Npc& pl, Interactive& inter, KeyCodec::Action key);
+    void           processLadder(Npc& pl, Interactive& inter, KeyCodec::Action key);
     void           quitPicklock(Npc& pl);
     void           setPos(std::array<float,3> a, uint64_t dt, float speed);
     void           assignRunAngle(Npc& pl, float rotation, uint64_t dt);

game/world/objects/interactive.cpp

@@ -60,6 +60,17 @@ Interactive::Interactive(Vob* parent, World &world, ZenLoad::zCVobData& vob, boo
   setVisual(vob);
   mdlVisual = std::move(vob.visual);
 
+  if(isLadder() && !mdlVisual.empty()) {
+    // NOTE: there must be else way to determinate steps count, nut for now - we parse filename
+    size_t at = mdlVisual.size()-1;
+    while(at>0 && !std::isdigit(mdlVisual[at]))
+      --at;
+    while(at>0 && std::isdigit(mdlVisual[at-1]))
+      --at;
+    stepsCount = std::atoi(mdlVisual.c_str()+at);
+    stateNum   = stepsCount;
+    }
+
   world.addInteractive(this);
   }
 
@@ -214,10 +225,10 @@ void Interactive::implTick(Pos& p, uint64_t /*dt*/) {
     return;
     }
 
-  const bool atach = (p.attachMode^reverseState);
+  const bool attach = (p.attachMode^reverseState);
 
   if(!loopState) {
-    if(stateNum==state && atach) {
+    if(stateNum==state && attach) {
       invokeStateFunc(npc);
       loopState = true;
       }
@@ -227,7 +238,7 @@ void Interactive::implTick(Pos& p, uint64_t /*dt*/) {
       }
     }
 
-  if(!atach && state==0) {
+  if(!attach && state==0) {
     implQuitInteract(p);
     return;
     }
@@ -261,15 +272,23 @@ void Interactive::implTick(Pos& p, uint64_t /*dt*/) {
     invokeStateFunc(npc);
     }
 
-  int prev = state;
-  if(atach) {
+  const int prev = state;
+  if(attach) {
     setState(std::min(stateNum,state+1));
     } else {
     setState(std::max(0,state-1));
     }
   loopState = (prev==state);
   }
 
+void Interactive::nextState(Npc& npc) {
+  const int prev = state;
+  if(!setAnim(&npc,Anim::In))
+    return;
+  setState(std::min(stateNum,state+1));
+  loopState = (prev==state);
+  }
+
 void Interactive::implQuitInteract(Interactive::Pos &p) {
   if(p.user==nullptr)
     return;
@@ -394,6 +413,10 @@ bool Interactive::isContainer() const {
   return vobType==ZenLoad::zCVobData::VT_oCMobContainer;
   }
 
+bool Interactive::isLadder() const {
+  return vobType==ZenLoad::zCVobData::VT_oCMobLadder;
+  }
+
 bool Interactive::needToLockpick(const Npc& pl) const {
   const size_t keyInst = keyInstance.empty() ? size_t(-1) : world.script().getSymbolIndex(keyInstance.c_str());
   if(keyInst!=size_t(-1) && pl.inventory().itemCount(keyInst)>0)
@@ -576,6 +599,8 @@ bool Interactive::isDetachState(const Npc& npc) const {
 bool Interactive::canQuitAtState(Npc& npc, int32_t state) const {
   if(state<0)
     return true;
+  //if(isLadder())
+  //  return false;
   auto scheme   = schemeName();
   auto pos      = posSchemeName();
   char frm[256] = {};
@@ -657,6 +682,11 @@ bool Interactive::attach(Npc &npc) {
   }
 
 bool Interactive::dettach(Npc &npc, bool quick) {
+  if(!quick) {
+    if(!npc.setAnim(Npc::Anim::Idle))
+      return false;
+    }
+
   for(auto& i:attPos) {
     if(i.user==&npc && i.attachMode) {
       if(canQuitAtState(*i.user,state)) {
@@ -669,6 +699,8 @@ bool Interactive::dettach(Npc &npc, bool quick) {
         i.user       = nullptr;
         i.attachMode = false;
         npc.quitIneraction();
+        if(!quick)
+          npc.setAnim(Npc::Anim::Idle);
         }
       else {
         i.attachMode = false;

game/world/objects/interactive.h

@@ -52,6 +52,7 @@ class Interactive : public Vob {
     std::string_view    posSchemeName() const;
 
     bool                isContainer() const;
+    bool                isLadder() const;
     std::string_view    pickLockCode() const { return pickLockStr; }
     void                setAsCracked(bool c) { isLockCracked = c; }
     bool                isCracked() const { return isLockCracked; }
@@ -75,6 +76,8 @@ class Interactive : public Vob {
     auto                animNpc(const AnimationSolver &solver, Anim t) -> const Animation::Sequence*;
     void                marchInteractives(DbgPainter& p) const;
 
+    void                nextState(Npc& owner);
+
   protected:
     Tempest::Matrix4x4  nodeTranform(const char* nodeName) const;
     void                moveEvent() override;
@@ -138,6 +141,8 @@ class Interactive : public Vob {
     std::string                  keyInstance;
     std::string                  pickLockStr;
     Inventory                    invent;
+    // oCMobLadder
+    int                          stepsCount = 0;
 
     int32_t                      state         = -1;
     bool                         reverseState  = false;

game/world/objects/npc.cpp

@@ -3453,8 +3453,7 @@ bool Npc::setInteraction(Interactive *id, bool quick) {
     return true;
 
   if(currentInteract!=nullptr) {
-    currentInteract->dettach(*this,quick);
-    return false;
+    return currentInteract->dettach(*this,quick);
     }
 
   if(id==nullptr)

game/world/worldobjects.cpp

@@ -714,7 +714,7 @@ void WorldObjects::marchInteractives(DbgPainter &p) const {
   static bool ddraw=false;
   if(!ddraw)
     return;
-  for(auto& i:interactiveObj){
+  for(auto& i:interactiveObj) {
     auto m = p.mvp;
     m.mul(i->transform());