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

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-03-28 19:15:09 +08:00
parent 97604fab77 3ff8de2086
commit 6338010e09
36 changed files with 3768 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+3 -5
View File
@@ -36,10 +36,9 @@ enum Yells
EMOTE_VORTEX = 3,
EMOTE_TWINK_PACT = 4,
SAY_TWINK_PACT = 5,
SAY_KILL_PLAYER_1 = 6,
SAY_KILL_PLAYER = 6,
SAY_BERSERK = 7,
SAY_DEATH = 8,
SAY_KILL_PLAYER_2 = 9,
};
enum Equipment
@@ -502,10 +501,9 @@ struct boss_twin_valkyrAI : public ScriptedAI
{
if( who->GetTypeId() == TYPEID_PLAYER )
{
int32 id = urand(0, 1) ? SAY_KILL_PLAYER_1 : SAY_KILL_PLAYER_2;
Talk(id);
Talk(SAY_KILL_PLAYER);
if( Creature* twin = GetSister() )
twin->AI()->Talk(id);
twin->AI()->Talk(SAY_KILL_PLAYER);
}
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+1 -2
View File
@@ -884,8 +884,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) )
{
c->Yell("Banished to the Nether!", LANG_UNIVERSAL);
c->PlayDirectSound(16146, 0);
c->AI()->Talk(SAY_STAGE_1_06_1);
if( Creature* f = instance->GetCreature(NPC_FizzlebangGUID) )
{
c->CastSpell(f, 67888, true);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+1
View File
@@ -260,6 +260,7 @@ enum eTexts
// Lord Jaraxxus
SAY_STAGE_1_05 = 0,
SAY_STAGE_1_06_1 = 9,
// The Lich King
SAY_STAGE_4_02 = 0,