Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/BattlegroundIC: Removed 1 hack:

Browse Source 
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."
This commit is contained in:
Golrag
2015-04-29 15:03:18 +02:00
parent 4e93345fbe
commit 8a4afad63a
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/updates/world/2015_05_01_00_world.sql Normal file
View File

@@ -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.');

5
src/server/game/Miscellaneous/Language.h
View File

@@ -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,

13
src/server/scripts/Northrend/isle_of_conquest.cpp
View File

@@ -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