diff options
author | Killyana <morphone1@gmail.com> | 2018-09-21 15:29:34 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-11-10 00:03:41 +0100 |
commit | 910a00bb1e6294a4ed36ebdb31555f0122e16668 (patch) | |
tree | 2f9d6ecb271cb2e58cc50106b732a4198340c5ea | |
parent | f2456ff319b2145457da01ec78844fdc32d8713b (diff) |
DB/Quest: Hah...You're Not So Big Now!
Closes #22478
(cherry picked from commit 868f810e11524401175b45190c2e4d947fc28cff)
-rw-r--r-- | sql/updates/world/master/2021_11_09_08_world_2018_09_21_01_world.sql | 35 | ||||
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 3 | ||||
-rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp | 47 |
3 files changed, 35 insertions, 50 deletions
diff --git a/sql/updates/world/master/2021_11_09_08_world_2018_09_21_01_world.sql b/sql/updates/world/master/2021_11_09_08_world_2018_09_21_01_world.sql new file mode 100644 index 00000000000..043d29b347c --- /dev/null +++ b/sql/updates/world/master/2021_11_09_08_world_2018_09_21_01_world.sql @@ -0,0 +1,35 @@ +-- +DELETE FROM `spell_scripts` WHERE `id` IN (45691,45685); +INSERT INTO `spell_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(45691,0,8,25505,0,0,0,0,0,0), +(45685,0,8,25505,0,0,0,0,0,0); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`="" WHERE `entry` IN (25434); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25434) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(25434,0,0,0,0,0,100,0,1000,1000,8000,9000,11,50413,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Magmoth Crusher - IC - Cast Magnataur Charge'), +(25434,0,1,0,0,0,100,0,3000,6000,7000,12000,11,50410,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Magmoth Crusher - IC - Cast Tusk Strike'), +(25434,0,2,0,6,0,100,1,0,0,0,0,85,45685,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Magmoth Crusher - On Just Died - Cast Hah... : Magnataur On Death 2'); +UPDATE `smart_scripts` SET `target_type`=7, `action_type`=85, `action_param2`=2 WHERE `entryorguid` IN (25432) AND `source_type`=0 AND `id`=2; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN (25434,25432); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 3, 25434, 0, 0, 1, 1, 45673, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25434, 0, 1, 1, 1, 45672, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25434, 0, 2, 1, 1, 45677, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25434, 0, 3, 1, 1, 45681, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25434, 0, 4, 1, 1, 45683, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25432, 0, 0, 1, 1, 45673, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25432, 0, 1, 1, 1, 45672, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25432, 0, 2, 1, 1, 45677, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25432, 0, 3, 1, 1, 45681, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'), +(22, 3, 25432, 0, 4, 1, 1, 45683, 0, 0, 0, 0, 0, '', 'SAI triggers only if it has aura"'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (51912); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,51912,0,0,31,1,3,25434,0,0,'','Spell Crafty''s Ultra-Advanced Proto-Typical Shortening Blaster'), +(17,0,51912,0,1,31,1,3,25432,0,0,'','Spell Crafty''s Ultra-Advanced Proto-Typical Shortening Blaster'); + +DELETE FROM `spell_custom_attr` WHERE `entry`=51912; +INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES +(51912, 4096); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 2560a6d94c2..d10b55b1473 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3448,9 +3448,6 @@ void Spell::EffectScriptEffect() if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) return; - if (roll_chance_i(50)) // chance unknown, using 50 - return; - static uint32 const spellPlayer[5] = { 45674, // Bigger! diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 20e7d2e1dbc..d67079c5cac 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1922,52 +1922,6 @@ public: }; /*###### -## Quest 11653: Hah... You're Not So Big Now! -######*/ - -enum NotSoBig -{ - QUEST_YOU_RE_NOT_SO_BIG_NOW = 11653, - SPELL_AURA_NOTSOBIG_1 = 45672, - SPELL_AURA_NOTSOBIG_2 = 45673, - SPELL_AURA_NOTSOBIG_3 = 45677, - SPELL_AURA_NOTSOBIG_4 = 45681 -}; - -class npc_magmoth_crusher : public CreatureScript -{ -public: - npc_magmoth_crusher() : CreatureScript("npc_magmoth_crusher") { } - - struct npc_magmoth_crusherAI : public ScriptedAI - { - npc_magmoth_crusherAI(Creature* creature) : ScriptedAI(creature) { } - - void JustDied(Unit* killer) override - { - if (!killer || killer->GetTypeId() != TYPEID_PLAYER) - return; - - Player* player = killer->ToPlayer(); - - if (player->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE && - (me->HasAura(SPELL_AURA_NOTSOBIG_1) || me->HasAura(SPELL_AURA_NOTSOBIG_2) || - me->HasAura(SPELL_AURA_NOTSOBIG_3) || me->HasAura(SPELL_AURA_NOTSOBIG_4))) - { - Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); - if (qInfo) - player->KilledMonsterCredit(qInfo->Objectives[0].ObjectID); - } - } - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_magmoth_crusherAI(creature); - } -}; - -/*###### ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ @@ -2505,7 +2459,6 @@ void AddSC_borean_tundra() new npc_mootoo_the_younger(); new npc_bonker_togglevolt(); new npc_trapped_mammoth_calf(); - new npc_magmoth_crusher(); new npc_valiance_keep_cannoneer(); new npc_warmage_coldarra(); new npc_hidden_cultist(); |