feat: dragon instance script

dCommon/Amf3.h

@@ -369,21 +369,8 @@ public:
 
 	template<typename AmfType = AMFArrayValue>
 	AmfType& PushDebug(const std::string_view name) {
-		size_t i = 0;
-		for (; i < m_Dense.size(); i++) {
-			const auto& cast = dynamic_cast<AMFArrayValue*>(m_Dense[i].get());
-			if (!cast) continue;
-
-			const auto& nameValue = cast->Get<std::string>("name");
-			if (!nameValue || nameValue->GetValue() != name) continue;
-
-			// found a duplicate, return this instead
-			auto valueCast = dynamic_cast<AmfType*>(cast->Get("value"));
-			if (valueCast) return *valueCast;
-		}
-
 		auto* value = PushArray();
-		value->Insert<std::string>("name", name.data());
+		value->Insert("name", name.data());
 		return value->Insert<AmfType>("value", std::make_unique<AmfType>());
 	}
 

dScripts/02_server/Map/njhub/CMakeLists.txt

@@ -6,7 +6,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB
 	"EnemySkeletonSpawner.cpp"
 	"FallingTile.cpp"
 	"FlameJetServer.cpp"
-	"LightningOrbServer.cpp"
 	"ImaginationShrineServer.cpp"
 	"Lieutenant.cpp"
 	"MonCoreNookDoors.cpp"

dScripts/02_server/Map/njhub/LightningOrbServer.cpp

@@ -1,12 +0,0 @@
-#include "LightningOrbServer.h"
-
-void LightningOrbServer::OnCollisionPhantom(Entity* self, Entity* target) {
-	GameMessages::GetPosition playerPos;
-	playerPos.Send(target->GetObjectID());
-	GameMessages::GetPosition selfPos;
-	selfPos.Send(self->GetObjectID());
-	const NiPoint3 newVec((playerPos.pos.x - selfPos.pos.x) * 2.5, 15, (playerPos.pos.z - selfPos.pos.z) * 2.5);
-	// ahhhh aron said to put a TODO here moving platforms don't work lol.  disable this so people can actually do the puzzle
-	// GameMessages::SendKnockback(target->GetObjectID(), self->GetObjectID(), self->GetObjectID(), 0, newVec);
-	// GameMessages::SendPlayFXEffect(target->GetObjectID(), -1, u"knockback", "knockback");
-}

dScripts/02_server/Map/njhub/LightningOrbServer.h

@@ -1,8 +0,0 @@
-#pragma once
-#include "CppScripts.h"
-
-class LightningOrbServer : public CppScripts::Script
-{
-public:
-	void OnCollisionPhantom(Entity* self, Entity* target) override;
-};

dScripts/CppScripts.cpp

@@ -135,6 +135,7 @@
 #include "FvMaelstromCavalry.h"
 #include "FvHorsemenTrigger.h"
 #include "FvFlyingCreviceDragon.h"
+#include "FvDragonInstanceServer.h"
 #include "FvMaelstromDragon.h"
 #include "FvDragonSmashingGolemQb.h"
 #include "TreasureChestDragonServer.h"
@@ -274,7 +275,6 @@
 #include "MonCoreNookDoors.h"
 #include "MonCoreSmashableDoors.h"
 #include "FlameJetServer.h"
-#include "LightningOrbServer.h"
 #include "BurningTile.h"
 #include "NjEarthDragonPetServer.h"
 #include "NjEarthPetServer.h"
