[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

--HG--
branch : trunk
rename : 6731-680 => 6743-685

2 files changed, 18 insertions, 21 deletions

diff --git a/sql/updates/10_instantiated_battlegrounds.sql b/sql/updates/10_instantiated_battlegrounds.sql
index e32bc3f2824..c3234c3099e 100644
--- a/sql/updates/10_instantiated_battlegrounds.sql
+++ b/sql/updates/10_instantiated_battlegrounds.sql
@@ -15,24 +15,25 @@ INSERT INTO `command` (`name`, `security`, `help`) VALUES
 ('debug arena',3,'Syntax: .debug arena\r\n\r\n Toggles arena 1v1 or normal mode.');

 

 

-DELETE FROM mangos_string WHERE entry BETWEEN 711 AND 728;

+DELETE FROM mangos_string WHERE entry IN (711,712);

+DELETE FROM mangos_string WHERE entry BETWEEN 730 AND 745;

 INSERT INTO mangos_string (entry, content_default) VALUES

     (711,'Your group is too large for this battleground. Please regroup to join.'),

     (712,'Your group is too large for this arena. Please regroup to join.'),

-    (713,'Your group has members not in your arena team. Please regroup to join.'),

-    (714,'Your group does not have enough players to join this match.'),

-    (715,'The Gold Team wins!'),

-    (716,'The Green Team wins!'),

-    (717, 'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.'),

-    (718, 'Your group has an offline member. Please remove him before joining.'),

-    (719, 'Your group has players from the opposing faction. You can\'t join the battleground as a group.'),

-    (720, 'Your group has players from different battleground brakets. You can\'t join as group.'),

-    (721, 'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.'),

-    (722, 'Someone in your party is Deserter. You can\'t join as group.'),

-    (723, 'Someone in your party is already in three battleground queues. You cannot join as group.'),

-    (724, 'You cannot teleport to a battleground or arena map.'),

-    (725, 'You cannot summon players to a battleground or arena map.'),

-    (726, 'You must be in GM mode to teleport to a player in a battleground.'),

-    (727, 'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.'),

-    (728, 'Arena testing turned %s');

+    (730,'Your group has members not in your arena team. Please regroup to join.'),

+    (731,'Your group does not have enough players to join this match.'),

+    (732,'The Gold Team wins!'),

+    (733,'The Green Team wins!'),

+    (734, 'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.'),

+    (735, 'Your group has an offline member. Please remove him before joining.'),

+    (736, 'Your group has players from the opposing faction. You can\'t join the battleground as a group.'),

+    (737, 'Your group has players from different battleground brakets. You can\'t join as group.'),

+    (738, 'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.'),

+    (739, 'Someone in your party is Deserter. You can\'t join as group.'),

+    (740, 'Someone in your party is already in three battleground queues. You cannot join as group.'),

+    (741, 'You cannot teleport to a battleground or arena map.'),

+    (742, 'You cannot summon players to a battleground or arena map.'),

+    (743, 'You must be in GM mode to teleport to a player in a battleground.'),

+    (744, 'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.'),

+    (745, 'Arena testing turned %s');

     

diff --git a/sql/updates/19_pack.sql b/sql/updates/19_pack.sql
deleted file mode 100644
index 3a43f43a955..00000000000
--- a/sql/updates/19_pack.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `quest_template` ADD COLUMN `Method` tinyint(3) unsigned NOT NULL default '2' AFTER `entry`;

-DELETE FROM mangos_string WHERE entry IN (331);

-INSERT INTO mangos_string VALUES

-(331,'Extended item cost %u not exist',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);