Merge branch 'main' into PetFixes

dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp

@@ -15,6 +15,7 @@
 #include "SkillComponent.h"
 #include "eReplicaComponentType.h"
 #include "RenderComponent.h"
+#include "PlayerManager.h"
 
 #include <vector>
 
@@ -53,11 +54,13 @@ void BossSpiderQueenEnemyServer::OnStartup(Entity* self) {
 
 void BossSpiderQueenEnemyServer::OnDie(Entity* self, Entity* killer) {
 	if (Game::zoneManager->GetZoneID().GetMapID() == instanceZoneID && killer) {
-		auto* missionComponent = killer->GetComponent<MissionComponent>();
-		if (missionComponent == nullptr)
-			return;
+		for (const auto& player : PlayerManager::GetAllPlayers()) {
+			auto* missionComponent = player->GetComponent<MissionComponent>();
+			if (missionComponent == nullptr)
+				return;
 
-		missionComponent->CompleteMission(instanceMissionID);
+			missionComponent->CompleteMission(instanceMissionID);
+		}
 	}
 
 	// There is suppose to be a 0.1 second delay here but that may be admitted?

dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp

@@ -6,7 +6,7 @@
 #include "SkillComponent.h"
 #include "BaseCombatAIComponent.h"
 #include "EntityInfo.h"
-#include "eAninmationFlags.h"
+#include "eAnimationFlags.h"
 #include "RenderComponent.h"
 
 void AmDarklingDragon::OnStartup(Entity* self) {

dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp

@@ -3,7 +3,7 @@
 #include "SkillComponent.h"
 #include "BaseCombatAIComponent.h"
 #include "DestroyableComponent.h"
-#include "eAninmationFlags.h"
+#include "eAnimationFlags.h"
 #include "EntityInfo.h"
 #include "RenderComponent.h"
 

dScripts/02_server/Enemy/General/BaseEnemyApe.cpp

@@ -5,7 +5,7 @@
 #include "EntityManager.h"
 #include "EntityInfo.h"
 #include "SkillComponent.h"
-#include "eAninmationFlags.h"
+#include "eAnimationFlags.h"
 #include "RenderComponent.h"
 #include "eStateChangeType.h"
 

dScripts/02_server/Map/FV/Racing/CMakeLists.txt

@@ -1,3 +1,6 @@
 set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING 
+	"RaceFireballs.cpp"
 	"RaceMaelstromGeiser.cpp"
+	"RaceShipLapColumnsServer.cpp"
+	"FvRacingColumns.cpp"
 	PARENT_SCOPE)

dScripts/02_server/Map/FV/Racing/FvRacingColumns.cpp

@@ -0,0 +1,15 @@
+#include "FvRacingColumns.h"
+#include "MovingPlatformComponent.h"
+
+void FvRacingColumns::OnStartup(Entity* self) {
+	auto* movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
+	if (!movingPlatformComponent) return;
+
+	movingPlatformComponent->StopPathing();
+	movingPlatformComponent->SetSerialized(true);
+	int32_t pathStart = 0;
+	if (self->HasVar(u"attached_path_start")) {
+		pathStart = self->GetVar<uint32_t>(u"attached_path_start");
+	}
+	movingPlatformComponent->WarpToWaypoint(pathStart);
+}

dScripts/02_server/Map/FV/Racing/FvRacingColumns.h

@@ -0,0 +1,6 @@
+#include "CppScripts.h"
+
+class FvRacingColumns : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+};

dScripts/02_server/Map/FV/Racing/RaceFireballs.cpp

@@ -0,0 +1,15 @@
+#include "RaceFireballs.h"
+#include "SkillComponent.h"
+
+void RaceFireballs::OnStartup(Entity* self) {
+	self->AddTimer("fire", GeneralUtils::GenerateRandomNumber<float>(3.0f, 10.0f));
+}
+
+void RaceFireballs::OnTimerDone(Entity* self, std::string timerName) {
+	if (timerName == "fire") {
+		auto* skillComponent = self->GetComponent<SkillComponent>();
+		if (skillComponent) skillComponent->CastSkill(894);
+		self->AddTimer("fire", GeneralUtils::GenerateRandomNumber<float>(3.0f, 10.0f));
+
+	}
+}

dScripts/02_server/Map/FV/Racing/RaceFireballs.h

@@ -0,0 +1,9 @@
+#pragma once
+#include "CppScripts.h"
+
+class RaceFireballs : public CppScripts::Script
+{
+public:
+	void OnStartup(Entity* self) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
+};

dScripts/02_server/Map/FV/Racing/RaceShipLapColumnsServer.cpp

@@ -0,0 +1,47 @@
+#include "RaceShipLapColumnsServer.h"
+
+#include "RacingControlComponent.h"
+#include "MovingPlatformComponent.h"
+
+void RaceShipLapColumnsServer::OnStartup(Entity* self) {
+	self->SetVar(u"Lap2Complete", false);
+	self->SetVar(u"Lap3Complete", false);
+}
+
+void SetMovingToWaypoint(const int32_t waypointIndex, const std::string group) {
+	const auto entities = Game::entityManager->GetEntitiesInGroup(group);
+	if (entities.empty()) return;
+
+	auto* entity = entities[0];
+	entity->SetIsGhostingCandidate(false);
+
+	auto* movingPlatfromComponent = entity->GetComponent<MovingPlatformComponent>();
+	if (!movingPlatfromComponent) return;
+
+	movingPlatfromComponent->SetSerialized(true);
+	movingPlatfromComponent->GotoWaypoint(waypointIndex);
+	Game::entityManager->SerializeEntity(entity);
+}
+
+void RaceShipLapColumnsServer::OnCollisionPhantom(Entity* self, Entity* target) {
+	if (!target) return;
+
+	const auto racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
+	if (racingControllers.empty()) return;
+
+	auto* racingControlComponent = racingControllers[0]->GetComponent<RacingControlComponent>();
+	if (!racingControlComponent) return;
+
+	const auto* player = racingControlComponent->GetPlayerData(target->GetObjectID());
+	if (!player) return;
+
+	if (player->lap == 1 && !self->GetVar<bool>(u"Lap2Complete")) {
+		self->SetVar(u"Lap2Complete", true);
+		SetMovingToWaypoint(1, "Lap2Column");
+		SetMovingToWaypoint(0, "Lap2Ramp");
+	} else if (player->lap == 2 && !self->GetVar<bool>(u"Lap3Complete")) {
+		self->SetVar(u"Lap3Complete", true);
+		SetMovingToWaypoint(1, "Lap3Column");
+		SetMovingToWaypoint(0, "Lap3Ramp");
+	}
+}

dScripts/02_server/Map/FV/Racing/RaceShipLapColumnsServer.h

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

dScripts/02_server/Map/General/PetDigServer.cpp

@@ -227,20 +227,20 @@ void PetDigServer::SpawnPet(Entity* self, const Entity* owner, const DigInfo dig
 	Game::entityManager->ConstructEntity(spawnedPet);
 }
 
-Entity* PetDigServer::GetClosestTresure(NiPoint3 position) {
+Entity* PetDigServer::GetClosestTreasure(NiPoint3 position) {
 	float closestDistance = 0;
 	Entity* closest = nullptr;
 
-	for (const auto tresureId : treasures) {
-		auto* tresure = Game::entityManager->GetEntity(tresureId);
+	for (const auto treasureId : treasures) {
+		auto* treasure = Game::entityManager->GetEntity(treasureId);
 
-		if (tresure == nullptr) continue;
+		if (treasure == nullptr) continue;
 
-		float distance = Vector3::DistanceSquared(tresure->GetPosition(), position);
+		float distance = Vector3::DistanceSquared(treasure->GetPosition(), position);
 
 		if (closest == nullptr || distance < closestDistance) {
 			closestDistance = distance;
-			closest = tresure;
+			closest = treasure;
 		}
 	}
 

dScripts/02_server/Map/General/PetDigServer.h

@@ -24,7 +24,7 @@ public:
 	 */
 	void OnUse(Entity* self, Entity* user) override;
 
-	static Entity* GetClosestTresure(NiPoint3 position);
+	static Entity* GetClosestTreasure(NiPoint3 position);
 
 private:
 	static void ProgressPetDigMissions(const Entity* owner, const Entity* chest);

dScripts/02_server/Objects/AgSurvivalBuffStation.cpp

@@ -56,10 +56,6 @@ void AgSurvivalBuffStation::OnTimerDone(Entity* self, std::string timerName) {
 		auto member = Game::entityManager->GetEntity(memberID);
 		if (member != nullptr && !member->GetIsDead()) {
 			GameMessages::SendDropClientLoot(member, self->GetObjectID(), powerupToDrop, 0, self->GetPosition());
-		} else {
-			// If player left the team or left early erase them from the team variable.
-			team.erase(std::find(team.begin(), team.end(), memberID));
-			self->SetVar<std::vector<LWOOBJID>>(u"BuilderTeam", team);
 		}
 	}
 }

dScripts/ActivityManager.cpp

@@ -121,7 +121,7 @@ void ActivityManager::GetLeaderboardData(Entity* self, const LWOOBJID playerID,
 	auto* sac = self->GetComponent<ScriptedActivityComponent>();
 	uint32_t gameID = sac != nullptr ? sac->GetActivityID() : self->GetLOT();
 	// Save the new score to the leaderboard and show the leaderboard to the player
-	LeaderboardManager::SendLeaderboard(activityID, Leaderboard::InfoType::MyStanding, false, playerID, self->GetObjectID(), 0, numResults);
+	LeaderboardManager::SendLeaderboard(activityID, Leaderboard::InfoType::MyStanding, false, playerID, self->GetObjectID());
 }
 
 void ActivityManager::ActivityTimerStart(Entity* self, const std::string& timerName, const float_t updateInterval,

dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp

@@ -12,7 +12,10 @@ void BaseFootRaceManager::OnFireEventServerSide(Entity* self, Entity* sender, st
 	if (splitArguments.size() > 1) {
 
 		const auto eventName = splitArguments[0];
-		const auto player = Game::entityManager->GetEntity(std::stoull(splitArguments[1]));
+		auto playerId = GeneralUtils::TryParse<LWOOBJID>(splitArguments[1]);
+		if (!playerId) return;
+
+		const auto player = Game::entityManager->GetEntity(playerId.value());
 
 		if (player != nullptr) {
 			if (eventName == "updatePlayer") {

dScripts/ai/AG/AgShipShake.cpp

@@ -0,0 +1,81 @@
+#include "AgShipShake.h"
+#include "EntityInfo.h"
+#include "GeneralUtils.h"
+#include "GameMessages.h"
+#include "EntityManager.h"
+#include "RenderComponent.h"
+#include "Entity.h"
+
+void AgShipShake::OnStartup(Entity* self) {
+	EntityInfo info{};
+
+	info.pos = { -418, 585, -30 };
+	info.lot = 33;
+	info.spawnerID = self->GetObjectID();
+
+	auto* ref = Game::entityManager->CreateEntity(info);
+
+	Game::entityManager->ConstructEntity(ref);
+
+	self->SetVar(u"ShakeObject", ref->GetObjectID());
+
+	self->AddTimer("ShipShakeIdle", 2.0f);
+	self->SetVar(u"RandomTime", 10);
+}
+
+void AgShipShake::OnTimerDone(Entity* self, std::string timerName) {
+	auto* shipFxObject = GetEntityInGroup(ShipFX);
+	auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
+	auto* debrisObject = GetEntityInGroup(DebrisFX);
+	if (timerName == "ShipShakeIdle") {
+		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
+
+		const auto randomTime = self->GetVar<int>(u"RandomTime");
+		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
+
+		if (time < randomTime / 2) {
+			time += randomTime / 2;
+		}
+
+		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
+
+		if (ref)
+			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
+
+
+		if (debrisObject)
+			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+
+		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
+
+		if (shipFxObject) {
+			std::string effectType = "shipboom" + std::to_string(randomFx);
+			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+		}
+
+		self->AddTimer("ShipShakeExplode", 5.0f);
+
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
+	} else if (timerName == "ShipShakeExplode") {
+		if (shipFxObject)
+			RenderComponent::PlayAnimation(shipFxObject, u"idle");
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
+	}
+}
+
+Entity* AgShipShake::GetEntityInGroup(const std::string& group) {
+	auto entities = Game::entityManager->GetEntitiesInGroup(group);
+	Entity* en = nullptr;
+
+	for (auto entity : entities) {
+		if (entity) {
+			en = entity;
+			break;
+		}
+	}
+
+	return en;
+}
+

dScripts/ai/AG/AgShipShake.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "CppScripts.h"
+
+class AgShipShake : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
+
+	std::string DebrisFX = "DebrisFX";
+	std::string ShipFX = "ShipFX";
+	std::string ShipFX2 = "ShipFX2";
+	std::u16string FXName = u"camshake-bridge";
+
+private:
+	Entity* GetEntityInGroup(const std::string& group);
+};

dScripts/ai/AG/AgSpaceStuff.cpp

@@ -8,21 +8,6 @@
 
 void AgSpaceStuff::OnStartup(Entity* self) {
 	self->AddTimer("FloaterScale", 5.0f);
-
-	EntityInfo info{};
-
-	info.pos = { -418, 585, -30 };
-	info.lot = 33;
-	info.spawnerID = self->GetObjectID();
-
-	auto* ref = Game::entityManager->CreateEntity(info);
-
-	Game::entityManager->ConstructEntity(ref);
-
-	self->SetVar(u"ShakeObject", ref->GetObjectID());
-
-	self->AddTimer("ShipShakeIdle", 2.0f);
-	self->SetVar(u"RandomTime", 10);
 }
 
 void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {
@@ -37,70 +22,5 @@ void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {
 
 		RenderComponent::PlayAnimation(self, u"path_0" + (GeneralUtils::to_u16string(pathType)));
 		self->AddTimer("FloaterScale", randTime);
-	} else if (timerName == "ShipShakeExplode") {
-		DoShake(self, true);
-	} else if (timerName == "ShipShakeIdle") {
-		DoShake(self, false);
 	}
 }
-
-void AgSpaceStuff::DoShake(Entity* self, bool explodeIdle) {
-
-	if (!explodeIdle) {
-		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
-
-		const auto randomTime = self->GetVar<int>(u"RandomTime");
-		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
-
-		if (time < randomTime / 2) {
-			time += randomTime / 2;
-		}
-
-		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
-
-		if (ref)
-			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
-
-		auto* debrisObject = GetEntityInGroup(DebrisFX);
-
-		if (debrisObject)
-			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-
-		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
-
-		auto* shipFxObject = GetEntityInGroup(ShipFX);
-		if (shipFxObject) {
-			std::string effectType = "shipboom" + std::to_string(randomFx);
-			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-		}
-
-		self->AddTimer("ShipShakeExplode", 5.0f);
-
-		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
-	} else {
-		auto* shipFxObject = GetEntityInGroup(ShipFX);
-		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
-
-		if (shipFxObject)
-			RenderComponent::PlayAnimation(shipFxObject, u"idle");
-
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
-	}
-}
-
-Entity* AgSpaceStuff::GetEntityInGroup(const std::string& group) {
-	auto entities = Game::entityManager->GetEntitiesInGroup(group);
-	Entity* en = nullptr;
-
-	for (auto entity : entities) {
-		if (entity) {
-			en = entity;
-			break;
-		}
-	}
-
-	return en;
-}

dScripts/ai/AG/AgSpaceStuff.h

@@ -5,14 +5,5 @@ class AgSpaceStuff : public CppScripts::Script {
 public:
 	void OnStartup(Entity* self);
 	void OnTimerDone(Entity* self, std::string timerName);
-	void DoShake(Entity* self, bool explodeIdle);
-
-	std::string DebrisFX = "DebrisFX";
-	std::string ShipFX = "ShipFX";
-	std::string ShipFX2 = "ShipFX2";
-	std::u16string FXName = u"camshake-bridge";
-
-private:
-	Entity* GetEntityInGroup(const std::string& group);
 };
 

dScripts/ai/AG/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(DSCRIPTS_SOURCES_AI_AG 
 	"AgShipPlayerDeathTrigger.cpp"
 	"AgSpaceStuff.cpp"
+    "AgShipShake.cpp"
 	"AgShipPlayerShockServer.cpp"
 	"AgImagSmashable.cpp"
 	"ActSharkPlayerDeathTrigger.cpp"

dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp

@@ -61,6 +61,7 @@ void SGCannon::OnStartup(Entity* self) {
 	if (simplePhysicsComponent != nullptr) {
 		simplePhysicsComponent->SetPhysicsMotionState(5);
 	}
+	Game::entityManager->SerializeEntity(self);
 }
 
 void SGCannon::OnPlayerLoaded(Entity* self, Entity* player) {

dScripts/ai/RACING/OBJECTS/CMakeLists.txt

@@ -1,6 +1,10 @@
 set(DSCRIPTS_SOURCES_AI_RACING_OBJECTS 
 	"RaceImagineCrateServer.cpp"
 	"RaceImaginePowerup.cpp"
+	"FvRaceDragon.cpp"
+	"FvRacePillarServer.cpp"
+	"FvRacePillarABCServer.cpp"
+	"FvRacePillarDServer.cpp"
 	"FvRaceSmashEggImagineServer.cpp"
 	"RaceSmashServer.cpp"
 	PARENT_SCOPE)

dScripts/ai/RACING/OBJECTS/FvRaceDragon.cpp

@@ -0,0 +1,30 @@
+#include "FvRaceDragon.h"
+#include "RenderComponent.h"
+#include "RacingControlComponent.h"
+
+void FvRaceDragon::OnCollisionPhantom(Entity* self, Entity* target) {
+	if (!target) return;
+
+	const auto racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
+	if (racingControllers.empty()) return;
+
+	auto* racingControlComponent = racingControllers[0]->GetComponent<RacingControlComponent>();
+	if (!racingControlComponent) return;
+
+	const auto* player = racingControlComponent->GetPlayerData(target->GetObjectID());
+	if (!player) return;
+
+	if (player->lap != m_Lap) return;
+
+	const auto dragons = Game::entityManager->GetEntitiesInGroup("dragon");
+	for (const auto& dragon : dragons) {
+		if (!dragon || dragon->GetLOT() != this->m_Dragon) continue;
+
+		auto* renderComponent = dragon->GetComponent<RenderComponent>();
+		if (!renderComponent) continue;
+
+		renderComponent->PlayAnimation(dragon, m_LapAnimName);
+		
+	}
+	Game::entityManager->DestroyEntity(self);
+}

dScripts/ai/RACING/OBJECTS/FvRaceDragon.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "CppScripts.h"
+
+#include <string>
+#include <string_view>
+
+class FvRaceDragon : public CppScripts::Script {
+public:
+	FvRaceDragon(const std::string_view lapAnimName, const int32_t lap) : m_LapAnimName(lapAnimName), m_Lap(lap) {}
+private:
+	void OnCollisionPhantom(Entity* self, Entity* target) override;
+	const std::string m_LapAnimName;
+	const int32_t m_Lap;
+	const LOT m_Dragon = 11898;
+};

dScripts/ai/RACING/OBJECTS/FvRacePillarABCServer.cpp

@@ -0,0 +1,34 @@
+#include "FvRacePillarABCServer.h"
+#include "RenderComponent.h"
+#include "RacingControlComponent.h"
+
+void FvRacePillarABCServer::OnCollisionPhantom(Entity* self, Entity* target) {
+	if (!target) return;
+
+	const auto racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
+	if (racingControllers.empty()) return;
+
+	auto* racingControlComponent = racingControllers[0]->GetComponent<RacingControlComponent>();
+	if (!racingControlComponent) return;
+
+	const auto* player = racingControlComponent->GetPlayerData(target->GetObjectID());
+	if (!player || player->lap != 1) return;
+
+	PlayAnimation("crumble", "pillars", m_PillarA);
+	PlayAnimation("roar", "dragon", m_Dragon);
+
+	self->AddTimer("PillarBFall", 2.5f);
+	self->AddTimer("PillarCFall", 3.7f);
+	self->AddTimer("DeleteObject", 3.8f);
+}
+
+void FvRacePillarABCServer::OnTimerDone(Entity* self, std::string timerName) {
+	if (timerName == "PillarBFall") {
+		PlayAnimation("crumble", "pillars", m_PillarB);
+	} else if (timerName == "PillarCFall") {
+		PlayAnimation("crumble", "pillars", m_PillarC);
+	} else if (timerName == "DeleteObject") {
+		Game::entityManager->DestroyEntity(self);
+	}
+}
+

dScripts/ai/RACING/OBJECTS/FvRacePillarABCServer.h

@@ -0,0 +1,13 @@
+#pragma once
+#include "CppScripts.h"
+#include "FvRacePillarServer.h"
+
+class FvRacePillarABCServer : public FvRacePillarServer {
+	void OnCollisionPhantom(Entity* self, Entity* target) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
+private:
+	const LOT m_PillarA = 11946;
+	const LOT m_PillarB = 11947;
+	const LOT m_PillarC = 11948;
+	const LOT m_Dragon = 11898;
+};

dScripts/ai/RACING/OBJECTS/FvRacePillarDServer.cpp

@@ -0,0 +1,21 @@
+#include "FvRacePillarDServer.h"
+#include "RenderComponent.h"
+#include "RacingControlComponent.h"
+
+void FvRacePillarDServer::OnCollisionPhantom(Entity* self, Entity* target) {
+	if (!target) return;
+
+	const auto racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
+	if (racingControllers.empty()) return;
+
+	auto* racingControlComponent = racingControllers[0]->GetComponent<RacingControlComponent>();
+	if (!racingControlComponent) return;
+
+	const auto* player = racingControlComponent->GetPlayerData(target->GetObjectID());
+	if (!player) return;
+
+	if (player->lap == 2) {
+		PlayAnimation("crumble", "pillars", m_PillarD);
+		PlayAnimation("roar", "dragon", m_Dragon);
+	}
+}

dScripts/ai/RACING/OBJECTS/FvRacePillarDServer.h

@@ -0,0 +1,10 @@
+#pragma once
+#include "CppScripts.h"
+#include "FvRacePillarServer.h"
+
+class FvRacePillarDServer : public FvRacePillarServer {
+	void OnCollisionPhantom(Entity* self, Entity* target) override;
+private:
+	const LOT m_PillarD = 11949;
+	const LOT m_Dragon = 11898;
+};

dScripts/ai/RACING/OBJECTS/FvRacePillarServer.cpp

@@ -0,0 +1,15 @@
+#include "FvRacePillarServer.h"
+
+#include "Game.h"
+#include "EntityManager.h"
+#include "RenderComponent.h"
+
+void FvRacePillarServer::PlayAnimation(const std::string animName, const std::string group, const LOT lot) {
+	const auto entities = Game::entityManager->GetEntitiesInGroup(group);
+	for (const auto& entity : entities) {
+		if (!entity || entity->GetLOT() != lot) continue;
+		auto* renderComponent = entity->GetComponent<RenderComponent>();
+		if (!renderComponent) continue;
+		renderComponent->PlayAnimation(entity, animName);
+	}
+}

dScripts/ai/RACING/OBJECTS/FvRacePillarServer.h

@@ -0,0 +1,12 @@
+#ifndef FVRACEPILLARSERVER__H
+#define FVRACEPILLARSERVER__H
+
+#include "CppScripts.h"
+
+class FvRacePillarServer : public virtual CppScripts::Script {
+protected:
+	// Plays an animation on all entities in a group with a specific LOT
+	void PlayAnimation(const std::string animName, const std::string group, const LOT lot);
+};
+
+#endif // FVRACEPILLARSERVER__H