- Some cleaning of the main.sql file

- Added upgrade file 5455 to make the manner/karma columns signed.


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

3 files changed, 33 insertions, 28 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 97cc23949..e670f14ef 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS

 

 2006/03/03

+	* Added upgrade_svn5455.sql, it converts the manner and karma columns to

+	  signed. Apply this if your tables have the field as unsigned (which would

+	  explain mute always disappearing after relogging) [Skotlex]

 	* status_change_start now checks on a 0->10000 scale, should fix sc-cards

 	  with very low rates never triggering (eg: some coma-inducing cards).

 	  [Skotlex]

diff --git a/sql-files/main.sql b/sql-files/main.sql
index e99c66787..49f056e6c 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -31,48 +31,48 @@ DROP TABLE IF EXISTS `char`;
 CREATE TABLE `char` (

   `char_id` int(11) unsigned NOT NULL auto_increment,

   `account_id` int(11) unsigned NOT NULL default '0',

-  `char_num` tinyint(4) NOT NULL default '0',

+  `char_num` tinyint(1) NOT NULL default '0',

   `name` varchar(30) NOT NULL default '',

-  `class` smallint(11) unsigned NOT NULL default '0',

+  `class` smallint(6) unsigned NOT NULL default '0',

   `base_level` smallint(20) unsigned NOT NULL default '1',

   `job_level` smallint(20) unsigned NOT NULL default '1',

   `base_exp` bigint(20) unsigned NOT NULL default '0',

   `job_exp` bigint(20) unsigned NOT NULL default '0',

   `zeny` int(11) unsigned NOT NULL default '0',

-  `str` smallint(11) unsigned NOT NULL default '0',

-  `agi` smallint(11) unsigned NOT NULL default '0',

-  `vit` smallint(11) unsigned NOT NULL default '0',

-  `int` smallint(11) unsigned NOT NULL default '0',

-  `dex` smallint(11) unsigned NOT NULL default '0',

-  `luk` smallint(11) unsigned NOT NULL default '0',

-  `max_hp` mediumint(11) unsigned NOT NULL default '0',

-  `hp` mediumint(11) unsigned NOT NULL default '0',

-  `max_sp` mediumint(11) unsigned NOT NULL default '0',

-  `sp` mediumint(11) unsigned NOT NULL default '0',

-  `status_point` smallint(11) unsigned NOT NULL default '0',

-  `skill_point` smallint(11) unsigned NOT NULL default '0',

+  `str` smallint(4) unsigned NOT NULL default '0',

+  `agi` smallint(4) unsigned NOT NULL default '0',

+  `vit` smallint(4) unsigned NOT NULL default '0',

+  `int` smallint(4) unsigned NOT NULL default '0',

+  `dex` smallint(4) unsigned NOT NULL default '0',

+  `luk` smallint(4) unsigned NOT NULL default '0',

+  `max_hp` mediumint(8) unsigned NOT NULL default '0',

+  `hp` mediumint(8) unsigned NOT NULL default '0',

+  `max_sp` mediumint(6) unsigned NOT NULL default '0',

+  `sp` mediumint(6) unsigned NOT NULL default '0',

+  `status_point` smallint(4) unsigned NOT NULL default '0',

+  `skill_point` smallint(4) unsigned NOT NULL default '0',

   `option` int(11) NOT NULL default '0',

-  `karma` tinyint(11) unsigned NOT NULL default '0',

-  `manner` tinyint(11) NOT NULL default '0',

+  `karma` tinyint(3) NOT NULL default '0',

+  `manner` tinyint(3) NOT NULL default '0',

   `party_id` smallint(11) unsigned NOT NULL default '0',

   `guild_id` smallint(11) unsigned NOT NULL default '0',

   `pet_id` int(11) unsigned NOT NULL default '0',

   `hair` tinyint(4) unsigned NOT NULL default '0',

-  `hair_color` smallint(11) unsigned NOT NULL default '0',

-  `clothes_color` smallint(4) unsigned NOT NULL default '0',

-  `weapon` smallint(11) unsigned NOT NULL default '1',

-  `shield` smallint(11) unsigned NOT NULL default '0',

-  `head_top` smallint(11) unsigned NOT NULL default '0',

-  `head_mid` smallint(11) unsigned NOT NULL default '0',

-  `head_bottom` smallint(11) 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',

+  `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',

   `last_map` varchar(20) NOT NULL default 'prontera.gat',

-  `last_x` smallint(11) unsigned NOT NULL default '53',

-  `last_y` smallint(11) unsigned NOT NULL default '111',

+  `last_x` smallint(4) unsigned NOT NULL default '53',

+  `last_y` smallint(4) unsigned NOT NULL default '111',

   `save_map` varchar(20) NOT NULL default 'prontera.gat',

-  `save_x` smallint(11) unsigned NOT NULL default '53',

-  `save_y` smallint(11) unsigned NOT NULL default '111',

+  `save_x` smallint(4) unsigned NOT NULL default '53',

+  `save_y` smallint(4) unsigned NOT NULL default '111',

   `partner_id` int(11) unsigned NOT NULL default '0',

-  `online` tinyint(4) NOT NULL default '0',

+  `online` tinyint(2) NOT NULL default '0',

   `father` int(11) unsigned NOT NULL default '0',

   `mother` int(11) unsigned NOT NULL default '0',

   `child` int(11) unsigned NOT NULL default '0',

diff --git a/sql-files/upgrade_svn5455.sql b/sql-files/upgrade_svn5455.sql
new file mode 100644
index 000000000..8d324230c
--- /dev/null
+++ b/sql-files/upgrade_svn5455.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `char` MODIFY `karma` tinyint(3) NOT NULL default '0';

+ALTER TABLE `char` MODIFY `manner` tinyint(3) NOT NULL default '0';