Scripts/SFK: scripted Lord Godfrey intro events for both factions and cleaned up header file

This commit is contained in:
Ovahlord committed 2020-01-09 21:39:09 +01:00
1 parent be753e8671
commit 0aa4b560df
5 files changed
+138 -116

No files matched your search

@@ -44,7 +44,8 @@ enum ApothecarySpells
SPELL_PERFUME_SPILL = 68798,
SPELL_COLOGNE_SPILL = 68614,
SPELL_PERFUME_SPILL_DAMAGE = 68927,
SPELL_COLOGNE_SPILL_DAMAGE = 68934
SPELL_COLOGNE_SPILL_DAMAGE = 68934,
SPELL_PERMANENT_FEIGN_DEATH = 29266
};
enum ApothecarySays
@@ -38,13 +38,13 @@ ObjectData const gameobjectData[] =
{
{ GO_COURTYARD_DOOR, DATA_COURTYARD_DOOR, },
{ GO_SORCERERS_DOOR, DATA_SORCERER_GATE, },
{ GO_ARUGAL_DOOR, DATA_ARUGAL_DOOR, },
{ GO_ARUGALS_LAIR, DATA_ARUGAL_DOOR, },
{ 0, 0 } // END
};
DoorData const doorData[] =
{
{ GO_ARUGAL_DOOR, DATA_LORD_GODFREY, DOOR_TYPE_ROOM },
{ GO_ARUGALS_LAIR, DATA_LORD_GODFREY, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM } // END
};
@@ -80,7 +80,10 @@ enum SpawnGroups
SPAWN_GROUP_COMMANDER_SPRINGVALE_TROUPS_HORDE = 428, // Spawned for Horde players when Commander Springvale or Lord Walden has been defeated
SPAWN_GROUP_COMMANDER_SPRINGVALE_BELMONT = 429, // Spawned for Horde players when Commander Springvale has been defeated
SPAWN_GROUP_LORD_WALDEN_BELMONT = 430 // Spawned for Horde players when Lord Walden has been defeated
SPAWN_GROUP_LORD_WALDEN_BELMONT = 430, // Spawned for Horde players when Lord Walden has been defeated
SPAWN_GROUP_LORD_GODFREY_IVAR_BLOODFANG = 431, // Spawned for Alliance players when triggering an areatrigger near Lord Godfrey's room
SPAWN_GROUP_LORD_GODFREY_BELMONT = 432 // Spawned for Horde players when triggering an areatrigger near Lord Godfrey's room
};
struct SpawnGroupInfo
@@ -172,10 +175,13 @@ public:
go->SetGoState(GO_STATE_ACTIVE);
break;
case GO_SORCERERS_DOOR:
case GO_ARUGAL_DOOR:
if (GetBossState(DATA_LORD_WALDEN) == DONE)
go->SetGoState(GO_STATE_ACTIVE);
break;
case GO_ARUGALS_LAIR:
if (GetBossState(DATA_LORD_GODFREY) != DONE)
go->SetGoState(GO_STATE_READY);
break;
default:
break;
}
@@ -224,6 +230,17 @@ public:
if (*_teamInInstance == ALLIANCE)
instance->SpawnGroupSpawn(SPAWN_GROUP_OUTSIDE_TROUPS_ALLIANCE);
break;
case DATA_GODFREY_INTRO_SPAWN:
if (*_teamInInstance == ALLIANCE)
instance->SpawnGroupDespawn(SPAWN_GROUP_LORD_WALDEN_TROUPS_ALLIANCE);
else
{
instance->SpawnGroupDespawn(SPAWN_GROUP_COMMANDER_SPRINGVALE_TROUPS_HORDE);
instance->SpawnGroupDespawn(*_teamInInstance == ALLIANCE ? SPAWN_GROUP_LORD_GODFREY_IVAR_BLOODFANG : SPAWN_GROUP_LORD_GODFREY_BELMONT);
}
instance->SpawnGroupSpawn(*_teamInInstance == ALLIANCE ? SPAWN_GROUP_LORD_GODFREY_IVAR_BLOODFANG : SPAWN_GROUP_LORD_GODFREY_BELMONT);
break;
default:
break;
}
@@ -36,53 +36,19 @@ enum MovePoints
enum Texts
{
// Deathstalker Commander Belmont
SAY_BELMONT_ASHBURY_DEAD = 0,
SAY_BELMONT_MOVE_TO_DOOR = 1,
SAY_BELMONT_UNLOCK_DOOR = 2,
SAY_BELMONT_OPEN_DOOR = 3,
SAY_BELMONT_SILVERLAINE_DEAD = 4,
SAY_BELMONT_TO_CROMUSH_1 = 5,
SAY_BELMONT_TO_CROMUSH_2 = 6,
SAY_BELMONT_TO_CROMUSH_3 = 7,
SAY_BELMONT_WALDEN_DEAD = 8,
SAY_BELMONT_WALDEN_OUTRO = 9,
SAY_BELMONT_DOOR_CLOSED = 10,
SAY_BELMONT_DOOR_OPENED = 11,
SAY_BELMONT_GODFREY = 12,
// High Warlord Cromush
SAY_CROMUSH_TO_BELMONT_1 = 0,
SAY_CROMUSH_TO_BELMONT_2 = 1,
SAY_CROMUSH_FOR_THE_HORDE = 2,
SAY_CROMUSH_TO_BELMONT_3 = 3,
// Packleader Ivar Bloodfang
SAY_IVAR_ASHBURY_DEAD_1 = 0,
SAY_IVAR_ASHBURY_DEAD_2 = 1,
SAY_IVAR_TALK_TO_PACK_1 = 2,
SAY_IVAR_MOVE_TO_COURTYARD = 3,
SAY_IVAR_UNLOCK_DOOR = 4,
SAY_IVAR_EMOTE_BERSERKER = 5,
SAY_IVAR_SILVERLAINE_DEAD = 6,
SAY_IVAR_WALDEN_INTRO = 7,
SAY_IVAR_WALDEN_DEAD = 8,
SAY_IVAR_ATTACK_WORGEN = 9,
SAY_IVAR_OPEN_GATE = 10,
SAY_IVAR_DOOR_CLOSED_1 = 11,
SAY_IVAR_DOOR_CLOSED_2 = 12,
SAY_IVAR_ROOM_OPEN = 13,
SAY_IVAR_WALDEN_INTRO = 7,
// Bloodfang Berserker
SAY_SHOW_COMMANDER_SPRINGVALE = 1,
SAY_SHOW_COMMANDER_SPRINGVALE = 1,
// DEBUG Announcer
SAY_ANNOUNCE_GARGOYLES = 0
SAY_ANNOUNCE_GARGOYLES = 0
};
enum SKShieldOfBones
{
SPELL_SHIELD_OF_BONES_TRIGGERED = 91631,
SPELL_SHIELD_OF_BONES_TRIGGERED = 91631
};
class spell_sfk_shield_of_bones : public AuraScript
@@ -143,7 +109,7 @@ public:
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (Creature* ivar = player->FindNearestCreature(NPC_PACKLEADER_IVAR, 15.f))
if (Creature* ivar = player->FindNearestCreature(NPC_PACKLEADER_IVAR_BLOODFANG, 15.f))
if (ivar->IsAIEnabled)
ivar->AI()->Talk(SAY_IVAR_WALDEN_INTRO, player);
@@ -156,8 +122,11 @@ class at_sfk_godfrey_intro : public OnlyOnceAreaTriggerScript
public:
at_sfk_godfrey_intro() : OnlyOnceAreaTriggerScript("at_sfk_godfrey_intro") { }
bool _OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*areaTrigger*/) override
bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
{
if (InstanceScript* instance = player->GetInstanceScript())
instance->SetData(DATA_GODFREY_INTRO_SPAWN, DONE);
return true;
}
};
@@ -25,75 +25,6 @@
uint32 const EncounterCount = 7;
enum SKSpells
{
// Ivar Bloodfang
SPELL_CLEAVE = 87719,
// High Warlord Cromush
SPELL_TELEPORT_VISUAL = 12980,
// Bloodfang Berserker
SPELL_STEALTH = 58506,
SPELL_PERMANENT_FEIGN_DEATH = 29266,
// Plague Dummy
SPELL_DISEASE_CLOUD = 88198
};
enum SKCreatures
{
// Baron Ashbury
BOSS_BARON_ASHBURY = 46962,
// Baron Silverlaine
BOSS_BARON_SILVERLAINE = 3887,
NPC_NANDOS_DUMMY = 51047,
NPC_WOLF_MASTER_NANDOS = 50851,
NPC_LUPINE_SPECTRE = 50923,
NPC_ODO_DUMMY = 50934,
NPC_ODO_THE_BLINDWATCHER = 50857,
NPC_RAZORCLAW_DUMMY = 51080,
NPC_RAZORCLAW_THE_BUTCHER = 50869,
NPC_RETHILGORE_DUMMY = 51085,
NPC_RETHILGORE = 50834,
// Commander Springvale
BOSS_COMMANDER_SPRINGVALE = 4278,
NPC_TORMENTED_OFFICER = 50615,
NPC_WAILING_GUARDSMAN = 50613,
NPC_SHIELD_FOCUS = 50547,
NPC_DESECRATION_STALKER = 50503,
// Lord Walden
BOSS_LORD_WALDEN = 46963,
NPC_MYSTERY_MIXTURE = 50522,
// Lord Godfrey
BOSS_LORD_GODFREY = 46964,
NPC_BLOODTHIRSTY_GHOUL = 50561,
NPC_PISTOL_BARRAGE_DUMMY = 52065,
// Generic NPCs
NPC_VETERAN_FORSAKEN_TROOPER = 47030,
NPC_DEATHSTALKER_BELMONT = 47293,
NPC_FORSAKEN_BLIGHTSPREADER = 47031,
NPC_HIGH_WARLORD_CROMUSH = 47294,
NPC_DISEASE_BUNNY = 23837,
NPC_BLOODFANG_BERSERKER = 47027,
NPC_PACKLEADER_IVAR = 47006,
NPC_HIGH_MAGISTRATE_HENRY = 47862,
NPC_DEBUG_ANNOUNCER = 43679,
};
enum SKGameObjectIds
{
GO_COURTYARD_DOOR = 18895,
GO_SORCERERS_DOOR = 18972,
GO_ARUGAL_DOOR = 18971
};
enum SKDataTypes
{
// Bosses
@@ -104,16 +35,65 @@ enum SKDataTypes
DATA_LORD_GODFREY = 4,
DATA_APOTHECARY_HUMMEL = 5,
// Additional data
DATA_TEAM_IN_INSTANCE,
DATA_OUTSIDE_TROUPS_SPAWN,
DATA_GODFREY_INTRO_SPAWN,
DATA_DEBUG_ANNOUNCER,
DATA_ARUGAL_DOOR,
DATA_SORCERER_GATE,
DATA_COURTYARD_DOOR
};
enum SKCreatures
{
// Bosses
BOSS_BARON_ASHBURY = 46962,
BOSS_BARON_SILVERLAINE = 3887,
BOSS_COMMANDER_SPRINGVALE = 4278,
BOSS_LORD_WALDEN = 46963,
BOSS_LORD_GODFREY = 46964,
// Encounter related creatures
/*Baron Silverlaine*/
NPC_NANDOS_DUMMY = 51047,
NPC_WOLF_MASTER_NANDOS = 50851,
NPC_LUPINE_SPECTRE = 50923,
NPC_ODO_DUMMY = 50934,
NPC_ODO_THE_BLINDWATCHER = 50857,
NPC_RAZORCLAW_DUMMY = 51080,
NPC_RAZORCLAW_THE_BUTCHER = 50869,
NPC_RETHILGORE_DUMMY = 51085,
NPC_RETHILGORE = 50834,
/*Commander Springvale*/
NPC_TORMENTED_OFFICER = 50615,
NPC_WAILING_GUARDSMAN = 50613,
NPC_SHIELD_FOCUS = 50547,
NPC_DESECRATION_STALKER = 50503,
/*Lord Walden*/
NPC_MYSTERY_MIXTURE = 50522,
/*Lord Godfrey*/
NPC_BLOODTHIRSTY_GHOUL = 50561,
NPC_PISTOL_BARRAGE_DUMMY = 52065,
// Generic NPCs
NPC_HIGH_WARLORD_CROMUSH = 47294,
NPC_PACKLEADER_IVAR_BLOODFANG = 47006,
NPC_DEBUG_ANNOUNCER = 43679,
NPC_BLOODFANG_BERSERKER = 47027,
NPC_FORSAKEN_BLIGHTSPREADER = 47031
};
enum SKGameObjectIds
{
GO_COURTYARD_DOOR = 18895,
GO_SORCERERS_DOOR = 18972,
GO_ARUGALS_LAIR = 18971
};
template<class AI>
AI* GetShadowfangKeepAI(Creature* creature)
{