diff options
| -rw-r--r-- | sql/scripts/world_scripts_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2011_04_03_00_world_conditions.sql | 65 | ||||
| -rw-r--r-- | sql/updates/world/2011_04_03_00_world_item_template.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2011_04_03_00_world_misc.sql | 55 | ||||
| -rw-r--r-- | sql/updates/world/2011_04_03_00_world_scriptname.sql | 1 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/icecrown.cpp | 43 |
6 files changed, 122 insertions, 44 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index a9a7ed93c56..7c7f6755828 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -840,7 +840,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_arete' WHERE `entry`=29344; UPDATE `creature_template` SET `ScriptName`='npc_dame_evniki_kapsalis' WHERE `entry`=34885; UPDATE `creature_template` SET `ScriptName`='npc_squire_david' WHERE `entry`=33447; UPDATE `creature_template` SET `ScriptName`='npc_argent_valiant' WHERE `entry`=33448; -UPDATE `creature_template` SET `ScriptName`='npc_argent_tournament_post' WHERE `entry`=35473; UPDATE `creature_template` SET `ScriptName`='npc_alorah_and_grimmin' WHERE `entry` IN (36101,36102); UPDATE `creature_template` SET `ScriptName`='npc_guardian_pavilion' WHERE `entry` IN (33543,33643); diff --git a/sql/updates/world/2011_04_03_00_world_conditions.sql b/sql/updates/world/2011_04_03_00_world_conditions.sql new file mode 100644 index 00000000000..032577e3745 --- /dev/null +++ b/sql/updates/world/2011_04_03_00_world_conditions.sql @@ -0,0 +1,65 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry` IN (13671,13625,13670,13669,13666); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry` IN (13676,13673,13674,13675,13677); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +-- Alliance +(19,0,13671,0,8,13835,0,0,0, '', NULL), -- Training In The Field - Mastery Of The Shield-Breaker +(20,0,13671,0,8,13835,0,0,0, '', NULL), +(19,0,13671,0,8,13837,0,0,0, '', NULL), -- Training In The Field - Mastery Of The Charge +(20,0,13671,0,8,13837,0,0,0, '', NULL), +(19,0,13671,0,8,13828,0,0,0, '', NULL), -- Training In The Field - Mastery Of Melee +(20,0,13671,0,8,13828,0,0,0, '', NULL), +(19,0,13625,0,8,13835,0,0,0, '', NULL), -- Learning The Reins - Mastery Of The Shield-Breaker +(20,0,13625,0,8,13835,0,0,0, '', NULL), +(19,0,13625,0,8,13837,0,0,0, '', NULL), -- Learning The Reins - Mastery Of The Charge +(20,0,13625,0,8,13837,0,0,0, '', NULL), +(19,0,13625,0,8,13828,0,0,0, '', NULL), -- Learning The Reins - Mastery Of Melee +(20,0,13625,0,8,13828,0,0,0, '', NULL), +(19,0,13670,0,8,13835,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of The Shield-Breaker +(20,0,13670,0,8,13835,0,0,0, '', NULL), +(19,0,13670,0,8,13837,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of The Charge +(20,0,13670,0,8,13837,0,0,0, '', NULL), +(19,0,13670,0,8,13828,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of Melee +(20,0,13670,0,8,13828,0,0,0, '', NULL), +(19,0,13669,0,8,13835,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of The Shield-Breaker +(20,0,13669,0,8,13835,0,0,0, '', NULL), +(19,0,13669,0,8,13837,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of The Charge +(20,0,13669,0,8,13837,0,0,0, '', NULL), +(19,0,13669,0,8,13828,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of Melee +(20,0,13669,0,8,13828,0,0,0, '', NULL), +(19,0,13666,0,8,13835,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of The Shield-Breaker +(20,0,13666,0,8,13835,0,0,0, '', NULL), +(19,0,13666,0,8,13837,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of The Charge +(20,0,13666,0,8,13837,0,0,0, '', NULL), +(19,0,13666,0,8,13828,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of Melee +(20,0,13666,0,8,13828,0,0,0, '', NULL), +-- Horde +(19,0,13676,0,8,13838,0,0,0, '', NULL), -- Training In The Field - Mastery Of The Shield-Breaker +(20,0,13676,0,8,13838,0,0,0, '', NULL), +(19,0,13676,0,8,13839,0,0,0, '', NULL), -- Training In The Field - Mastery Of The Charge +(20,0,13676,0,8,13839,0,0,0, '', NULL), +(19,0,13676,0,8,13829,0,0,0, '', NULL), -- Training In The Field - Mastery Of Melee +(20,0,13676,0,8,13829,0,0,0, '', NULL), +(19,0,13677,0,8,13838,0,0,0, '', NULL), -- Learning The Reins - Mastery Of The Shield-Breaker +(20,0,13677,0,8,13838,0,0,0, '', NULL), +(19,0,13677,0,8,13839,0,0,0, '', NULL), -- Learning The Reins - Mastery Of The Charge +(20,0,13677,0,8,13839,0,0,0, '', NULL), +(19,0,13677,0,8,13829,0,0,0, '', NULL), -- Learning The Reins - Mastery Of Melee +(20,0,13677,0,8,13829,0,0,0, '', NULL), +(19,0,13675,0,8,13838,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of The Shield-Breaker +(20,0,13675,0,8,13838,0,0,0, '', NULL), +(19,0,13675,0,8,13839,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of The Charge +(20,0,13675,0,8,13839,0,0,0, '', NULL), +(19,0,13675,0,8,13829,0,0,0, '', NULL), -- The Edge Of Winter - Mastery Of Melee +(20,0,13675,0,8,13829,0,0,0, '', NULL), +(19,0,13674,0,8,13838,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of The Shield-Breaker +(20,0,13674,0,8,13838,0,0,0, '', NULL), +(19,0,13674,0,8,13839,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of The Charge +(20,0,13674,0,8,13839,0,0,0, '', NULL), +(19,0,13674,0,8,13829,0,0,0, '', NULL), -- A Worthy Weapon - Mastery Of Melee +(20,0,13674,0,8,13829,0,0,0, '', NULL), +(19,0,13673,0,8,13838,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of The Shield-Breaker +(20,0,13673,0,8,13838,0,0,0, '', NULL), +(19,0,13673,0,8,13839,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of The Charge +(20,0,13673,0,8,13839,0,0,0, '', NULL), +(19,0,13673,0,8,13829,0,0,0, '', NULL), -- A Blade Fit For A Champion - Mastery Of Melee +(20,0,13673,0,8,13829,0,0,0, '', NULL); diff --git a/sql/updates/world/2011_04_03_00_world_item_template.sql b/sql/updates/world/2011_04_03_00_world_item_template.sql new file mode 100644 index 00000000000..12a3fe5bc47 --- /dev/null +++ b/sql/updates/world/2011_04_03_00_world_item_template.sql @@ -0,0 +1 @@ +UPDATE `item_loot_template` SET `ChanceOrQuestChance`=100,`mincountOrRef`=5,`maxcount`=5 WHERE `entry`=41426; -- Magically Wrapped Gift diff --git a/sql/updates/world/2011_04_03_00_world_misc.sql b/sql/updates/world/2011_04_03_00_world_misc.sql new file mode 100644 index 00000000000..ee23fbd4a85 --- /dev/null +++ b/sql/updates/world/2011_04_03_00_world_misc.sql @@ -0,0 +1,55 @@ +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (15214,25171,30281,30298,30342,30343,31898,31899,32498,33222,33223,33225,33229); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(15214,0,0,1,0, NULL), -- Invisible Stalker +(25171,0,0,1,0, NULL), -- Invisible Stalker (Scale x0.5) +(30281,0,1,1,0, NULL), -- Silver Covenant Hippogryph +(30298,0,0,1,0, NULL), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(30342,0,0,1,0, NULL), -- Orgrim's Hammer +(30343,0,0,1,0, NULL), -- The Skybreaker +(31898,0,0,1,0, NULL), -- Asric +(31899,0,0,1,0, NULL), -- Jadaar +(32498,0,0,1,0, '51583 0'), -- Glacier Penguin; Aura: [DND] Creature Random Size (0 - 50) +(33222,0,0,1,0, '5301 0'), -- Sir Marcus Barlowe; Aura: Defensive State (DND) +(33223,0,0,1,0, '5301 0'), -- Captain Joseph Holley Aura: Defensive State (DND) +(33225,0,0,1,0, '5301 0 62594 0'), -- Marshal Jacob Alerius Aura: Defensive State (DND), Stormwind Champion's Pennant +(33229,0,0,1,0, '7056 0'); -- Melee Target + +UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=17213; -- Broom +UPDATE `creature_model_info` SET `bounding_radius`=0.2263,`combat_reach`=0.73,`gender`=2 WHERE `modelid`=25391; -- Glacier Penguin + +-- Template updates +UPDATE `creature_template` SET `speed_run`=0.85714 WHERE `entry`=17213; -- Broom +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25171; -- Invisible Stalker (Scale x0.5) (move to new file) +UPDATE `creature_template` SET `speed_run`=4.28571 WHERE `entry`=30281; -- Silver Covenant Hippogryph +UPDATE `creature_template` SET `minlevel`=80,`exp`=1 WHERE `entry`=31898; -- Asric +UPDATE `creature_template` SET `minlevel`=80,`exp`=1 WHERE `entry`=31899; -- Jadaar +UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32498; -- Glacier Penguin +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33536 WHERE `entry`=33222; -- Sir Marcus Barlowe +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33536 WHERE `entry`=33223; -- Captain Joseph Holley +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33536 WHERE `entry`=33225; -- Marshal Jacob Alerius +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|131072,`dynamicflags`=132,`speed_walk`=1,`speed_run`=1,`flags_extra`=`flags_extra`|262144 WHERE `entry`=33229; -- Melee Target + +-- Spawns +UPDATE `creature` SET `position_x`= 8530.686,`position_y`=647.2205,`position_z`=558.7308,`orientation`=1.623156 WHERE `guid` =202363; -- Invisible Stalker +DELETE FROM `creature` WHERE `guid` IN (110531,110391); -- wrong Asric & Jadaar spawns in Dalaran Sewers + +SET @CGUID = 209019; +DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID AND @CGUID+7 AND `id`=25171; +DELETE FROM `creature` WHERE `guid`=@CGUID+8 AND `id`=30298; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES +(@CGUID+0,25171,571,1,1,0,0,8363.315,783.223938,550.2727,3.33357882,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+1,25171,571,1,1,0,0,8366.177,766.661438,551.2031,1.83259571,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+2,25171,571,1,1,0,0,8366.972,896.803833,552.576355,2.75762,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+3,25171,571,1,1,0,0,8370.458,779.0816,550.0816,3.33357882,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+4,25171,571,1,1,0,0,8371.508,770.821167,550.436157,2.72271371,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+5,25171,571,1,1,0,0,8375.15,908.0208,549.7291,2.75762,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+6,25171,571,1,1,0,0,8388.508,888.4358,548.0348,2.443461,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+7,25171,571,1,1,0,0,8393.317,894.256958,546.748,2.75762,120,0,0,1,0,0,0), -- Invisible Stalker (Scale x0.5) +(@CGUID+8,30298,571,1,1,0,0,8440.007,793.1233,585.525,0,120,0,0,1,0,0,0); -- Invisible Stalker (Float, Uninteractible, LargeAOI) + +-- SAI +DELETE FROM `smart_scripts` WHERE `entryorguid`=25171 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 +(25171,0,0,0,1,0,100,1,500,500,0,0,11,63413,0,0,0,0,0,11,35469,10,0,0,0,0,0, 'Invisible Stalker (Scale x0.5) - OOC cast Rope Beam in Gormok the Impaler (not repeteable)'), +(25171,0,1,0,1,0,100,1,500,500,0,0,11,63413,0,0,0,0,0,11,35470,10,0,0,0,0,0, 'Invisible Stalker (Scale x0.5) - OOC cast Rope Beam in Icehowl (not repeteable)'); diff --git a/sql/updates/world/2011_04_03_00_world_scriptname.sql b/sql/updates/world/2011_04_03_00_world_scriptname.sql new file mode 100644 index 00000000000..a856f62fa04 --- /dev/null +++ b/sql/updates/world/2011_04_03_00_world_scriptname.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName` ='' WHERE `entry`=35473; -- Argent Tournament Post diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 808717ab6c9..b29e3929722 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -276,48 +276,6 @@ public: }; /*###### -## npc_argent_tournament_post -######*/ - -enum eArgentTournamentPost -{ - SPELL_ROPE_BEAM = 63413, - NPC_GORMOK_THE_IMPALER = 35469, - NPC_ICEHOWL = 35470 -}; - -class npc_argent_tournament_post : public CreatureScript -{ -public: - npc_argent_tournament_post() : CreatureScript("npc_argent_tournament_post") { } - - struct npc_argent_tournament_postAI : public ScriptedAI - { - npc_argent_tournament_postAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - void UpdateAI(const uint32 /*uiDiff*/) - { - if (me->IsNonMeleeSpellCasted(false)) - return; - - if (Creature* pTarget = me->FindNearestCreature(NPC_GORMOK_THE_IMPALER, 6.0f)) - DoCast(pTarget, SPELL_ROPE_BEAM); - - if (Creature* pTarget2 = me->FindNearestCreature(NPC_ICEHOWL, 6.0f)) - DoCast(pTarget2, SPELL_ROPE_BEAM); - - if (!UpdateVictim()) - return; - } - }; - - CreatureAI *GetAI(Creature *creature) const - { - return new npc_argent_tournament_postAI(creature); - } -}; - -/*###### ## npc_alorah_and_grimmin ######*/ @@ -429,7 +387,6 @@ void AddSC_icecrown() new npc_dame_evniki_kapsalis; new npc_squire_david; new npc_argent_valiant; - new npc_argent_tournament_post; new npc_alorah_and_grimmin; new npc_guardian_pavilion; } |