nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 18:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Script): Felmyst (#2965)

Browse Source 
Co-authored-by: Barbz <BarbzYHOOL@users.noreply.github.com>
This commit is contained in:
h0lysp4nk
2020-05-30 10:09:40 +01:00
committed by GitHub
parent 86f5c91427
commit 60b0c4201a
3 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
data/sql/updates/pending_db_world/rev_1588269002996885593.sql Normal file
View File

@@ -0,0 +1,46 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1588269002996885593');
-- Fix Kalec msg on Felmyst death
UPDATE `creature_text` SET
`Text` = 'Madrigosa deserved a far better fate. You did what had to be done, but this battle is far from over!',
`Sound` = '12439',
`comment` = 'kalec - SAY_GOOD_MADRIGOSA - when you kill Felmyst'
WHERE `CreatureID` = '24891' AND `GroupID` = '3' AND `ID` = '0';
UPDATE `broadcast_text` SET `MaleText` = 'Madrigosa deserved a far better fate. You did what had to be done, but this battle is far from over!', `SoundId` = '12439' WHERE `ID` = '24993';
-- CORRECT TRANSLATION
UPDATE `broadcast_text_locale` SET `MaleText` = 'Madrigosa hat ein besseres Schicksal verdient. Ihr habt getan, was getan werden musste - doch diese Schlacht ist noch lange nicht vorbei!' WHERE `ID` = '24993' AND `locale` = 'deDE';
UPDATE `broadcast_text_locale` SET `MaleText` = 'Madrigosa merecía un destino mejor. Hicisteis lo que teníais que hacer, pero esta batalla aún no ha acabado.' WHERE `ID` = '24993' AND `locale` = 'esES';
UPDATE `broadcast_text_locale` SET `MaleText` = 'Madrigosa merecía un destino mejor. Hicisteis lo que teníais que hacer, pero esta batalla aún no ha acabado.' WHERE `ID` = '24993' AND `locale` = 'esMX';
UPDATE `broadcast_text_locale` SET `MaleText` = 'Madrigosa méritait un sort plus clément. Vous avez fait ce qu''il fallait, mais cette bataille est loin d''être terminée !' WHERE `ID` = '24993' AND `locale` = 'frFR';
UPDATE `broadcast_text_locale` SET `MaleText` = '운명은 마드리고사에게 너무 가혹했습니다. 해야 할 일을 하셨지만, 이 전투가 끝나려면 멀었습니다!' WHERE `ID` = '24993' AND `locale` = 'koKR';
UPDATE `broadcast_text_locale` SET `MaleText` = 'Мадригоса не заслужила такой участи... Вы сделали то, что должны были сделать... но эта битва еще не окончена!' WHERE `ID` = '24993' AND `locale` = 'ruRU';
UPDATE `broadcast_text_locale` SET `MaleText` = '虽然玛蒂苟萨的命运不该如此悲惨，你们的所作所为仍然是必须和必要的，不过，这场战争远未结束！' WHERE `ID` = '24993' AND `locale` = 'zhCN';
UPDATE `broadcast_text_locale` SET `MaleText` = '瑪卓苟莎的命運不該如此悲慘。但你們只盡了自己的本分，而這場戰爭尚未結束!' WHERE `ID` = '24993' AND `locale` = 'zhTW';
-- fix Felmyst not displaying her emote and displaying complete bullshit instead (who the fuck did that)
UPDATE `creature_text` SET
`Text` = '%s takes a deep breath...',
`Type` = '16',
`TextRange` = '2',
`Sound` = 0,
`comment` = 'felmyst - EMOTE_BREATH - When she flies and casts'
WHERE `CreatureID` = '25038' AND `GroupID` = '6' AND `ID` = '0';
-- Fix the duplicate line in broadcast shit
UPDATE `broadcast_text` SET
`MaleText` = '%s takes a deep breath...',
`SoundId` = 0
WHERE `ID` = '25261';
-- Translation taken from existing rows so it's all good, i just fixed the "..."
UPDATE `broadcast_text_locale` SET `MaleText` = '%s holt tief Luft...' WHERE `ID` = '25261' AND `locale` = 'deDE';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s toma aliento...' WHERE `ID` = '25261' AND `locale` = 'esES';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s toma aliento...' WHERE `ID` = '25261' AND `locale` = 'esMX';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s inspire profondément...' WHERE `ID` = '25261' AND `locale` = 'frFR';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s|1이;가; 숨을 깊게 들이쉽니다' WHERE `ID` = '25261' AND `locale` = 'koKR';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s делает глубокий вдох...' WHERE `ID` = '25261' AND `locale` = 'ruRU';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s深深地吸了一口气' WHERE `ID` = '25261' AND `locale` = 'zhCN';
UPDATE `broadcast_text_locale` SET `MaleText` = '%s深深地吸了一口氣' WHERE `ID` = '25261' AND `locale` = 'zhTW';

16
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
View File

@@ -12,13 +12,13 @@
enum Yells
{
YELL_BIRTH = 0,
YELL_KILL = 1,
YELL_BREATH = 2,
YELL_TAKEOFF = 3,
YELL_BERSERK = 4,
YELL_DEATH = 5,
EMOTE_BREATH = 6
YELL_BIRTH = 0, // Glory to Kil'jaeden! Death to all who oppose!
YELL_KILL = 1, // I kill for the master! OR The end has come!
YELL_BREATH = 2, // Choke on your final breath
YELL_TAKEOFF = 3, // I am stronger than ever before!
YELL_BERSERK = 4, // No more hesitation! Your fates are written!
YELL_DEATH = 5, // Kil'jaeden will... prevail! AND Kalecgos line
EMOTE_BREATH = 6 // Felmyst takes a deep breath...
};
enum Spells
@@ -343,6 +343,7 @@ public:
Talk(EMOTE_BREATH);
break;
case EVENT_CORRUPT_TRIGGERS:
Talk(YELL_BREATH);
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(0));
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(500));
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(1000));
@@ -508,6 +509,7 @@ class spell_felmyst_fog_of_corruption_charm : public SpellScriptLoader
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveAurasDueToSpell(SPELL_FOG_OF_CORRUPTION_CHARM);
GetTarget()->RemoveAurasDueToSpell(SPELL_FOG_OF_CORRUPTION_CHARM2);
Unit::Kill(GetCaster(), GetTarget(), false);
}

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
View File

@@ -27,7 +27,7 @@ enum Yells
SAY_GOOD_AGGRO = 0,
SAY_GOOD_NEAR_DEATH = 1,
SAY_GOOD_NEAR_DEATH2 = 2,
SAY_GOOD_MADRIGOSA = 3
SAY_GOOD_MADRIGOSA = 3 // Madrigosa deserved a far better fate. You did what had to be done, but this battle is far from over!
};
enum Spells