diff options
| author | Golrag <golrag.jeremy@gmail.com> | 2015-04-29 15:03:18 +0200 |
|---|---|---|
| committer | Golrag <golrag.jeremy@gmail.com> | 2015-05-01 14:52:15 +0200 |
| commit | 8a4afad63ac97b39f6746d466f3166eeef62e711 (patch) | |
| tree | b5ef4a28856f4ecf7ced3e4a30c405422f30dfd1 | |
| parent | 4e93345fbed71a1a6a82a0e709afb3e2207f5c63 (diff) | |
Core/BattlegroundIC: Removed 1 hack:
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."
| -rw-r--r-- | sql/updates/world/2015_05_01_00_world.sql | 17 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 5 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/isle_of_conquest.cpp | 13 |
3 files changed, 19 insertions, 16 deletions
diff --git a/sql/updates/world/2015_05_01_00_world.sql b/sql/updates/world/2015_05_01_00_world.sql new file mode 100644 index 00000000000..41e1fecb7ca --- /dev/null +++ b/sql/updates/world/2015_05_01_00_world.sql @@ -0,0 +1,17 @@ +SET @GUID := 325984; + +DELETE FROM `creature` WHERE `guid` IN (@GUID, @GUID+1); +INSERT INTO `creature` (`guid`, `id`, `map`, `SpawnMask`, `PhaseId`, `PhaseGroup`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES +(@GUID, 20212, 642, 3, 0, 0, 0, 7.305609, -0.095246, 34.51022, 3.159046, 7200, 0, 0), +(@GUID+1, 20213, 641, 3, 0, 0, 0, 11.69965, 0.034146, 20.62076, 3.211406, 7200, 0, 0); + +DELETE FROM `creature_addon` WHERE `guid` IN (@GUID, @GUID+1); +INSERT INTO `creature_addon` (`guid`, `auras`) VALUES +(@GUID, 66656), -- Parachute +(@GUID+1, 66656); -- Parachute + +DELETE FROM `trinity_string` WHERE `entry` IN (1999, 1204, 1205); +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(1999, 'You have left areatrigger %u.'), +(1204, 'You have entered areatrigger %u.'), +(1205, 'The battle will begin in 2 minutes.'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index c5d425e4130..6546a6198c6 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -988,16 +988,15 @@ enum TrinityStrings LANG_ACCOUNT_BNET_UNLINKED = 1188, LANG_ACCOUNT_BNET_NOT_LINKED = 1189, LANG_DISALLOW_TICKETS_CONFIG = 1190, - // Room for more level 3 1191-1199 not used + // Room for more level 3 1191-1198 not used // Debug commands + LANG_DEBUG_AREATRIGGER_LEFT = 1999, LANG_CINEMATIC_NOT_EXIST = 1200, LANG_MOVIE_NOT_EXIST = 1201, LANG_DEBUG_AREATRIGGER_ON = 1202, LANG_DEBUG_AREATRIGGER_OFF = 1203, LANG_DEBUG_AREATRIGGER_ENTERED = 1204, - LANG_DEBUG_AREATRIGGER_LEFT = 1205, - // Room for more debug 1206-1299 not used // Isle of Conquest LANG_BG_IC_START_TWO_MINUTES = 1205, diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 7b851055f17..204c92c1789 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -161,19 +161,6 @@ class spell_ioc_gunship_portal : public SpellScriptLoader * Position: X: 7.305609 Y: -0.095246 Z: 34.51022 O: 0 */ caster->TeleportTo(GetHitCreature()->GetWorldLocation(), TELE_TO_NOT_LEAVE_TRANSPORT); - /* - * HACK: This aura should be added by 20212 and 20213 but can't find any SMSG_SPELL_GO. Could't find their position. - * ServerToClient: SMSG_AURA_UPDATE (0x0072) - * [0] CasterGUID: Full: xxxxx Type: Unit Entry: 20212 Low: xxx - * [0] Flags: None (0) - * [0] Caster Level: 60 - * [0] Spell ID: 66656 - * [0] Charges: 0 - * [0] Effect Mask: 1 - * [0] Slot: 37 - * Guid: Full: xxxxx Type: Player2 Low: xxxxx - */ - caster->AddAura(SPELL_PARACHUTE, caster); } void Register() override |