diff --git a/dCommon/dEnums/MessageType/Game.h b/dCommon/dEnums/MessageType/Game.h index 8c5bddae7..ee8b8515b 100644 --- a/dCommon/dEnums/MessageType/Game.h +++ b/dCommon/dEnums/MessageType/Game.h @@ -1253,6 +1253,7 @@ namespace MessageType { VEHICLE_NOTIFY_HIT_EXPLODER = 1385, CHECK_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1386, REQUEST_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1387, + CONFIGURE_RACING_CONTROL = 1388, CONFIGURE_RACING_CONTROL_CLIENT = 1389, NOTIFY_RACING_CLIENT = 1390, RACING_PLAYER_HACK_CAR = 1391, diff --git a/dGame/dComponents/RacingControlComponent.cpp b/dGame/dComponents/RacingControlComponent.cpp index ab6d5d178..f03fb9b40 100644 --- a/dGame/dComponents/RacingControlComponent.cpp +++ b/dGame/dComponents/RacingControlComponent.cpp @@ -35,7 +35,8 @@ RacingControlComponent::RacingControlComponent(Entity* parent) : Component(parent) { m_PathName = u"MainPath"; - m_RemainingLaps = 3; + m_NumberOfLaps = 3; + m_RemainingLaps = m_NumberOfLaps; m_LeadingPlayer = LWOOBJID_EMPTY; m_RaceBestTime = 0; m_RaceBestLap = 0; @@ -658,23 +659,9 @@ void RacingControlComponent::Update(float deltaTime) { } } - // Spawn imagination pickups - auto* minSpawner = Game::zoneManager->GetSpawnersByName( - "ImaginationSpawn_Min")[0]; - auto* medSpawner = Game::zoneManager->GetSpawnersByName( - "ImaginationSpawn_Med")[0]; - auto* maxSpawner = Game::zoneManager->GetSpawnersByName( - "ImaginationSpawn_Max")[0]; - - minSpawner->Activate(); - - if (m_LoadedPlayers > 2) { - medSpawner->Activate(); - } - - if (m_LoadedPlayers > 4) { - maxSpawner->Activate(); - } + GameMessages::ZoneLoadedInfo zoneLoadInfo{}; + zoneLoadInfo.maxPlayers = m_LoadedPlayers; + m_Parent->GetScript()->OnZoneLoadedInfo(m_Parent, zoneLoadInfo); // Reset players to their start location, without smashing them for (auto& player : m_RacingPlayers) { @@ -764,7 +751,7 @@ void RacingControlComponent::Update(float deltaTime) { // new checkpoint uint32_t respawnIndex = 0; for (const auto& waypoint : path->pathWaypoints) { - if (player.lap == 3) { + if (player.lap == m_NumberOfLaps) { break; } @@ -835,7 +822,7 @@ void RacingControlComponent::Update(float deltaTime) { // Progress lap time tasks missionComponent->Progress(eMissionTaskType::RACING, lapTime.count(), static_cast(eRacingTaskParam::LAP_TIME)); - if (player.lap == 3) { + if (player.lap == m_NumberOfLaps) { m_Finished++; player.finished = m_Finished; @@ -882,3 +869,20 @@ void RacingControlComponent::Update(float deltaTime) { } } } + +void RacingControlComponent::MsgConfigureRacingControl(const GameMessages::ConfigureRacingControl& msg) { + for (const auto& dataUnique : msg.racingSettings) { + if (!dataUnique) continue; + const auto* const data = dataUnique.get(); + if (data->GetKey() == u"Race_PathName" && data->GetValueType() == LDF_TYPE_UTF_16) { + m_PathName = static_cast*>(data)->GetValue(); + } else if (data->GetKey() == u"activityID" && data->GetValueType() == LDF_TYPE_S32) { + m_ActivityID = static_cast*>(data)->GetValue(); + } else if (data->GetKey() == u"Number_of_Laps" && data->GetValueType() == LDF_TYPE_S32) { + m_NumberOfLaps = static_cast*>(data)->GetValue(); + m_RemainingLaps = m_NumberOfLaps; + } else if (data->GetKey() == u"Minimum_Players_for_Group_Achievements" && data->GetValueType() == LDF_TYPE_S32) { + m_MinimumPlayersForGroupAchievements = static_cast*>(data)->GetValue(); + } + } +} diff --git a/dGame/dComponents/RacingControlComponent.h b/dGame/dComponents/RacingControlComponent.h index 43c7e158a..4a661ca78 100644 --- a/dGame/dComponents/RacingControlComponent.h +++ b/dGame/dComponents/RacingControlComponent.h @@ -152,6 +152,8 @@ class RacingControlComponent final : public Component { */ RacingPlayerInfo* GetPlayerData(LWOOBJID playerID); + void MsgConfigureRacingControl(const GameMessages::ConfigureRacingControl& msg); + private: /** @@ -161,11 +163,13 @@ class RacingControlComponent final : public Component { /** * The paths that are followed for the camera scenes + * Configurable in the ConfigureRacingControl msg with the key `Race_PathName`. */ std::u16string m_PathName; /** * The ID of the activity for participating in this race + * Configurable in the ConfigureRacingControl msg with the key `activityID`. */ uint32_t m_ActivityID; @@ -245,5 +249,20 @@ class RacingControlComponent final : public Component { * Value for message box response to know if we are exiting the race via the activity dialogue */ const int32_t m_ActivityExitConfirm = 1; + bool m_AllPlayersReady = false; + + /** + * @brief The number of laps in this race. Configurable in the ConfigureRacingControl msg + * with the key `Number_of_Laps`. + * + */ + int32_t m_NumberOfLaps{ 3 }; + + /** + * @brief The minimum number of players required to progress group achievements. + * Configurable with the ConfigureRacingControl msg with the key `Minimum_Players_for_Group_Achievements`. + * + */ + int32_t m_MinimumPlayersForGroupAchievements{ 2 }; }; diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h index f3833df1b..a77e3c120 100644 --- a/dGame/dGameMessages/GameMessages.h +++ b/dGame/dGameMessages/GameMessages.h @@ -717,6 +717,16 @@ namespace GameMessages { NiPoint3 targetPosition{}; void Serialize(RakNet::BitStream& bitStream) const override; }; + + struct ZoneLoadedInfo : public GameMsg { + ZoneLoadedInfo() : GameMsg(MessageType::Game::ZONE_LOADED_INFO) {} + int32_t maxPlayers{}; + }; + + struct ConfigureRacingControl : public GameMsg { + ConfigureRacingControl() : GameMsg(MessageType::Game::CONFIGURE_RACING_CONTROL) {} + std::vector> racingSettings{}; + }; }; #endif // GAMEMESSAGES_H diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index 8b38e5ced..696fa5902 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -330,6 +330,7 @@ #include "EnemyClearThreat.h" #include "AgSpiderBossMessage.h" #include "GfRaceInstancer.h" +#include "NsRaceServer.h" #include #include @@ -692,6 +693,7 @@ namespace { {"scripts\\02_server\\Map\\General\\L_ENEMY_CLEAR_THREAT.lua", []() {return new EnemyClearThreat();}}, {"scripts\\ai\\AG\\L_AG_SPIDER_BOSS_MESSAGE.lua", []() {return new AgSpiderBossMessage();}}, {"scripts\\ai\\GF\\L_GF_RACE_INSTANCER.lua", []() {return new GfRaceInstancer();}}, + {"scripts\\ai\\RACING\\TRACK_NS\\NS_RACE_SERVER.lua", []() {return new NsRaceServer();}}, }; @@ -704,9 +706,12 @@ namespace { "scripts\\empty.lua", "scripts\\zone\\AG\\L_ZONE_AG.lua", "scripts\\zone\\NS\\L_ZONE_NS.lua", - "scripts\\zone\\GF\\L_ZONE_GF.lua", + "scripts\\ai\\GF\\L_ZONE_GF.lua", "scripts\\ai\\AG\\CONCERT_STAGE.lua", "scripts\\ai\\NS\\L_NS_CAR_MODULAR_BUILD.lua", // In our implementation, this is done in GameMessages.cpp + "scripts\\ai\\PETS\\PET_BLOCKER.lua", + "scripts\\ai\\PETS\\PET_FLEA_MISSION.lua", + "scripts\\ai\\ACT\\L_ACT_PET_INSTANCE_EXIT.lua", }; }; diff --git a/dScripts/CppScripts.h b/dScripts/CppScripts.h index b0be77592..b7e5ad8bc 100644 --- a/dScripts/CppScripts.h +++ b/dScripts/CppScripts.h @@ -355,6 +355,8 @@ namespace CppScripts { * @param canceled if it was done via the cancel button */ virtual void OnRequestActivityExit(Entity* sender, LWOOBJID player, bool canceled) {}; + + virtual void OnZoneLoadedInfo(Entity* self, const GameMessages::ZoneLoadedInfo& info) {}; }; Script* const GetScript(Entity* parent, const std::string& scriptName); diff --git a/dScripts/ai/RACING/CMakeLists.txt b/dScripts/ai/RACING/CMakeLists.txt index a803b051c..1fef44d71 100644 --- a/dScripts/ai/RACING/CMakeLists.txt +++ b/dScripts/ai/RACING/CMakeLists.txt @@ -1,4 +1,5 @@ -set(DSCRIPTS_SOURCES_AI_RACING) +set(DSCRIPTS_SOURCES_AI_RACING + "RaceImaginationServer.cpp") add_subdirectory(OBJECTS) @@ -6,6 +7,12 @@ foreach(file ${DSCRIPTS_SOURCES_AI_RACING_OBJECTS}) set(DSCRIPTS_SOURCES_AI_RACING ${DSCRIPTS_SOURCES_AI_RACING} "OBJECTS/${file}") endforeach() +add_subdirectory(TRACK_NS) + +foreach(file ${DSCRIPTS_SOURCES_AI_RACING_TRACK_NS}) + set(DSCRIPTS_SOURCES_AI_RACING ${DSCRIPTS_SOURCES_AI_RACING} "TRACK_NS/${file}") +endforeach() + add_library(dScriptsAiRacing OBJECT ${DSCRIPTS_SOURCES_AI_RACING}) -target_include_directories(dScriptsAiRacing PUBLIC "." "OBJECTS") +target_include_directories(dScriptsAiRacing PUBLIC "." "OBJECTS" "TRACK_NS") target_precompile_headers(dScriptsAiRacing REUSE_FROM dScriptsBase) diff --git a/dScripts/ai/RACING/RaceImaginationServer.cpp b/dScripts/ai/RACING/RaceImaginationServer.cpp new file mode 100644 index 000000000..421350ce6 --- /dev/null +++ b/dScripts/ai/RACING/RaceImaginationServer.cpp @@ -0,0 +1,19 @@ +#include "RaceImaginationServer.h" +#include "dZoneManager.h" + +void StartSpawner(const std::vector& spawner) { + for (auto* const entity : spawner) { + entity->Activate(); + } +} + +void RaceImaginationServer::OnZoneLoadedInfo(Entity* self, const GameMessages::ZoneLoadedInfo& info) { + // Spawn imagination pickups + StartSpawner(Game::zoneManager->GetSpawnersByName("ImaginationSpawn_Min")); + if (info.maxPlayers > 2) { + StartSpawner(Game::zoneManager->GetSpawnersByName("ImaginationSpawn_Med")); + } + if (info.maxPlayers > 4) { + StartSpawner(Game::zoneManager->GetSpawnersByName("ImaginationSpawn_Max")); + } +} diff --git a/dScripts/ai/RACING/RaceImaginationServer.h b/dScripts/ai/RACING/RaceImaginationServer.h new file mode 100644 index 000000000..48df3fd35 --- /dev/null +++ b/dScripts/ai/RACING/RaceImaginationServer.h @@ -0,0 +1,11 @@ +#ifndef RACEIMAGINATIONSERVER_H +#define RACEIMAGINATIONSERVER_H + +#include "CppScripts.h" + +class RaceImaginationServer : public virtual CppScripts::Script { +public: + void OnZoneLoadedInfo(Entity* self, const GameMessages::ZoneLoadedInfo& info) override; +}; + +#endif //!RACEIMAGINATIONSERVER_H diff --git a/dScripts/ai/RACING/TRACK_NS/CMakeLists.txt b/dScripts/ai/RACING/TRACK_NS/CMakeLists.txt new file mode 100644 index 000000000..bd7be6f28 --- /dev/null +++ b/dScripts/ai/RACING/TRACK_NS/CMakeLists.txt @@ -0,0 +1,3 @@ +set(DSCRIPTS_SOURCES_AI_RACING_TRACK_NS + "NsRaceServer.cpp" + PARENT_SCOPE) diff --git a/dScripts/ai/RACING/TRACK_NS/NsRaceServer.cpp b/dScripts/ai/RACING/TRACK_NS/NsRaceServer.cpp new file mode 100644 index 000000000..5ef6c6d1d --- /dev/null +++ b/dScripts/ai/RACING/TRACK_NS/NsRaceServer.cpp @@ -0,0 +1,54 @@ +#include "NsRaceServer.h" + +#include "RacingControlComponent.h" +#include "Entity.h" + +using std::unique_ptr; +using std::make_unique; + +void NsRaceServer::OnStartup(Entity* self) { + GameMessages::ConfigureRacingControl config; + auto& raceSet = config.racingSettings; + + raceSet.push_back(make_unique>(u"GameType", u"Racing")); + raceSet.push_back(make_unique>(u"GameState", u"Starting")); + raceSet.push_back(make_unique>(u"Number_Of_PlayersPerTeam", 6)); + raceSet.push_back(make_unique>(u"Minimum_Players_to_Start", 2)); + raceSet.push_back(make_unique>(u"Minimum_Players_for_Group_Achievements", 2)); + + raceSet.push_back(make_unique>(u"Car_Object", 7703)); + raceSet.push_back(make_unique>(u"Race_PathName", u"MainPath")); + raceSet.push_back(make_unique>(u"Current_Lap", 1)); + raceSet.push_back(make_unique>(u"Number_of_Laps", 3)); + raceSet.push_back(make_unique>(u"activityID", 42)); + + raceSet.push_back(make_unique>(u"Place_1", 100)); + raceSet.push_back(make_unique>(u"Place_2", 90)); + raceSet.push_back(make_unique>(u"Place_3", 80)); + raceSet.push_back(make_unique>(u"Place_4", 70)); + raceSet.push_back(make_unique>(u"Place_5", 60)); + raceSet.push_back(make_unique>(u"Place_6", 50)); + + raceSet.push_back(make_unique>(u"Num_of_Players_1", 15)); + raceSet.push_back(make_unique>(u"Num_of_Players_2", 25)); + raceSet.push_back(make_unique>(u"Num_of_Players_3", 50)); + raceSet.push_back(make_unique>(u"Num_of_Players_4", 85)); + raceSet.push_back(make_unique>(u"Num_of_Players_5", 90)); + raceSet.push_back(make_unique>(u"Num_of_Players_6", 100)); + + raceSet.push_back(make_unique>(u"Number_of_Spawn_Groups", 1)); + raceSet.push_back(make_unique>(u"Red_Spawners", 4847)); + raceSet.push_back(make_unique>(u"Blue_Spawners", 4848)); + raceSet.push_back(make_unique>(u"Blue_Flag", 4850)); + raceSet.push_back(make_unique>(u"Red_Flag", 4851)); + raceSet.push_back(make_unique>(u"Red_Point", 4846)); + raceSet.push_back(make_unique>(u"Blue_Point", 4845)); + raceSet.push_back(make_unique>(u"Red_Mark", 4844)); + raceSet.push_back(make_unique>(u"Blue_Mark", 4843)); + + std::vector racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL); + for (auto* const racingController : racingControllers) { + auto* racingComponent = racingController->GetComponent(); + if (racingComponent) racingComponent->MsgConfigureRacingControl(config); + } +} diff --git a/dScripts/ai/RACING/TRACK_NS/NsRaceServer.h b/dScripts/ai/RACING/TRACK_NS/NsRaceServer.h new file mode 100644 index 000000000..8adcad430 --- /dev/null +++ b/dScripts/ai/RACING/TRACK_NS/NsRaceServer.h @@ -0,0 +1,12 @@ +#ifndef NSRACESERVER_H +#define NSRACESERVER_H + +#include "CppScripts.h" +#include "RaceImaginationServer.h" + +class NsRaceServer : public RaceImaginationServer { +public: + void OnStartup(Entity* self) override; +}; + +#endif //!NSRACESERVER_H