From 45887846b69bce88086121f87fa40d923d6ac8b8 Mon Sep 17 00:00:00 2001 From: Ianislav Vasilev Date: Fri, 24 May 2019 09:45:37 +0300 Subject: Scripts/Zul'Gurub 22974 high priestess marli hatching eggs (#23212) * Issue 22974: Initial bugfix suggestion. * Fixed allignment. * Removed unused call. * Initial spider spawn targeting is done. * Resolves issue 22874. Initial implementation suggestion. * Commenting out dead code. * Reordered private members to meet standards of member initializer list. * Removing unused parameter and changing data structure from list to vector. * Changed list to vector in the grid notifier. * Removing comments and fixing identation. * Stupid collapsed blocks. * Scripts/Misc: Change IsSummonedBy(Unit*) to IsSummonedBy(WorldObject*) * Scripts/Misc: Fix build * Core/TempSummons: Rename GetSummoner() to GetSummonerUnit() * Core/TempSummons: Add support to TempSummons::GetSummoner() to return GameObject too * Fix build * Core/TempSummons: Allow GameObject to be owner of TempSummon * Core/TempSummons: Add support to SAI for GameObject owner of TempSummon * Scripts/Misc: Fix no-pch build * Cleaned up all the core changes and scripted eggs and spell according to pull request comments. * Fix no-pch build. * Fix no-pch build 2. * Added sql file for the spell and gameobject script. * Update 2019_05_20_00_world.sql * Added conditions to spell thanks @xvywh and some minor changes to the code. * Removed some strange leftovers. * Removed obsolete brackets. * Rename 2019_05_20_00_world.sql to 2019_05_24_00_world.sql --- sql/updates/world/3.3.5/2019_05_24_00_world.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/3.3.5/2019_05_24_00_world.sql (limited to 'sql') diff --git a/sql/updates/world/3.3.5/2019_05_24_00_world.sql b/sql/updates/world/3.3.5/2019_05_24_00_world.sql new file mode 100644 index 00000000000..3c30789bdba --- /dev/null +++ b/sql/updates/world/3.3.5/2019_05_24_00_world.sql @@ -0,0 +1,8 @@ +DELETE FROM spell_script_names WHERE spell_id = 24083; +INSERT INTO spell_script_names VALUES (24083, 'spell_hatch_spiders'); + +UPDATE gameobject_template SET ScriptName = "gob_spider_egg" WHERE entry = 179985; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (24082,24083); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 24082, 0, 0, 31, 0, 5, 179985, 0, 0, 0, 0, '', 'Hatch Spider Egg targets Spider Egg'), +(13, 1, 24083, 0, 0, 31, 0, 5, 179985, 0, 0, 0, 0, '', 'Hatch Eggs targets Spider Egg'); -- cgit v1.2.3