add(Actor): ActorRespawnSystem and ActorRespawnTimer

Author: targun123

game_server/CMakeLists.txt

@@ -6,4 +6,4 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_PROJECT_NAME}-common)
 
 file(GLOB_RECURSE SOURCES "*.cpp")
 file(GLOB_RECURSE HEADERS "*.hpp")
-target_sources(${PROJECT_NAME} PRIVATE $<TARGET_OBJECTS:${CMAKE_PROJECT_NAME}-common> ${SOURCES} ${HEADERS})
+target_sources(${PROJECT_NAME} PRIVATE $<TARGET_OBJECTS:${CMAKE_PROJECT_NAME}-common> ${SOURCES} ${HEADERS} "game/systems/ActorRespawnSystem.cpp")

game_server/game/World.cpp

@@ -22,6 +22,7 @@
 #include "components/ActorStatus.hpp"
 #include "components/CharacterStatus.hpp"
 #include "components/DeletionTimer.hpp"
+#include "components/ActorRespawnTimer.hpp"
 #include "components/Loot.hpp"
 #include "components/NpcAppearance.hpp"
 #include "components/PlayerAppearance.hpp"
@@ -37,6 +38,7 @@
 #include "systems/ActorDeletionTimerSystem.hpp"
 #include "systems/ActorAbnormalEffectSystem.hpp"
 #include "systems/ActorStatsUpdateSystem.hpp"
+#include "systems/ActorRespawnSystem.hpp"
 
 #include <l2cpp/CompileTimeConfig.hpp>
 
@@ -59,6 +61,26 @@ static void addGremlin()
         gremlin->setPosX(gremlin->position().x + (count++ % 2 ? 35 : -35));
 }
 
+static void addGoblin()
+{
+    static u32 count = 1;
+
+    if (auto const goblin = World::addMonster(3)) 
+        goblin->setPosX(goblin->position().x + (count++ % 2 ? 120 : -120));
+    
+        
+}
+
+static void addImp()
+{
+    static u32 count = 1;
+
+    if (auto const imp = World::addMonster(4)) 
+        imp->setPosX(imp->position().x + (count++ % 2 ? 200 : -200));
+    
+
+}
+
 static void addDummy()
 {
     static u32 count = 1;
@@ -82,6 +104,8 @@ void World::init()
     registerSystem<ActorAutoRegenSystem>();
     registerSystem<ActorDeletionTimerSystem>();
     registerSystem<ActorAbnormalEffectSystem>();
+    registerSystem<ActorRespawnSystem>();
+
     // Must be last!
     registerSystem<ActorStatsUpdateSystem>();
 
@@ -96,6 +120,10 @@ void World::init()
     addGremlin();
     addGremlin();
 
+    addGoblin();
+
+    addImp();
+
     addDummy();
     addDummy();
 }
@@ -285,6 +313,15 @@ void World::unscheduleForDeletion(Actor & a)
     a.delComponent<DeletionTimer>();
 }
 
+void World::scheduleNpcRespawn(Actor& deadActor, u32 npcId, ClockDuration delay)
+{
+    auto& timer = deadActor.getOrAddComponent<ActorRespawnTimer>();
+    timer.npcId = npcId;
+    timer.respawnDelay = delay;
+    timer.elapsedSinceDeath = ClockDuration::zero();
+    timer.spawnPosition = deadActor.position();
+}
+
 auto World::inGameTime() -> std::chrono::minutes
 {
     if constexpr (Config::isDebugMode)

game_server/game/World.hpp

@@ -57,6 +57,8 @@ class World
     static void scheduleForDeletion(Actor &, ClockDuration timeFromNow = ClockDuration::zero());
     static void unscheduleForDeletion(Actor &);
 
+    static void scheduleNpcRespawn(Actor& deadActor, u32 npcId, ClockDuration delay);
+
     static auto inGameTime() -> std::chrono::minutes;
 
     static auto subscribeToTarget(GameObjectId targetId, Actor const & listener) -> OptRef<Actor>;

game_server/game/actor/Actor.cpp

@@ -15,6 +15,7 @@
 #include "../components/Position.hpp"
 #include "../components/SkillDirectory.hpp"
 #include "../components/Stats.hpp"
+#include "../components/NpcAppearance.hpp"
 
 // ReSharper disable once CppUnusedIncludeDirective
 #include <l2cpp/details/Pimpl.hpp>
@@ -205,6 +206,15 @@ void Actor::die()
     delComponent<ActorAutoRegen>();
     delComponent<AttackStanceTimer>();
 
+    
+    if (auto const app = component<NpcAppearance>())
+    {
+        u32 tId = app->templateId();
+        auto const delay = std::chrono::seconds(2);
+        World::scheduleNpcRespawn(*this, tId, delay);
+    }
+    
+
     fire onDied();
 }
 

