From 961aaf5b9d7b449b107e25e621e133eeeb0ca049 Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 14 Sep 2014 12:26:52 +0200 Subject: Rename SQL --- sql/updates/world/2014_09_13_05_world_misc_335.sql | 8 ++++++++ sql/updates/world/2014_09_13_05world_misc_335.sql | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 sql/updates/world/2014_09_13_05_world_misc_335.sql delete mode 100644 sql/updates/world/2014_09_13_05world_misc_335.sql (limited to 'sql') diff --git a/sql/updates/world/2014_09_13_05_world_misc_335.sql b/sql/updates/world/2014_09_13_05_world_misc_335.sql new file mode 100644 index 00000000000..eb701a48cc4 --- /dev/null +++ b/sql/updates/world/2014_09_13_05_world_misc_335.sql @@ -0,0 +1,8 @@ +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`IN(183877); +DELETE FROM `smart_scripts` WHERE `entryorguid`IN(183877) AND `source_type`=1; + +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 +(183877, 1, 0, 0, 62, 0, 100, 1, 8023, 0, 0, 0, 12, 19671, 8, 60000, 0, 0, 0, 8, 0, 0, 0, -351.345, -69.7118, -0.8754317, 4.34587, 'Ethereal Transporter Control Panel - On Gossip Option 0 Selected - Summon Cryo-Engineer Sha heen'), +(183877, 1, 1, 0, 62, 0, 100, 0, 8023, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Ethereal Transporter Control Panel - On Gossip Option 0 Selected - Close Gossip'); + +UPDATE `gossip_menu_option` SET `action_menu_id`=0 WHERE `menu_id`=8023 AND `id`=0; diff --git a/sql/updates/world/2014_09_13_05world_misc_335.sql b/sql/updates/world/2014_09_13_05world_misc_335.sql deleted file mode 100644 index eb701a48cc4..00000000000 --- a/sql/updates/world/2014_09_13_05world_misc_335.sql +++ /dev/null @@ -1,8 +0,0 @@ -UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`IN(183877); -DELETE FROM `smart_scripts` WHERE `entryorguid`IN(183877) AND `source_type`=1; - -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 -(183877, 1, 0, 0, 62, 0, 100, 1, 8023, 0, 0, 0, 12, 19671, 8, 60000, 0, 0, 0, 8, 0, 0, 0, -351.345, -69.7118, -0.8754317, 4.34587, 'Ethereal Transporter Control Panel - On Gossip Option 0 Selected - Summon Cryo-Engineer Sha heen'), -(183877, 1, 1, 0, 62, 0, 100, 0, 8023, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Ethereal Transporter Control Panel - On Gossip Option 0 Selected - Close Gossip'); - -UPDATE `gossip_menu_option` SET `action_menu_id`=0 WHERE `menu_id`=8023 AND `id`=0; -- cgit v1.2.3 From 629b44867db35c1f78dc3fa7c8c8446777dc6556 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 14 Sep 2014 13:38:35 +0100 Subject: DB/Misc: Missing spawns/phasing Phasing and missing spawns required for The Reckoning and Tirion's Gambit, Note this does not fix these quests it only deals with spawns, phasing, gossip and gossip conditions. --- sql/updates/world/2014_09_14_01_world_misc.sql | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 sql/updates/world/2014_09_14_01_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2014_09_14_01_world_misc.sql b/sql/updates/world/2014_09_14_01_world_misc.sql new file mode 100644 index 00000000000..68ed60e47f2 --- /dev/null +++ b/sql/updates/world/2014_09_14_01_world_misc.sql @@ -0,0 +1,50 @@ +SET @CGUID := 76522; + +UPDATE `creature_template` SET `gossip_menu_id`=10200 WHERE `entry`=32239; +UPDATE`creature_template` SET `gossip_menu_id`=9928, `minlevel`=82, `maxlevel`=82, `npcflag`=1, `speed_walk`=4.8, `speed_run`=3.142857, `unit_flags2`=2099200 WHERE `entry`=30399; +UPDATE `creature_template` SET `faction`=14, `speed_walk`=1.6, `speed_run`=1.857143, `unit_flags`=320, `unit_flags2`=2099200 WHERE `entry`=30396; +UPDATE `creature_template` SET `speed_walk`=3.2, `speed_run`=1.428571, `unit_flags`=33088, `unit_flags2`=2099200, `HoverHeight`=2.1 WHERE `entry`=30420; +UPDATE `creature_template` SET `faction`=2102, `unit_flags`=320 WHERE `entry`=30429; + + +DELETE FROM `gossip_menu` WHERE `entry` IN(9928,10200); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES +(10200, 14160), -- 32239 +(9928, 13800); -- 30399 + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN(9928,10200); +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES +(10200, 0, 0, 'I\'m ready, Highlord.', 32933, 1, 1, 0, 0, 0, 0, '', 0), +(9928, 0, 0, 'I\'m with you, Thorim.', 31225, 1, 1, 0, 0, 0, 0, '', 0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN(9928,10200); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 10200, 0, 0, 0, 9, 0, 13364, 0, 0, 0, 0, 0, '', 'Highlord Tirion Fordring - Show Gossip if Tirions Gambit Taken'), +(15, 10200, 0, 0, 1, 9, 0, 13403, 0, 0, 0, 0, 0, '', 'Highlord Tirion Fordring - Show Gossip if Tirions Gambit Taken'), +(15, 10200, 0, 0, 0, 1, 0, 61131, 0, 0, 0, 0, 0, '', 'Highlord Tirion Fordring - Show Gossip if player has aura Cultist Hood'), +(15, 10200, 0, 0, 1, 1, 0, 61131, 0, 0, 0, 0, 0, '', 'Highlord Tirion Fordring - Show Gossip if player has aura Cultist Hood'), +(15, 9928, 0, 0, 0, 9, 0, 13047, 0, 0, 0, 0, 0, '', 'Thorim - SHow Gossip if the reckoning taken'); + +DELETE FROM `creature_template_addon` WHERE `entry` IN(32239,32241,30399,30396,30420); +INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES +(32239, 0, 0x10000, 0x101, '49414'), -- 32239 - 49414 +(32241, 0, 0x10000, 0x1, '49414'), -- 32241 - 49414 +(30399, 0, 0x10000, 0x1, '54503'), -- 30399 - 54503 +(30396, 0, 0x1, 0x1, ''), -- 30396 +(30420, 0, 0x3010000, 0x1, '54503'); -- 30420 - 54503 + +DELETE FROM `creature` WHERE `id` IN(32239,32241,30399,30420); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES +(@CGUID+0, 32239, 571, 1, 1, 6240.595, 2658.845, 570.3328, 5.864306, 120, 0, 0), -- 32239 (Area: 210) +(@CGUID+1, 32241, 571, 1, 1, 6243.453, 2667.72, 570.3328, 5.410521, 120, 0, 0), -- 32241 (Area: 210) +(@CGUID+2, 32241, 571, 1, 1, 6250.451, 2656.436, 570.3328, 2.199115, 120, 0, 0), -- 32241 (Area: 210) +(@CGUID+3, 32241, 571, 1, 1, 6252.46, 2665.359, 570.3328, 3.979351, 120, 0, 0), -- 32241 (Area: 210) +(@CGUID+4, 30399, 571, 1, 1, 8703.806, -714.0443, 934.9764, 2.321288, 120, 0, 0), -- 30399 (Area: 67) +(@CGUID+5, 30420, 571, 1, 1, 8711.395, -754.7941, 955.1224, 2.338741, 120, 0, 0); -- 30420 (Area: 67) + +DELETE FROM `spell_area` WHERE `spell` IN(49416,54504) AND `area` IN(4543,4445,4521); +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES +(54504, 4543, 13047, 13047, 0, 0, 2, 1, 74, 11), +(54504, 4445, 13047, 13047, 0, 0, 2, 1, 74, 11), +(49416, 4521, 13364, 13364, 0, 0, 2, 1, 74, 11), +(49416, 4521, 13403, 13403, 0, 0, 2, 1, 74, 11); -- cgit v1.2.3 From 456deb68e95d7d720130e58797cfe9d538021a1a Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 14 Sep 2014 15:19:29 +0200 Subject: SQL: Fix sql import --- sql/updates/world/2014_09_14_01_world_misc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/updates/world/2014_09_14_01_world_misc.sql b/sql/updates/world/2014_09_14_01_world_misc.sql index 68ed60e47f2..49fa75e37de 100644 --- a/sql/updates/world/2014_09_14_01_world_misc.sql +++ b/sql/updates/world/2014_09_14_01_world_misc.sql @@ -1,4 +1,4 @@ -SET @CGUID := 76522; +SET @CGUID := 74512; UPDATE `creature_template` SET `gossip_menu_id`=10200 WHERE `entry`=32239; UPDATE`creature_template` SET `gossip_menu_id`=9928, `minlevel`=82, `maxlevel`=82, `npcflag`=1, `speed_walk`=4.8, `speed_run`=3.142857, `unit_flags2`=2099200 WHERE `entry`=30399; -- cgit v1.2.3 From 716c2918d274c859297921c924a3e5aa9cd042f1 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 14 Sep 2014 11:15:25 -0230 Subject: Scripting/Spell Stand: Move this spell to spells generic. --- .../world/2014_09_14_02_world_spellscriptnames.sql | 1 + .../scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp | 32 ---------------------- src/server/scripts/Spells/spell_generic.cpp | 32 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 sql/updates/world/2014_09_14_02_world_spellscriptnames.sql (limited to 'sql') diff --git a/sql/updates/world/2014_09_14_02_world_spellscriptnames.sql b/sql/updates/world/2014_09_14_02_world_spellscriptnames.sql new file mode 100644 index 00000000000..96ebc93961f --- /dev/null +++ b/sql/updates/world/2014_09_14_02_world_spellscriptnames.sql @@ -0,0 +1 @@ +UPDATE `spell_script_names` SET `ScriptName`= 'spell_gen_stand' WHERE `spell_id`=37752; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 3ec5109cbb9..0be61cc2ec8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -1037,37 +1037,6 @@ class spell_xt002_submerged : public SpellScriptLoader } }; -class spell_xt002_stand : public SpellScriptLoader -{ - public: - spell_xt002_stand() : SpellScriptLoader("spell_xt002_stand") { } - - class spell_xt002_stand_SpellScript : public SpellScript - { - PrepareSpellScript(spell_xt002_stand_SpellScript); - - void HandleScript(SpellEffIndex /*eff*/) - { - Creature* target = GetHitCreature(); - if (!target) - return; - - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_xt002_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - } - }; - - SpellScript* GetSpellScript() const override - { - return new spell_xt002_stand_SpellScript(); - } -}; - class achievement_nerf_engineering : public AchievementCriteriaScript { public: @@ -1126,7 +1095,6 @@ void AddSC_boss_xt002() new spell_xt002_heart_overload_periodic(); new spell_xt002_tympanic_tantrum(); new spell_xt002_submerged(); - new spell_xt002_stand(); new achievement_nerf_engineering(); new achievement_heartbreaker(); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index e198a6a0c61..3882bbe7864 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3682,6 +3682,37 @@ class spell_gen_gm_freeze : public SpellScriptLoader } }; +class spell_gen_stand : public SpellScriptLoader +{ +public: + spell_gen_stand() : SpellScriptLoader("spell_gen_stand") { } + + class spell_gen_stand_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_stand_SpellScript); + + void HandleScript(SpellEffIndex /*eff*/) + { + Creature* target = GetHitCreature(); + if (!target) + return; + + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_gen_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const override + { + return new spell_gen_stand_SpellScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -3763,4 +3794,5 @@ void AddSC_generic_spell_scripts() new spell_gen_whisper_gulch_yogg_saron_whisper(); new spell_gen_eject_all_passengers(); new spell_gen_gm_freeze(); + new spell_gen_stand(); } -- cgit v1.2.3