diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-12 13:36:42 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-12 13:36:42 +0200 |
| commit | 617e0c476be9bce7a1ae67ac95fdd6a572027c54 (patch) | |
| tree | 82979de926d6329e9210a9ac41801776a27941e2 /sql | |
| parent | f506ee3077a5a8c86d3a02ab06c1c3e91b7d8d7e (diff) | |
| parent | 147c7d5243aa6282581389053ba39eb833bb4a0a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_hunter.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_08_11_02_world_spell_misc.sql | 5 | ||||
| -rw-r--r-- | sql/updates/world/2013_08_11_03_world_misc.sql | 11 | ||||
| -rw-r--r-- | sql/updates/world/2013_08_11_04_world_spell_proc_event.sql | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/sql/updates/world/2013_08_11_02_world_spell_misc.sql b/sql/updates/world/2013_08_11_02_world_spell_misc.sql new file mode 100644 index 00000000000..126ce114c9d --- /dev/null +++ b/sql/updates/world/2013_08_11_02_world_spell_misc.sql @@ -0,0 +1,5 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=-19572; +INSERT INTO `spell_script_names`(`spell_id`, `ScriptName`) VALUES +(-19572,'spell_hun_improved_mend_pet'); + +UPDATE `spell_proc_event` SET `procFlags`=0x40000 WHERE `entry` = -19572; diff --git a/sql/updates/world/2013_08_11_03_world_misc.sql b/sql/updates/world/2013_08_11_03_world_misc.sql new file mode 100644 index 00000000000..6936f444d74 --- /dev/null +++ b/sql/updates/world/2013_08_11_03_world_misc.sql @@ -0,0 +1,11 @@ +SET @ENTRY := 16880; + +UPDATE `quest_template` SET `RequiredSpellCast1`=0 WHERE `Id`=10255; + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; + +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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 +(@ENTRY, 0, 0, 0, 4, 0, 100, 1, 0, 0, 0, 0, 11, 33909, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hulking Helboar - On Aggro - Cast Hulk'), +(@ENTRY, 0, 1, 0, 8, 0, 100, 1, 34665, 0, 0, 0, 33, 16992, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Hulking Helboar - On Spellhit Administer Antidote - Quest Credit'); diff --git a/sql/updates/world/2013_08_11_04_world_spell_proc_event.sql b/sql/updates/world/2013_08_11_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..1cae63b5c44 --- /dev/null +++ b/sql/updates/world/2013_08_11_04_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry`=56817; +INSERT INTO `spell_proc_event` (`entry`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`) VALUES +(56817, 15, 0x0, 0x20000000, 0x0); |