Convert castles ids to match client side ids

4 files changed, 187 insertions, 90 deletions

diff --git a/db/castle_db.conf b/db/castle_db.conf
index 907754954..0e37d50a9 100644
--- a/db/castle_db.conf
+++ b/db/castle_db.conf
@@ -42,34 +42,67 @@ castle_db: (
 },
 **************************************************************************/
 //================
+// Prontera
+//================
+{
+	CastleID: 1
+	MapName: "prtg_cas01"
+	CastleName: "Kriemhild" // kRO : Creamhilt
+	OnGuildBreakEventName: "Agit#prtg_cas01"
+},
+{
+	CastleID: 2
+	MapName: "prtg_cas02"
+	CastleName: "Swanhild" // kRO : Sbanhealt
+	OnGuildBreakEventName: "Agit#prtg_cas02"
+},
+{
+	CastleID: 3
+	MapName: "prtg_cas03"
+	CastleName: "Fadhgridh" // kRO : Lazrigees
+	OnGuildBreakEventName: "Agit#prtg_cas03"
+},
+{
+	CastleID: 4
+	MapName: "prtg_cas04"
+	CastleName: "Skoegul" // kRO : Squagul
+	OnGuildBreakEventName: "Agit#prtg_cas04"
+},
+{
+	CastleID: 5
+	MapName: "prtg_cas05"
+	CastleName: "Gondul" // kRO : Guindull
+	OnGuildBreakEventName: "Agit#prtg_cas05"
+},
+//================
 // Al De Baran
 //================
 {
-	CastleID: 0
+	CastleID: 6
 	MapName: "aldeg_cas01"
 	CastleName: "Neuschwanstein" // kRO : Noisyubantian
 	OnGuildBreakEventName: "Agit#aldeg_cas01"
 },
 {
-	CastleID: 1
+	CastleID: 7
 	MapName: "aldeg_cas02"
 	CastleName: "Hohenschwangau" // kRO : Hohensyubangawoo
 	OnGuildBreakEventName: "Agit#aldeg_cas02"
 },
 {
-	CastleID: 2
+	CastleID: 8
 	MapName: "aldeg_cas03"
 	CastleName: "Nuernberg" // kRO : Nyirenverk
 	OnGuildBreakEventName: "Agit#aldeg_cas03"
 },
 {
-	CastleID: 3
+	CastleID: 9
 	MapName: "aldeg_cas04"
 	CastleName: "Wuerzburg" // kRO : Byirtsburi
 	OnGuildBreakEventName: "Agit#aldeg_cas04"
 },
 {
-	CastleID: 4
+	CastleID: 10
 	MapName: "aldeg_cas05"
 	CastleName: "Rothenburg" // kRO : Rotenburk
 	OnGuildBreakEventName: "Agit#aldeg_cas05"
@@ -78,31 +111,31 @@ castle_db: (
 // Geffen
 //================
 {
-	CastleID: 5
+	CastleID: 11
 	MapName: "gefg_cas01"
 	CastleName: "Repherion" // kRO : Reprion
 	OnGuildBreakEventName: "Agit#gefg_cas01"
 },
 {
-	CastleID: 6
+	CastleID: 12
 	MapName: "gefg_cas02"
 	CastleName: "Eeyolbriggar" // kRO : Yolbriger
 	OnGuildBreakEventName: "Agit#gefg_cas02"
 },
 {
-	CastleID: 7
+	CastleID: 13
 	MapName: "gefg_cas03"
 	CastleName: "Yesnelph" // kRO : Isinlife
 	OnGuildBreakEventName: "Agit#gefg_cas03"
 },
 {
-	CastleID: 8
+	CastleID: 14
 	MapName: "gefg_cas04"
 	CastleName: "Bergel" // kRO : Berigel
 	OnGuildBreakEventName: "Agit#gefg_cas04"
 },
 {
-	CastleID: 9
+	CastleID: 15
 	MapName: "gefg_cas05"
 	CastleName: "Mersetzdeitz" // kRO : Melsedetsu
 	OnGuildBreakEventName: "Agit#gefg_cas05"
@@ -111,159 +144,126 @@ castle_db: (
 // Payon
 //================
 {
-	CastleID: 10
+	CastleID: 16
 	MapName: "payg_cas01"
 	CastleName: "Bright Arbor" // kRO : Mingting
 	OnGuildBreakEventName: "Agit#payg_cas01"
 },
 {
-	CastleID: 11
+	CastleID: 17
 	MapName: "payg_cas02"
 	CastleName: "Scarlet Palace" // kRO : Tiantan
 	OnGuildBreakEventName: "Agit#payg_cas02"
 },
 {
-	CastleID: 12
+	CastleID: 18
 	MapName: "payg_cas03"
 	CastleName: "Holy Shadow" // kRO : Fuying
 	OnGuildBreakEventName: "Agit#payg_cas03"
 },
 {
-	CastleID: 13
+	CastleID: 19
 	MapName: "payg_cas04"
 	CastleName: "Sacred Altar" // kRO : Honglou
 	OnGuildBreakEventName: "Agit#payg_cas04"
 },
 {
-	CastleID: 14
+	CastleID: 20
 	MapName: "payg_cas05"
 	CastleName: "Bamboo Grove Hill" // kRO : Zhulinxian
 	OnGuildBreakEventName: "Agit#payg_cas05"
 },
 //================
-// Prontera
+// Rachel
 //================
 {
-	CastleID: 15
-	MapName: "prtg_cas01"
-	CastleName: "Kriemhild" // kRO : Creamhilt
-	OnGuildBreakEventName: "Agit#prtg_cas01"
-},
-{
-	CastleID: 16
-	MapName: "prtg_cas02"
-	CastleName: "Swanhild" // kRO : Sbanhealt
-	OnGuildBreakEventName: "Agit#prtg_cas02"
-},
-{
-	CastleID: 17
-	MapName: "prtg_cas03"
-	CastleName: "Fadhgridh" // kRO : Lazrigees
-	OnGuildBreakEventName: "Agit#prtg_cas03"
-},
-{
-	CastleID: 18
-	MapName: "prtg_cas04"
-	CastleName: "Skoegul" // kRO : Squagul
-	OnGuildBreakEventName: "Agit#prtg_cas04"
-},
-{
-	CastleID: 19
-	MapName: "prtg_cas05"
-	CastleName: "Gondul" // kRO : Guindull
-	OnGuildBreakEventName: "Agit#prtg_cas05"
+	CastleID: 21
+	MapName: "arug_cas01"
+	CastleName: "Mardol" // kRO : Mardol
+	OnGuildBreakEventName: "Manager#arug_cas01"
 },
-//================
-// Novice Guilds
-//================
 {
-	CastleID: 20
-	MapName: "nguild_alde"
-	CastleName: "Earth"
-	OnGuildBreakEventName: "Agit_N01"
+	CastleID: 22
+	MapName: "arug_cas02"
+	CastleName: "Cyr" // kRO : Cyr
+	OnGuildBreakEventName: "Manager#arug_cas02"
 },
 {
-	CastleID: 21
-	MapName: "nguild_gef"
-	CastleName: "Air"
-	OnGuildBreakEventName: "Agit_N02"
+	CastleID: 23
+	MapName: "arug_cas03"
+	CastleName: "Horn" // kRO : Horn
+	OnGuildBreakEventName: "Manager#arug_cas03"
 },
 {
-	CastleID: 22
-	MapName: "nguild_pay"
-	CastleName: "Water"
-	OnGuildBreakEventName: "Agit_N03"
+	CastleID: 24
+	MapName: "arug_cas04"
+	CastleName: "Gefn" // kRO : Gefn
+	OnGuildBreakEventName: "Manager#arug_cas04"
 },
 {
-	CastleID: 23
-	MapName: "nguild_prt"
-	CastleName: "Fire"
-	OnGuildBreakEventName: "Agit_N04"
+	CastleID: 25
+	MapName: "arug_cas05"
+	CastleName: "Bandis" // kRO : Bandis
+	OnGuildBreakEventName: "Manager#arug_cas05"
 },
 //================
 // Yuno
 //================
 {
-	CastleID: 24
+	CastleID: 26
 	MapName: "schg_cas01"
 	CastleName: "Himinn" // kRO : Himinn
 	OnGuildBreakEventName: "Manager#schg_cas01"
 },
 {
-	CastleID: 25
+	CastleID: 27
 	MapName: "schg_cas02"
 	CastleName: "Andlangr" // kRO : Andlangr
 	OnGuildBreakEventName: "Manager#schg_cas02"
 },
 {
-	CastleID: 26
+	CastleID: 28
 	MapName: "schg_cas03"
 	CastleName: "Viblainn" // kRO : Viblainn
 	OnGuildBreakEventName: "Manager#schg_cas03"
 },
 {
-	CastleID: 27
+	CastleID: 29
 	MapName: "schg_cas04"
 	CastleName: "Hljod" // kRO : Hljod
 	OnGuildBreakEventName: "Manager#schg_cas04"
 },
 {
-	CastleID: 28
+	CastleID: 30
 	MapName: "schg_cas05"
 	CastleName: "Skidbladnir" // kRO : Skidbladnir
 	OnGuildBreakEventName: "Manager#schg_cas05"
 },
 //================
-// Rachel
+// Novice Guilds
 //================
 {
-	CastleID: 29
-	MapName: "arug_cas01"
-	CastleName: "Mardol" // kRO : Mardol
-	OnGuildBreakEventName: "Manager#arug_cas01"
-},
-{
-	CastleID: 30
-	MapName: "arug_cas02"
-	CastleName: "Cyr" // kRO : Cyr
-	OnGuildBreakEventName: "Manager#arug_cas02"
-},
-{
 	CastleID: 31
-	MapName: "arug_cas03"
-	CastleName: "Horn" // kRO : Horn
-	OnGuildBreakEventName: "Manager#arug_cas03"
+	MapName: "nguild_prt"
+	CastleName: "Fire"
+	OnGuildBreakEventName: "Agit_N04"
 },
 {
 	CastleID: 32
-	MapName: "arug_cas04"
-	CastleName: "Gefn" // kRO : Gefn
-	OnGuildBreakEventName: "Manager#arug_cas04"
+	MapName: "nguild_alde"
+	CastleName: "Earth"
+	OnGuildBreakEventName: "Agit_N01"
 },
 {
 	CastleID: 33
-	MapName: "arug_cas05"
-	CastleName: "Bandis" // kRO : Bandis
-	OnGuildBreakEventName: "Manager#arug_cas05"
+	MapName: "nguild_gef"
+	CastleName: "Air"
+	OnGuildBreakEventName: "Agit_N02"
+},
+{
+	CastleID: 34
+	MapName: "nguild_pay"
+	CastleName: "Water"
+	OnGuildBreakEventName: "Agit_N03"
 },
 )
diff --git a/sql-files/main.sql b/sql-files/main.sql
index e364ec778..27839afa3 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -930,6 +930,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1546059075); -- 2018-12-2
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1554760320); -- 2019-04-08--21-52.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1556147483); -- 2019-04-25--02-12.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1557414445); -- 2019-05-09--18-07.sql
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1565293394); -- 2019-08-08--19-43.sql
 
 --
 -- Table structure for table `storage`
