sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/SSC): codestyle fix in SSC after recent PR (#17952)

Browse Source 
initial
This commit is contained in:
Dan
2023-12-08 00:10:51 +01:00
committed by GitHub
parent 3ac77eb379
commit 2d6c012e1d
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+12 -14
View File
@@ -64,7 +64,7 @@ public:
LoadObjectData(creatureData, nullptr); LoadObjectData(creatureData, nullptr);
LoadMinionData(minionData); LoadMinionData(minionData);
AliveKeepersCount = 0; _aliveKeepersCount = 0;
} }
bool SetBossState(uint32 type, EncounterState state) override bool SetBossState(uint32 type, EncounterState state) override
@@ -74,7 +74,7 @@ public:
if (type == DATA_LADY_VASHJ) if (type == DATA_LADY_VASHJ)
for (uint8 i = 0; i < 4; ++i) for (uint8 i = 0; i < 4; ++i)
if (GameObject* gobject = instance->GetGameObject(ShieldGeneratorGUID[i])) if (GameObject* gobject = instance->GetGameObject(_shieldGeneratorGUID[i]))
gobject->SetGameObjectFlag(GO_FLAG_NOT_SELECTABLE); gobject->SetGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
return true; return true;
@@ -88,7 +88,7 @@ public:
case GO_SHIELD_GENERATOR2: case GO_SHIELD_GENERATOR2:
case GO_SHIELD_GENERATOR3: case GO_SHIELD_GENERATOR3:
case GO_SHIELD_GENERATOR4: case GO_SHIELD_GENERATOR4:
ShieldGeneratorGUID[go->GetEntry() - GO_SHIELD_GENERATOR1] = go->GetGUID(); _shieldGeneratorGUID[go->GetEntry() - GO_SHIELD_GENERATOR1] = go->GetGUID();
break; break;
} }
@@ -102,7 +102,7 @@ public:
case NPC_COILFANG_SHATTERER: case NPC_COILFANG_SHATTERER:
case NPC_COILFANG_PRIESTESS: case NPC_COILFANG_PRIESTESS:
if (creature->GetPositionX() > 190.0f) if (creature->GetPositionX() > 190.0f)
--AliveKeepersCount; --_aliveKeepersCount;
break; break;
case NPC_CYCLONE_KARATHRESS: case NPC_CYCLONE_KARATHRESS:
creature->GetMotionMaster()->MoveRandom(50.0f); creature->GetMotionMaster()->MoveRandom(50.0f);
@@ -125,17 +125,15 @@ public:
switch (type) switch (type)
{ {
case DATA_PLATFORM_KEEPER_RESPAWNED: case DATA_PLATFORM_KEEPER_RESPAWNED:
++AliveKeepersCount; if (_aliveKeepersCount < MAX_KEEPER_COUNT)
if (AliveKeepersCount > MAX_KEEPER_COUNT)
{ {
AliveKeepersCount = MAX_KEEPER_COUNT; ++_aliveKeepersCount;
} }
break; break;
case DATA_PLATFORM_KEEPER_DIED: case DATA_PLATFORM_KEEPER_DIED:
--AliveKeepersCount; if (_aliveKeepersCount > MIN_KEEPER_COUNT)
if (AliveKeepersCount < MIN_KEEPER_COUNT)
{ {
AliveKeepersCount = MIN_KEEPER_COUNT; --_aliveKeepersCount;
} }
break; break;
case DATA_BRIDGE_ACTIVATED: case DATA_BRIDGE_ACTIVATED:
@@ -145,7 +143,7 @@ public:
case DATA_ACTIVATE_SHIELD: case DATA_ACTIVATE_SHIELD:
if (Creature* vashj = GetCreature(DATA_LADY_VASHJ)) if (Creature* vashj = GetCreature(DATA_LADY_VASHJ))
{ {
for (auto const& shieldGuid : ShieldGeneratorGUID) for (auto const& shieldGuid : _shieldGeneratorGUID)
{ {
if (GameObject* gobject = instance->GetGameObject(shieldGuid)) if (GameObject* gobject = instance->GetGameObject(shieldGuid))
{ {
@@ -161,14 +159,14 @@ public:
uint32 GetData(uint32 type) const override uint32 GetData(uint32 type) const override
{ {
if (type == DATA_ALIVE_KEEPERS) if (type == DATA_ALIVE_KEEPERS)
return AliveKeepersCount; return _aliveKeepersCount;
return 0; return 0;
} }
private: private:
ObjectGuid ShieldGeneratorGUID[4]; ObjectGuid _shieldGeneratorGUID[4];
int32 AliveKeepersCount; int32 _aliveKeepersCount;
}; };
InstanceScript* GetInstanceScript(InstanceMap* map) const override InstanceScript* GetInstanceScript(InstanceMap* map) const override