aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/base/world_database.sql35
-rw-r--r--sql/scripts/world_scripts_full.sql32
-rw-r--r--sql/updates/9237_world_battleground_template.sql13
-rw-r--r--sql/updates/9237_world_outdoorpvp_template.sql8
4 files changed, 64 insertions, 24 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 11d1fbaf42e..b3e2f5215a3 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -254,20 +254,20 @@ CREATE TABLE `battleground_template` (
LOCK TABLES `battleground_template` WRITE;
/*!40000 ALTER TABLE `battleground_template` DISABLE KEYS */;
-INSERT INTO `battleground_template` (`id`,`MinPlayersPerTeam`,`MaxPlayersPerTeam`,`MinLvl`,`MaxLvl`,`AllianceStartLoc`,`AllianceStartO`,`HordeStartLoc`,`HordeStartO`, `Weight`) VALUES
-(1,20,40,51,80,611,2.72532,610,2.27452,1),
-(2,5,10,10,80,769,3.14159,770,3.14159,1),
-(3,8,15,20,80,890,3.40156,889,0.263892,1),
-(4,0,2,10,80,929,0,936,3.14159,1),
-(5,0,2,10,80,939,0,940,3.14159,1),
-(6,0,2,10,80,0,0,0,0,1),
-(7,8,15,61,80,1103,3.40156,1104,0.263892,1),
-(8,0,2,10,80,1258,0,1259,3.14159,1),
-(9,7,15,71,80,1367,0,1368,0,1),
-(10,5,5,10,80,1362,0,1363,0,1),
-(11,5,5,10,80,1364,0,1365,0,1),
-(30,20,40,71,80,1485,0,1486,0,1),
-(32,10,10,0,80,0,0,0,0,1);
+INSERT INTO `battleground_template` (`id`,`MinPlayersPerTeam`,`MaxPlayersPerTeam`,`MinLvl`,`MaxLvl`,`AllianceStartLoc`,`AllianceStartO`,`HordeStartLoc`,`HordeStartO`, `Weight`, `Comment`) VALUES
+(1,20,40,51,80,611,2.72532,610,2.27452,1,'Alterac Valley'),
+(2,5,10,10,80,769,3.14159,770,3.14159,1,'Warsong Gulch'),
+(3,8,15,20,80,890,3.40156,889,0.263892,1,'Arathi Basin'),
+(4,0,2,10,80,929,0,936,3.14159,1,'Nagrand Arena'),
+(5,0,2,10,80,939,0,940,3.14159,1,'Blades''s Edge Arena'),
+(6,0,2,10,80,0,0,0,0,1,'All Arena'),
+(7,8,15,61,80,1103,3.40156,1104,0.263892,1,'Eye of The Storm'),
+(8,0,2,10,80,1258,0,1259,3.14159,1,'Ruins of Lordaeron'),
+(9,7,15,71,80,1367,0,1368,0,1,'Strand of the Ancients'),
+(10,5,5,10,80,1362,0,1363,0,1,'Dalaran Sewers'),
+(11,5,5,10,80,1364,0,1365,0,1,'The Ring of Valor'),
+(30,20,40,71,80,1485,0,1486,0,1,'Isle of Conquest'),
+(32,10,10,0,80,0,0,0,0,1,'Random battleground');
/*!40000 ALTER TABLE `battleground_template` ENABLE KEYS */;
UNLOCK TABLES;
@@ -3862,6 +3862,13 @@ CREATE TABLE `outdoorpvp_template` (
LOCK TABLES `outdoorpvp_template` WRITE;
/*!40000 ALTER TABLE `outdoorpvp_template` DISABLE KEYS */;
+INSERT INTO `outdoorpvp_template` (`TypeId`, `Comment`) VALUES
+(1, 'Hellfire Peninsula');
+(2, 'Nagrand');
+(3, 'Terokkar Forest');
+(4, 'Zangarmarsh');
+(5, 'Silithus');
+(6, 'Eastern Plaguelands');
/*!40000 ALTER TABLE `outdoorpvp_template` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 2e3b3d39791..812249830fa 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1,10 +1,12 @@
-- Up to TC2 6928
-- Cleanup first
+UPDATE `battleground_template` SET `ScriptName`='';
UPDATE `instance_template` SET `Script`='';
UPDATE `item_template` SET `ScriptName`='';
UPDATE `creature_template` SET `ScriptName`='';
UPDATE `gameobject_template` SET `ScriptName`='';
+UPDATE `outdoorpvp_template` SET `ScriptName`='';
/* AREA TRIGGERS */
DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5284,5285,5286,5287,4871,4872,4873,5108,5332,5338,5334,5340,5369,5423);
@@ -1362,6 +1364,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' WHERE `entry`=18
UPDATE `creature_template` SET `ScriptName`='mob_unkor_the_ruthless' WHERE `entry`=18262;
UPDATE `creature_template` SET `ScriptName`='npc_slim' WHERE `entry`=19679;
UPDATE `creature_template` SET `ScriptName`='npc_akuno' WHERE `entry`=22377;
+UPDATE `creature_template` SET `ScriptName`='npc_skywing' WHERE `entry`=22424;
/* THOUSAND NEEDLES */
UPDATE `creature_template` SET `ScriptName`='npc_kanati' WHERE `entry`=10638;
@@ -1635,15 +1638,24 @@ UPDATE `creature_template` SET `ScriptName`='mob_batrider' WHERE `entry`=14965;
UPDATE `creature_template` SET `ScriptName`='mob_shade_of_jindo' WHERE `entry`=14986;
UPDATE `creature_template` SET `ScriptName`='mob_ohgan' WHERE `entry`=14988;
-/* EOF */
+DELETE FROM `areatrigger_scripts` WHERE `entry`=3066;
+INSERT INTO `areatrigger_scripts` VALUES
+ (3066,'at_ravenholdt');
-UPDATE `creature_template` SET `ScriptName`='npc_skywing' WHERE `entry`=22424;
+/* Moved from world_spell_full.sql to here. */
+UPDATE `creature_template` SET `AIName`='TurretAI',`ScriptName`='' WHERE `entry`=33139;
+UPDATE `creature_template` SET `ScriptName`= 'boss_kologarn' WHERE `entry`=32930;
+UPDATE `creature_template` SET `ScriptName`= 'boss_flame_leviathan_safety_container' WHERE `entry`=33218;
-DELETE FROM areatrigger_scripts WHERE `entry`=3066;
-INSERT INTO areatrigger_scripts VALUES
- (3066,'at_ravenholdt');
-
--- moved from world_spell_full.sql to here
-update creature_template set `AIName`='TurretAI',`ScriptName`='' WHERE `entry`=33139;
-update creature_template set `ScriptName`= 'boss_kologarn' WHERE `entry`=32930;
-update creature_template set `scriptname`= 'boss_flame_leviathan_safety_container' WHERE `entry`=33218;
+/* BATTLEGROUNDS */
+/* TODO */
+
+/* OUTDOOR PVP */
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_hp' WHERE `TypeId`=1;
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_na' WHERE `TypeId`=2;
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_tf' WHERE `TypeId`=3;
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_zm' WHERE `TypeId`=4;
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_si' WHERE `TypeId`=5;
+UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_ep' WHERE `TypeId`=6;
+
+/* EOF */
diff --git a/sql/updates/9237_world_battleground_template.sql b/sql/updates/9237_world_battleground_template.sql
new file mode 100644
index 00000000000..fcf33502167
--- /dev/null
+++ b/sql/updates/9237_world_battleground_template.sql
@@ -0,0 +1,13 @@
+UPDATE `battleground_template` SET `Comment`= 'Alterac Valley' WHERE `battleground_template`.`id`=1;
+UPDATE `battleground_template` SET `Comment`= 'Warsong Gulch' WHERE `battleground_template`.`id`=2;
+UPDATE `battleground_template` SET `Comment`= 'Arathi Basin' WHERE `battleground_template`.`id`=3;
+UPDATE `battleground_template` SET `Comment`= 'Nagrand Arena' WHERE `battleground_template`.`id`=4;
+UPDATE `battleground_template` SET `Comment`= 'Blades''s Edge Arena' WHERE `battleground_template`.`id`=5;
+UPDATE `battleground_template` SET `Comment`= 'All Arena' WHERE `battleground_template`.`id`=6;
+UPDATE `battleground_template` SET `Comment`= 'Eye of The Storm' WHERE `battleground_template`.`id`=7;
+UPDATE `battleground_template` SET `Comment`= 'Ruins of Lordaeron' WHERE `battleground_template`.`id`=8;
+UPDATE `battleground_template` SET `Comment`= 'Strand of the Ancients' WHERE `battleground_template`.`id`=9;
+UPDATE `battleground_template` SET `Comment`= 'Dalaran Sewers' WHERE `battleground_template`.`id`=10;
+UPDATE `battleground_template` SET `Comment`= 'The Ring of Valor' WHERE `battleground_template`.`id`=11;
+UPDATE `battleground_template` SET `Comment`= 'Isle of Conquest' WHERE `battleground_template`.`id`=30;
+UPDATE `battleground_template` SET `Comment`= 'Random battleground' WHERE `battleground_template`.`id`=32;
diff --git a/sql/updates/9237_world_outdoorpvp_template.sql b/sql/updates/9237_world_outdoorpvp_template.sql
new file mode 100644
index 00000000000..02e672cb9a2
--- /dev/null
+++ b/sql/updates/9237_world_outdoorpvp_template.sql
@@ -0,0 +1,8 @@
+DELETE FROM `outdoorpvp_template` WHERE `TypeId` IN (1,2,3,4,5,6);
+INSERT INTO `outdoorpvp_template` (`TypeId`, `ScriptName`, `Comment`) VALUES
+(1, 'outdoorpvp_hp', 'Hellfire Peninsula');
+(2, 'outdoorpvp_na', 'Nagrand');
+(3, 'outdoorpvp_tf', 'Terokkar Forest');
+(4, 'outdoorpvp_zm', 'Zangarmarsh');
+(5, 'outdoorpvp_si', 'Silithus');
+(6, 'outdoorpvp_ep', 'Eastern Plaguelands');