game_server/game/components/ActorRespawnTimer.hpp

@@ -0,0 +1,12 @@
+
+#pragma once
+#include "../ecs/Component.hpp"
+#include <l2cpp/Typedefs.hpp>
+#include "../components/Position.hpp"
+
+struct ActorRespawnTimer : public Component {
+    u32 npcId; 
+    ClockDuration respawnDelay;
+    ClockDuration elapsedSinceDeath{ ClockDuration::zero() };
+    Position spawnPosition;
+};

game_server/game/components/NpcAppearance.cpp

@@ -10,14 +10,22 @@ namespace
 
 NpcAppearance::NpcAppearance() noexcept
     : _id(baseId + 1) // Gremlin
+    , _templateId(1) // Gremlin
     , _titleColor(0)
     , _nameIsVisible(true)
 {}
 
 auto NpcAppearance::id()            const -> u32 { return _id;            }
+auto NpcAppearance::templateId()    const -> u32 { return _templateId;    }
 auto NpcAppearance::titleColor()    const -> u32 { return _titleColor;    }
 bool NpcAppearance::nameIsVisible() const        { return _nameIsVisible; }
 
-void NpcAppearance::setId(u32 const id)                  { _id = id < baseId ? baseId + id : id; }
+void NpcAppearance::setId(u32 const id)
+{
+    _templateId = id < baseId ? id : id - baseId;
+
+    _id = id < baseId ? baseId + id : id;
+}
+
 void NpcAppearance::setTitleColor(u32 const color)       { _titleColor = color;                  }
 void NpcAppearance::setNameIsVisible(bool const visible) { _nameIsVisible = visible;             }

game_server/game/components/NpcAppearance.hpp

@@ -13,6 +13,7 @@ class NpcAppearance : public ActorAppearance
 
 public:
     auto id() const -> u32;
+    auto templateId() const -> u32;
     auto titleColor() const -> u32;
     bool nameIsVisible() const;
 
@@ -22,6 +23,6 @@ class NpcAppearance : public ActorAppearance
     void setNameIsVisible(bool visible);
 
 private:
-    u32 _id, _titleColor;
+    u32 _id, _templateId, _titleColor;
     bool _nameIsVisible;
 };

game_server/game/systems/ActorRespawnSystem.cpp

@@ -0,0 +1,32 @@
+#include "ActorRespawnSystem.hpp"
+
+
+#include "../actor/Actor.hpp"       
+#include "../actor/Monster.hpp"
+#include "../components/ActorRespawnTimer.hpp"
+#include "../World.hpp"
+#include "../../network/packets/server/status/NpcStatusUpdatePacket.hpp"
+using namespace Network::Packet::Server;
+
+void ActorRespawnSystem::updateImpl(ClockDuration elapsed, Actor& actor)
+{
+    auto timer = actor.component<ActorRespawnTimer>();
+    if (!timer)
+    {
+        return;
+    }
+
+    timer->elapsedSinceDeath += elapsed;
+
+    if (timer->elapsedSinceDeath >= timer->respawnDelay)
+    {
+        if (auto const npc = World::addNpc(timer->npcId))
+        {
+            npc->setPosition(timer->spawnPosition);
+
+            World::broadcastAround(npc, NpcStatusUpdatePacket(npc));
+        }
+
+        actor.delComponent<ActorRespawnTimer>();
+    }
+}

game_server/game/systems/ActorRespawnSystem.hpp

@@ -0,0 +1,11 @@
+
+#pragma once
+
+// Project includes
+#include "../ecs/ActorSystem.hpp"
+
+
+struct ActorRespawnSystem : public ActorSystem
+{
+    void updateImpl(ClockDuration elapsed, Actor& actor) override;
+};