* Some preparations for the guild script update

- cleaned up npc event execution code
- cleaned up guild data loading/saving code; to be improved later
- removed dummy 'account name' expulsion list management code
- removed columns 'rsv1' and 'rsv2' from guild member data
- removed columns 'rsv1' 'rsv2' 'rsv3' and 'acc' from guild expulsion data
- added upgrade_svn11895.sql for SQL

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

3 files changed, 14 insertions, 8 deletions

diff --git a/sql-files/main.sql b/sql-files/main.sql
index 22cbab24b..e19b7567f 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -231,13 +231,9 @@ CREATE TABLE `guild_castle` (
 DROP TABLE IF EXISTS `guild_expulsion`;
 CREATE TABLE `guild_expulsion` (
   `guild_id` int(11) unsigned NOT NULL default '0',
+  `account_id` int(11) unsigned NOT NULL default '0',
   `name` varchar(24) NOT NULL default '',
   `mes` varchar(40) NOT NULL default '',
-  `acc` varchar(40) NOT NULL default '',
-  `account_id` int(11) unsigned NOT NULL default '0',
-  `rsv1` int(11) unsigned NOT NULL default '0',
-  `rsv2` int(11) unsigned NOT NULL default '0',
-  `rsv3` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guild_id`,`name`)
 ) TYPE=MyISAM;
 
@@ -259,8 +255,6 @@ CREATE TABLE `guild_member` (
   `exp_payper` tinyint(11) unsigned NOT NULL default '0',
   `online` tinyint(4) unsigned NOT NULL default '0',
   `position` tinyint(6) unsigned NOT NULL default '0',
-  `rsv1` int(11) unsigned NOT NULL default '0',
-  `rsv2` int(11) unsigned NOT NULL default '0',
   `name` varchar(24) NOT NULL default '',
   PRIMARY KEY  (`guild_id`,`char_id`),
   KEY `char_id` (`char_id`)
diff --git a/sql-files/upgrade_svn11721_log.sql b/sql-files/upgrade_svn11721_log.sql
index 5eb794975..ab2c312a8 100644
--- a/sql-files/upgrade_svn11721_log.sql
+++ b/sql-files/upgrade_svn11721_log.sql
@@ -1 +1 @@
-ALTER TABLE `picklog` CHANGE `type` `type` ENUM( 'M', 'P', 'L', 'T', 'V', 'S', 'N', 'C', 'A', 'R', 'G', 'E' ) NOT NULL DEFAULT 'P';

+ALTER TABLE `picklog` CHANGE `type` `type` ENUM( 'M', 'P', 'L', 'T', 'V', 'S', 'N', 'C', 'A', 'R', 'G', 'E' ) NOT NULL DEFAULT 'P';
diff --git a/sql-files/upgrade_svn11895.sql b/sql-files/upgrade_svn11895.sql
new file mode 100644
index 000000000..e34af527f
--- /dev/null
+++ b/sql-files/upgrade_svn11895.sql
@@ -0,0 +1,12 @@
+ALTER TABLE `guild_expulsion`
+  DROP `acc`,
+  DROP `rsv1`,
+  DROP `rsv2`,
+  DROP `rsv3`;
+
+ALTER TABLE `guild_expulsion`
+  MODIFY `account_id` int(11) unsigned NOT NULL default '0' AFTER `guild_id`;
+
+ALTER TABLE `guild_member`
+  DROP `rsv1`,
+  DROP `rsv2`;