Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 23:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't give activity loot for Battle of Nimbus Station

Browse Source 
Address an issue on Brick Mesa where Battle of Nimbus Station was dropping activity loot.  Tested completing Battle of Nimbus Station and ending early and was not given loot as is expected.
This commit is contained in:
EmosewaMC 2022-06-12 19:25:28 -07:00
parent df9f9f08b6
commit ef8ea13d99
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dScripts/ActivityManager.cpp
View File

@ -48,7 +48,7 @@ float_t ActivityManager::GetActivityValue(Entity *self, const LWOOBJID playerID,
} }
void ActivityManager::StopActivity(Entity *self, const LWOOBJID playerID, const uint32_t score, void ActivityManager::StopActivity(Entity *self, const LWOOBJID playerID, const uint32_t score,
const uint32_t value1, const uint32_t value2, bool quit) { const uint32_t value1, const uint32_t value2, bool quit, bool givingActivityLoot) {
int32_t gameID = 0; int32_t gameID = 0;
auto* sac = self->GetComponent<ScriptedActivityComponent>(); auto* sac = self->GetComponent<ScriptedActivityComponent>();
@ -70,7 +70,7 @@ void ActivityManager::StopActivity(Entity *self, const LWOOBJID playerID, const
SetActivityValue(self, playerID, 1, value1); SetActivityValue(self, playerID, 1, value1);
SetActivityValue(self, playerID, 2, value2); SetActivityValue(self, playerID, 2, value2);
LootGenerator::Instance().GiveActivityLoot(player, self, gameID, CalculateActivityRating(self, playerID)); if (givingActivityLoot) LootGenerator::Instance().GiveActivityLoot(player, self, gameID, CalculateActivityRating(self, playerID));
// Save the new score to the leaderboard and show the leaderboard to the player // Save the new score to the leaderboard and show the leaderboard to the player
LeaderboardManager::SaveScore(playerID, gameID, score, value1); LeaderboardManager::SaveScore(playerID, gameID, score, value1);

2
dScripts/ActivityManager.h
View File

@ -17,7 +17,7 @@ public:
static float_t GetActivityValue(Entity *self, LWOOBJID playerID, uint32_t valueIndex) ; static float_t GetActivityValue(Entity *self, LWOOBJID playerID, uint32_t valueIndex) ;
static bool TakeActivityCost(const Entity* self, LWOOBJID playerID); static bool TakeActivityCost(const Entity* self, LWOOBJID playerID);
static uint32_t GetActivityID(const Entity* self); static uint32_t GetActivityID(const Entity* self);
void StopActivity(Entity *self, LWOOBJID playerID, uint32_t score, uint32_t value1 = 0, uint32_t value2 = 0, bool quit = false); void StopActivity(Entity *self, LWOOBJID playerID, uint32_t score, uint32_t value1 = 0, uint32_t value2 = 0, bool quit = false, bool givingActivityLoot = true);
virtual uint32_t CalculateActivityRating(Entity* self, LWOOBJID playerID); virtual uint32_t CalculateActivityRating(Entity* self, LWOOBJID playerID);
static void GetLeaderboardData(Entity *self, LWOOBJID playerID, uint32_t activityID, uint32_t numResults = 0); static void GetLeaderboardData(Entity *self, LWOOBJID playerID, uint32_t activityID, uint32_t numResults = 0);
// void FreezePlayer(Entity *self, const LWOOBJID playerID, const bool state) const; // void FreezePlayer(Entity *self, const LWOOBJID playerID, const bool state) const;

2
dScripts/BaseWavesServer.cpp
View File

@ -371,7 +371,7 @@ void BaseWavesServer::GameOver(Entity *self, bool won) {
missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_MINIGAME, time, self->GetObjectID(), self->GetVar<std::string>(MissionTypeVariable)); missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_MINIGAME, time, self->GetObjectID(), self->GetVar<std::string>(MissionTypeVariable));
} }
StopActivity(self, playerID, wave, time, score); StopActivity(self, playerID, wave, time, score, false, false);
} }
} }