nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 10:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Instance/Culling of Stratholme/Trial of Crusader) removed duplicated gossip_menus, fixed hardcoded texts (#18516)

Browse Source 
* (Instance/Culling of Stratholme) removed duplicated gossip_menus, fixed hardcoded texts

* Update culling_of_stratholme.sql

* Update culling_of_stratholme.sql

* (Instance/TrialOfTheCrusader) fixed hardcoded text from Jaraxxus text line
boss_twin_valkyr: removed unnececarry random txt line select (already exist groupid 6 id 0 and 1 in creature_text)
added ruRU locale for Acidmaw and Dreadscale GroupID 2

* move sqls

* Update culling_of_stratholme.sql

* Update data/sql/updates/pending_db_world/culling_of_stratholme.sql

Co-authored-by: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>

* Update culling_of_stratholme.sql

* update naming of variables to better understand the sequence of events

* Change locale attribute to Locale

I'm not 100% sure, but since in Linux, uppercase and lowercase letters represent different values, I think that's why it doesn't pass the tests. In Windows nothing happens, but in Linux there are 2 different attributes.

* strange MySQL in Linux

* Update trial_of_crusader.sql

* updated sequence of txt lines with cityman before Malganis appear according to @Trinitycore enum RPEventLines2
combine all SQL in 1 file

---------

Co-authored-by: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>
Co-authored-by: Walter Pagani <paganiwalter@gmail.com>
This commit is contained in:
chaosua
2024-03-24 17:47:34 +02:00
committed by GitHub
parent f13e3dbe9d
commit 4e95c9e006
6 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
View File

@@ -37,7 +37,8 @@ enum Yells
{
SAY_AGGRO = 0,
SAY_DEATH = 1,
SAY_FAIL = 2
SAY_FAIL = 2,
SAY_THANKS = 0
};
class boss_infinite_corruptor : public CreatureScript
@@ -98,7 +99,7 @@ public:
{
cr->DespawnOrUnsummon(5000);
cr->RemoveAllAuras();
cr->Say("You have my thanks for saving my existence in this timeline. Now i must report back to my superiors. They must know immediately of what i just experienced.", LANG_UNIVERSAL);
cr->AI()->Talk(SAY_THANKS);
}
}
}

8
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
View File

@@ -97,13 +97,15 @@ enum Says
//Cityman
SAY_PHASE202 = 0,
SAY_PHASE204_1 = 0,
//Crazyman
SAY_PHASE204 = 0,
SAY_PHASE204 = 1,
//Drakonian
SAY_PHASE302 = 0,
SAY_PHASE305 = 1,
SAY_PHASE305_1 = 39,
};
enum NPCs
@@ -559,7 +561,7 @@ public:
case 11:
if (Creature* cityman = GetEventNpc(NPC_CITY_MAN2))
{
cityman->Say("Oh no...", LANG_UNIVERSAL); // missing script_text
cityman->AI()->Talk(SAY_PHASE204_1);
me->CastSpell(cityman, SPELL_ARTHAS_CRUSADER_STRIKE, true);
}
me->SetReactState(REACT_DEFENSIVE);
@@ -1019,7 +1021,7 @@ public:
}
summons.DespawnAll();
me->Say("I can't afford to spare you.", LANG_UNIVERSAL);
Talk(SAY_PHASE305_1);
me->SetFacingTo(0.0f);
ScheduleNextEvent(currentEvent, 5000);
break;

8
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
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);
}
}

3
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
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);

1
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
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,