Scripts/Stratholme: moved Timmy the Cruel's spawning to database since he is spawned by default since Cataclysm

*linked him to spawn groups while at it
This commit is contained in:
Ovahlord committed 2023-06-02 21:55:59 +02:00
1 parent 6cbc8119f1
commit b5f2c6f4c5
3 files changed
+17 -44

No files matched your search

@@ -39,9 +39,6 @@ enum StratholmeMisc
SAY_YSIDA_SAVED = 0
};
Position const timmyTheCruelSpawnPosition = { 3625.358f, -3188.108f, 130.3985f, 4.834562f };
EllipseBoundary const beforeScarletGate(Position(3671.158f, -3181.79f), 60.0f, 40.0f);
ObjectData const creatureData[] =
{
{ NPC_HEARTSINGER_FORRESTEN, BOSS_HEARTHSINGER_FORRESTEN },
@@ -71,16 +68,11 @@ class instance_stratholme : public InstanceMapScript
for (uint8 i = 0; i < 5; ++i)
IsSilverHandDead[i] = false;
timmySpawned = false;
scarletsKilled = 0;
}
uint32 EncounterState[MAX_ENCOUNTER_OLD];
uint8 scarletsKilled;
bool IsSilverHandDead[5];
bool timmySpawned;
ObjectGuid serviceEntranceGUID;
ObjectGuid gauntletGate1GUID;
@@ -101,33 +93,6 @@ class instance_stratholme : public InstanceMapScript
GuidSet abomnationGUID;
EventMap events;
void OnUnitDeath(Unit* who) override
{
switch (who->GetEntry())
{
case NPC_CRIMSON_GUARDSMAN:
case NPC_CRIMSON_CONJUROR:
case NPC_CRIMSON_INITATE:
case NPC_CRIMSON_GALLANT:
{
if (!timmySpawned)
{
Position pos = who->ToCreature()->GetHomePosition();
// check if they're in front of the entrance
if (beforeScarletGate.IsWithinBoundary(pos))
{
if (++scarletsKilled >= TIMMY_THE_CRUEL_CRUSADERS_REQUIRED)
{
instance->SummonCreature(NPC_TIMMY_THE_CRUEL, timmyTheCruelSpawnPosition);
timmySpawned = true;
}
}
}
break;
}
}
}
bool StartSlaugtherSquare()
{
//change to DONE when crystals implemented
@@ -85,13 +85,7 @@ enum STRCreatureIds
NPC_ABOM_BILE = 10416,
NPC_ABOM_VENOM = 10417,
NPC_BLACK_GUARD = 10394,
NPC_YSIDA = 16031,
// Scarlet side creatures
NPC_CRIMSON_GUARDSMAN = 10418,
NPC_CRIMSON_CONJUROR = 10419,
NPC_CRIMSON_INITATE = 10420,
NPC_CRIMSON_GALLANT = 10424
NPC_YSIDA = 16031
};
enum STRGameobjectIds
@@ -125,8 +119,6 @@ enum STRSpellIds
enum STRMisc
{
//! amount of crusade monsters required to be killed in order for timmy the cruel to spawn
TIMMY_THE_CRUEL_CRUSADERS_REQUIRED = 15,
MAX_ENCOUNTER_OLD = 6
};