* Merged changes from trunk [14784:14819/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 16 insertions, 13 deletions

diff --git a/sql-files/main.sql b/sql-files/main.sql
index 239f8dac3..feafcae3e 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -83,11 +83,12 @@ CREATE TABLE IF NOT EXISTS `char` (
   `hair` tinyint(4) unsigned NOT NULL default '0',
   `hair_color` smallint(5) unsigned NOT NULL default '0',
   `clothes_color` smallint(5) unsigned NOT NULL default '0',
-  `weapon` smallint(6) unsigned NOT NULL default '1',
+  `weapon` smallint(6) unsigned NOT NULL default '0',
   `shield` smallint(6) unsigned NOT NULL default '0',
   `head_top` smallint(6) unsigned NOT NULL default '0',
   `head_mid` smallint(6) unsigned NOT NULL default '0',
   `head_bottom` smallint(6) unsigned NOT NULL default '0',
+  `robe` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',
   `last_map` varchar(11) NOT NULL default '',
   `last_x` smallint(4) unsigned NOT NULL default '53',
   `last_y` smallint(4) unsigned NOT NULL default '111',
diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql
index 5f7592248..65630e76b 100644
--- a/sql-files/mob_db.sql
+++ b/sql-files/mob_db.sql
@@ -18,12 +18,12 @@ CREATE TABLE `mob_db` (
   `ATK2` smallint(6) unsigned NOT NULL default '0',
   `DEF` smallint(6) unsigned NOT NULL default '0',
   `MDEF` smallint(6) unsigned NOT NULL default '0',
-  `STR` tinyint(4) unsigned NOT NULL default '0',
-  `AGI` tinyint(4) unsigned NOT NULL default '0',
-  `VIT` tinyint(4) unsigned NOT NULL default '0',
-  `INT` tinyint(4) unsigned NOT NULL default '0',
-  `DEX` tinyint(4) unsigned NOT NULL default '0',
-  `LUK` tinyint(4) unsigned NOT NULL default '0',
+  `STR` smallint(6) unsigned NOT NULL default '0',
+  `AGI` smallint(6) unsigned NOT NULL default '0',
+  `VIT` smallint(6) unsigned NOT NULL default '0',
+  `INT` smallint(6) unsigned NOT NULL default '0',
+  `DEX` smallint(6) unsigned NOT NULL default '0',
+  `LUK` smallint(6) unsigned NOT NULL default '0',
   `Range2` tinyint(4) unsigned NOT NULL default '0',
   `Range3` tinyint(4) unsigned NOT NULL default '0',
   `Scale` tinyint(4) unsigned NOT NULL default '0',
diff --git a/sql-files/mob_db2.sql b/sql-files/mob_db2.sql
index d23483f7e..188aa4c1f 100644
--- a/sql-files/mob_db2.sql
+++ b/sql-files/mob_db2.sql
@@ -18,12 +18,12 @@ CREATE TABLE `mob_db2` (
   `ATK2` smallint(6) unsigned NOT NULL default '0',
   `DEF` smallint(6) unsigned NOT NULL default '0',
   `MDEF` smallint(6) unsigned NOT NULL default '0',
-  `STR` tinyint(4) unsigned NOT NULL default '0',
-  `AGI` tinyint(4) unsigned NOT NULL default '0',
-  `VIT` tinyint(4) unsigned NOT NULL default '0',
-  `INT` tinyint(4) unsigned NOT NULL default '0',
-  `DEX` tinyint(4) unsigned NOT NULL default '0',
-  `LUK` tinyint(4) unsigned NOT NULL default '0',
+  `STR` smallint(6) unsigned NOT NULL default '0',
+  `AGI` smallint(6) unsigned NOT NULL default '0',
+  `VIT` smallint(6) unsigned NOT NULL default '0',
+  `INT` smallint(6) unsigned NOT NULL default '0',
+  `DEX` smallint(6) unsigned NOT NULL default '0',
+  `LUK` smallint(6) unsigned NOT NULL default '0',
   `Range2` tinyint(4) unsigned NOT NULL default '0',
   `Range3` tinyint(4) unsigned NOT NULL default '0',
   `Scale` tinyint(4) unsigned NOT NULL default '0',
diff --git a/sql-files/upgrade_svn14796.sql b/sql-files/upgrade_svn14796.sql
new file mode 100644
index 000000000..21c1bcd55
--- /dev/null
+++ b/sql-files/upgrade_svn14796.sql
@@ -0,0 +1 @@
+ALTER TABLE `char` MODIFY `weapon` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql-files/upgrade_svn14797.sql b/sql-files/upgrade_svn14797.sql
new file mode 100644
index 000000000..acf6fb33d
--- /dev/null
+++ b/sql-files/upgrade_svn14797.sql
@@ -0,0 +1 @@
+ALTER TABLE `char` ADD `robe` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0' AFTER `head_bottom`;