diff --git a/sql-files/upgrades/2019-08-08--19-43.sql b/sql-files/upgrades/2019-08-08--19-43.sql
new file mode 100644
index 000000000..8105cb967
--- /dev/null
+++ b/sql-files/upgrades/2019-08-08--19-43.sql
@@ -0,0 +1,95 @@
+#1565293394
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2019  Hercules Dev Team
+--
+-- Hercules is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ALTER TABLE `guild_castle` DROP PRIMARY KEY;
+ALTER TABLE `guild_castle` ADD COLUMN `castle_name` VARCHAR(24) AFTER `castle_id`;
+UPDATE `guild_castle` SET `castle_name` = 'aldeg_cas01' WHERE castle_id = 0;
+UPDATE `guild_castle` SET `castle_name` = 'aldeg_cas02' WHERE castle_id = 1;
+UPDATE `guild_castle` SET `castle_name` = 'aldeg_cas03' WHERE castle_id = 2;
+UPDATE `guild_castle` SET `castle_name` = 'aldeg_cas04' WHERE castle_id = 3;
+UPDATE `guild_castle` SET `castle_name` = 'aldeg_cas05' WHERE castle_id = 4;
+UPDATE `guild_castle` SET `castle_name` = 'gefg_cas01' WHERE castle_id = 5;
+UPDATE `guild_castle` SET `castle_name` = 'gefg_cas02' WHERE castle_id = 6;
+UPDATE `guild_castle` SET `castle_name` = 'gefg_cas03' WHERE castle_id = 7;
+UPDATE `guild_castle` SET `castle_name` = 'gefg_cas04' WHERE castle_id = 8;
+UPDATE `guild_castle` SET `castle_name` = 'gefg_cas05' WHERE castle_id = 9;
+UPDATE `guild_castle` SET `castle_name` = 'payg_cas01' WHERE castle_id = 10;
+UPDATE `guild_castle` SET `castle_name` = 'payg_cas02' WHERE castle_id = 11;
+UPDATE `guild_castle` SET `castle_name` = 'payg_cas03' WHERE castle_id = 12;
+UPDATE `guild_castle` SET `castle_name` = 'payg_cas04' WHERE castle_id = 13;
+UPDATE `guild_castle` SET `castle_name` = 'payg_cas05' WHERE castle_id = 14;
+UPDATE `guild_castle` SET `castle_name` = 'prtg_cas01' WHERE castle_id = 15;
+UPDATE `guild_castle` SET `castle_name` = 'prtg_cas02' WHERE castle_id = 16;
+UPDATE `guild_castle` SET `castle_name` = 'prtg_cas03' WHERE castle_id = 17;
+UPDATE `guild_castle` SET `castle_name` = 'prtg_cas04' WHERE castle_id = 18;
+UPDATE `guild_castle` SET `castle_name` = 'prtg_cas05' WHERE castle_id = 19;
+UPDATE `guild_castle` SET `castle_name` = 'nguild_alde' WHERE castle_id = 20;
+UPDATE `guild_castle` SET `castle_name` = 'nguild_gef' WHERE castle_id = 21;
+UPDATE `guild_castle` SET `castle_name` = 'nguild_pay' WHERE castle_id = 22;
+UPDATE `guild_castle` SET `castle_name` = 'nguild_prt' WHERE castle_id = 23;
+UPDATE `guild_castle` SET `castle_name` = 'schg_cas01' WHERE castle_id = 24;
+UPDATE `guild_castle` SET `castle_name` = 'schg_cas02' WHERE castle_id = 25;
+UPDATE `guild_castle` SET `castle_name` = 'schg_cas03' WHERE castle_id = 26;
+UPDATE `guild_castle` SET `castle_name` = 'schg_cas04' WHERE castle_id = 27;
+UPDATE `guild_castle` SET `castle_name` = 'schg_cas05' WHERE castle_id = 28;
+UPDATE `guild_castle` SET `castle_name` = 'arug_cas01' WHERE castle_id = 29;
+UPDATE `guild_castle` SET `castle_name` = 'arug_cas02' WHERE castle_id = 30;
+UPDATE `guild_castle` SET `castle_name` = 'arug_cas03' WHERE castle_id = 31;
+UPDATE `guild_castle` SET `castle_name` = 'arug_cas04' WHERE castle_id = 32;
+UPDATE `guild_castle` SET `castle_name` = 'arug_cas05' WHERE castle_id = 33;
+
+-- Change the castle ids
+UPDATE `guild_castle` SET `castle_id` = 1 WHERE castle_name = 'prtg_cas01';
+UPDATE `guild_castle` SET `castle_id` = 2 WHERE castle_name = 'prtg_cas02';
+UPDATE `guild_castle` SET `castle_id` = 3 WHERE castle_name = 'prtg_cas03';
+UPDATE `guild_castle` SET `castle_id` = 4 WHERE castle_name = 'prtg_cas04';
+UPDATE `guild_castle` SET `castle_id` = 5 WHERE castle_name = 'prtg_cas05';
+UPDATE `guild_castle` SET `castle_id` = 6 WHERE castle_name = 'aldeg_cas01';
+UPDATE `guild_castle` SET `castle_id` = 7 WHERE castle_name = 'aldeg_cas02';
+UPDATE `guild_castle` SET `castle_id` = 8 WHERE castle_name = 'aldeg_cas03';
+UPDATE `guild_castle` SET `castle_id` = 9 WHERE castle_name = 'aldeg_cas04';
+UPDATE `guild_castle` SET `castle_id` = 10 WHERE castle_name = 'aldeg_cas05';
+UPDATE `guild_castle` SET `castle_id` = 11 WHERE castle_name = 'gefg_cas01';
+UPDATE `guild_castle` SET `castle_id` = 12 WHERE castle_name = 'gefg_cas02';
+UPDATE `guild_castle` SET `castle_id` = 13 WHERE castle_name = 'gefg_cas03';
+UPDATE `guild_castle` SET `castle_id` = 14 WHERE castle_name = 'gefg_cas04';
+UPDATE `guild_castle` SET `castle_id` = 15 WHERE castle_name = 'gefg_cas05';
+UPDATE `guild_castle` SET `castle_id` = 16 WHERE castle_name = 'payg_cas01';
+UPDATE `guild_castle` SET `castle_id` = 17 WHERE castle_name = 'payg_cas02';
+UPDATE `guild_castle` SET `castle_id` = 18 WHERE castle_name = 'payg_cas03';
+UPDATE `guild_castle` SET `castle_id` = 19 WHERE castle_name = 'payg_cas04';
+UPDATE `guild_castle` SET `castle_id` = 20 WHERE castle_name = 'payg_cas05';
+UPDATE `guild_castle` SET `castle_id` = 21 WHERE castle_name = 'arug_cas01';
+UPDATE `guild_castle` SET `castle_id` = 22 WHERE castle_name = 'arug_cas02';
+UPDATE `guild_castle` SET `castle_id` = 23 WHERE castle_name = 'arug_cas03';
+UPDATE `guild_castle` SET `castle_id` = 24 WHERE castle_name = 'arug_cas04';
+UPDATE `guild_castle` SET `castle_id` = 25 WHERE castle_name = 'arug_cas05';
+UPDATE `guild_castle` SET `castle_id` = 26 WHERE castle_name = 'schg_cas01';
+UPDATE `guild_castle` SET `castle_id` = 27 WHERE castle_name = 'schg_cas02';
+UPDATE `guild_castle` SET `castle_id` = 29 WHERE castle_name = 'schg_cas04';
+UPDATE `guild_castle` SET `castle_id` = 28 WHERE castle_name = 'schg_cas03';
+UPDATE `guild_castle` SET `castle_id` = 30 WHERE castle_name = 'schg_cas05';
+UPDATE `guild_castle` SET `castle_id` = 31 WHERE castle_name = 'nguild_prt';
+UPDATE `guild_castle` SET `castle_id` = 32 WHERE castle_name = 'nguild_alde';
+UPDATE `guild_castle` SET `castle_id` = 33 WHERE castle_name = 'nguild_gef';
+UPDATE `guild_castle` SET `castle_id` = 34 WHERE castle_name = 'nguild_pay';
+ALTER TABLE `guild_castle` ADD PRIMARY KEY (`castle_id`);
+ALTER TABLE "guild_castle" DROP COLUMN "castle_name";
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1565293394);
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index 3025a728c..85bd2a245 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -55,3 +55,4 @@
 2019-04-08--21-52.sql
 2019-04-25--02-12.sql
 2019-05-09--18-07.sql
+2019-08-08--19-43.sql