@@ -491,6 +491,7 @@ namespace {
 		{"scripts\\ai\\FV\\L_ACT_NINJA_TURRET_1.lua", []() {return new ActNinjaTurret();}},
 		{"scripts\\02_server\\Map\\FV\\L_FV_HORSEMEN_TRIGGER.lua", []() {return new FvHorsemenTrigger();}},
 		{"scripts\\ai\\FV\\L_FV_FLYING_CREVICE_DRAGON.lua", []() {return new FvFlyingCreviceDragon();}},
+		{"scripts\\ai\\FV\\Dragon_Instance\\L_FV_DRAGON_INSTANCE_SERVER.lua", []() {return new FvDragonInstanceServer();}},
 		{"scripts\\02_server\\Enemy\\FV\\L_FV_MAELSTROM_DRAGON.lua", []() {return new FvMaelstromDragon();}},
 		{"scripts\\ai\\FV\\L_FV_DRAGON_SMASHING_GOLEM_QB.lua", []() {return new FvDragonSmashingGolemQb();}},
 		{"scripts\\02_server\\Enemy\\General\\L_TREASURE_CHEST_DRAGON_SERVER.lua", []() {return new TreasureChestDragonServer();}},
@@ -629,7 +630,6 @@ namespace {
 		{"scripts\\02_server\\Map\\njhub\\L_MON_CORE_SMASHABLE_DOORS.lua", []() {return new MonCoreSmashableDoors();}},
 		{"scripts\\02_server\\Map\\njhub\\L_MON_CORE_SMASHABLE_DOORS.lua", []() {return new MonCoreSmashableDoors();}},
 		{"scripts\\02_server\\Map\\njhub\\L_FLAME_JET_SERVER.lua", []() {return new FlameJetServer();}},
-		{"scripts\\02_server\\Map\\njhub\\L_LIGHTNING_ORB_SERVER.lua", []() {return new LightningOrbServer();}},
 		{"scripts\\02_server\\Map\\njhub\\L_BURNING_TILE.lua", []() {return new BurningTile();}},
 		{"scripts\\02_server\\Map\\njhub\\L_SPAWN_EARTH_PET_SERVER.lua", []() {return new NjEarthDragonPetServer();}},
 		{"scripts\\02_server\\Map\\njhub\\L_EARTH_PET_SERVER.lua", []() {return new NjEarthPetServer();}},

dScripts/ai/FV/CMakeLists.txt

@@ -18,7 +18,13 @@ set(DSCRIPTS_SOURCES_AI_FV
 	"FvMaelstromGeyser.cpp"
 	"TriggerGas.cpp")
 
+add_subdirectory(Dragon_Instance)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_FV_DRAGON_INSTANCE})
+	set(DSCRIPTS_SOURCES_AI_FV ${DSCRIPTS_SOURCES_AI_FV} "Dragon_Instance/${file}")
+endforeach()
+
 add_library(dScriptsAiFV OBJECT ${DSCRIPTS_SOURCES_AI_FV})
-target_include_directories(dScriptsAiFV PUBLIC ".")
+target_include_directories(dScriptsAiFV PUBLIC "." "Dragon_Instance")
 target_precompile_headers(dScriptsAiFV REUSE_FROM dScriptsBase)
 

dScripts/ai/FV/Dragon_Instance/CMakeLists.txt

@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_FV_DRAGON_INSTANCE
+	"FvDragonInstanceServer.cpp"
+	PARENT_SCOPE)

dScripts/ai/FV/Dragon_Instance/FvDragonInstanceServer.cpp

@@ -0,0 +1,13 @@
+#include "FvDragonInstanceServer.h"
+
+#include "Entity.h"
+#include "DestroyableComponent.h"
+
+void FvDragonInstanceServer::OnPlayerLoaded(Entity* self, Entity* player) {
+	auto* const destComp = player->GetComponent<DestroyableComponent>();
+	if (destComp) {
+		destComp->SetHealth(destComp->GetMaxHealth());
+		destComp->SetArmor(destComp->GetMaxArmor());
+		destComp->SetImagination(destComp->GetMaxImagination());
+	}
+}

dScripts/ai/FV/Dragon_Instance/FvDragonInstanceServer.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "CppScripts.h"
+
+class FvDragonInstanceServer : public CppScripts::Script
+{
+public:
+	void OnPlayerLoaded(Entity* self, Entity* player) override;
+};