Apply bugfix patch in sql-files/main.sql - highlight @Deltaquake

1 files changed, 52 insertions, 28 deletions

diff --git a/sql-files/main.sql b/sql-files/main.sql
index f979c2de6..45a66e8fa 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -75,10 +75,10 @@ CREATE TABLE IF NOT EXISTS `auction` (
   `type` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -118,6 +118,28 @@ CREATE TABLE IF NOT EXISTS `autotrade_merchants` (
 ) ENGINE=MyISAM;
 
 --
+-- Table structure for table `char_achievements`
+--
+
+CREATE TABLE IF NOT EXISTS `char_achievements` (
+	`char_id` INT(11) UNSIGNED NOT NULL,
+	`ach_id` INT(11) UNSIGNED NOT NULL,
+	`completed_at` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`rewarded_at` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_0` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_5` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_6` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_7` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_8` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`obj_9` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	PRIMARY KEY (`char_id`, `ach_id`)
+) ENGINE=MyISAM;
+
+--
 -- Table structure for table `cart_inventory`
 --
 
@@ -130,10 +152,10 @@ CREATE TABLE IF NOT EXISTS `cart_inventory` (
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -221,6 +243,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `hotkey_rowshift` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attendance_count` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attendance_timer` BIGINT(20) NULL DEFAULT '0',
+  `title_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
   `inventory_size` INT(11) UNSIGNED NOT NULL DEFAULT '100',
   PRIMARY KEY (`char_id`),
   UNIQUE KEY `name_key` (`name`),
@@ -501,10 +524,10 @@ CREATE TABLE IF NOT EXISTS `guild_storage` (
   `identify` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -576,10 +599,10 @@ CREATE TABLE IF NOT EXISTS `inventory` (
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -700,10 +723,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
   `identify` SMALLINT(6) NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -913,6 +936,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1532403228); -- 2018-07-2
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1535865732); -- 2018-09-01--05-22.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1544738447); -- 2018-12-14--01-02.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1546059075); -- 2018-12-29--07-51.sql
+
 --
 -- Table structure for table `storage`
 --
@@ -926,10 +950,10 @@ CREATE TABLE IF NOT EXISTS `storage` (
   `identify` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attribute` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',
-  `card0` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card1` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card2` SMALLINT(11) NOT NULL DEFAULT '0',
-  `card3` SMALLINT(11) NOT NULL DEFAULT '0',
+  `card0` INT(11) NOT NULL DEFAULT '0',
+  `card1` INT(11) NOT NULL DEFAULT '0',
+  `card2` INT(11) NOT NULL DEFAULT '0',
+  `card3` INT(11) NOT NULL DEFAULT '0',
   `opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
   `opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
   `opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
@@ -956,10 +980,10 @@ CREATE TABLE IF NOT EXISTS `rodex_items` (
 	`identify` SMALLINT(6) NOT NULL DEFAULT '0',
 	`refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
 	`attribute` TINYINT(4) NOT NULL DEFAULT '0',
-	`card0` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card1` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card2` SMALLINT(11) NOT NULL DEFAULT '0',
-	`card3` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card0` INT(11) NOT NULL DEFAULT '0',
+	`card1` INT(11) NOT NULL DEFAULT '0',
+	`card2` INT(11) NOT NULL DEFAULT '0',
+	`card3` INT(11) NOT NULL DEFAULT '0',
 	`opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
 	`opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
 	`opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',