Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-09-06 23:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix shooting gallery bugs (#1702)

Browse Source
This commit is contained in:
David Markowitz
2024-12-29 16:21:22 -08:00
committed by GitHub
parent 1b9f7e44c7
commit 0b261e934f
19 changed files with 368 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h
View File

@@ -44,15 +44,11 @@ struct SGConstants {
uint32_t chargedPoints;
std::string rewardModelGroup;
uint32_t activityID;
uint32_t scoreReward1;
std::map<std::string, uint32_t> scoreRewards;
uint32_t scoreLootMatrix1;
uint32_t scoreReward2;
uint32_t scoreLootMatrix2;
uint32_t scoreReward3;
uint32_t scoreLootMatrix3;
uint32_t scoreReward4;
uint32_t scoreLootMatrix4;
uint32_t scoreReward5;
uint32_t scoreLootMatrix5;
float_t firstWaveStartTime;
float_t inBetweenWavePause;
@@ -68,6 +64,8 @@ public:
void OnActivityTimerDone(Entity* self, const std::string& name) override;
void OnActivityTimerUpdate(Entity* self, const std::string& name, float_t timeRemaining, float_t elapsedTime) override;
void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled) override;
void OnActivityNotify(Entity* self, GameMessages::ActivityNotify& notify) override;
void OnShootingGalleryFire(Entity& self, GameMessages::ShootingGalleryFire& fire) override;
void SuperChargeTimerFunc(Entity* self);
void SpawnWaveTimerFunc(Entity* self);
void EndWaveTimerFunc(Entity* self);
@@ -142,6 +140,7 @@ private:
std::u16string CannonBallSkillIDVariable = u"cbskill";
std::u16string HideSuperChargeVariable = u"HideSuper";
std::u16string AudioFinalWaveDoneVariable = u"Audio_Final_Wave_Done";
std::u16string ModelPercentVariable = u"modelPercent";
std::string SpawnWaveTimer = "SpawnWave";
std::string EndWaveTimer = "EndWave";