diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /sql-files | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'sql-files')
| -rw-r--r-- | sql-files/main.sql | 6 | ||||
| -rw-r--r-- | sql-files/upgrades/2013-10-30--21-12.sql | 3 | ||||
| -rw-r--r-- | sql-files/upgrades/index.txt | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql index 29717155c..2c91d58b1 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -108,6 +108,7 @@ CREATE TABLE IF NOT EXISTS `char` ( `delete_date` INT(11) unsigned NOT NULL DEFAULT '0', `slotchange` SMALLINT(3) unsigned NOT NULL default '0', `char_opt` INT( 11 ) unsigned NOT NULL default '0', + `font` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`char_id`), UNIQUE KEY `name_key` (`name`), KEY `account_id` (`account_id`), @@ -660,7 +661,7 @@ INSERT INTO `sql_updates` (`timestamp`) VALUES (1366078541); INSERT INTO `sql_updates` (`timestamp`) VALUES (1381354728); INSERT INTO `sql_updates` (`timestamp`) VALUES (1381423003); INSERT INTO `sql_updates` (`timestamp`) VALUES (1382892428); -INSERT INTO `sql_updates` (`timestamp`) VALUES (1383162785); +INSERT INTO `sql_updates` (`timestamp`) VALUES (1383167577); -- -- Table structure for table `sstatus` @@ -714,9 +715,6 @@ INSERT INTO `interreg` (`varname`, `value`) VALUES CREATE TABLE IF NOT EXISTS `account_data` ( `account_id` int(11) unsigned NOT NULL default '0', `bank_vault` int(11) unsigned NOT NULL default '0', - `base_exp` TINYINT( 4 ) UNSIGNED NOT NULL default '0', - `base_drop` TINYINT( 4 ) UNSIGNED NOT NULL default '0', - `base_death` TINYINT( 4 ) UNSIGNED NOT NULL default '0', PRIMARY KEY (`account_id`) ) ENGINE=MyISAM; diff --git a/sql-files/upgrades/2013-10-30--21-12.sql b/sql-files/upgrades/2013-10-30--21-12.sql new file mode 100644 index 000000000..fdc16f418 --- /dev/null +++ b/sql-files/upgrades/2013-10-30--21-12.sql @@ -0,0 +1,3 @@ +#1383167577 +ALTER TABLE `char` ADD `font` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT '0'; +INSERT INTO `sql_updates` (`timestamp`) VALUES (1383167577);
\ No newline at end of file diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index 2cce6f493..ca06e9c31 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -7,4 +7,4 @@ 2013-10-09--21-38.sql 2013-10-10--16-36.sql 2013-10-27--16-47.sql -2013-10-30--19-53.sql
\ No newline at end of file +2013-10-30--21-12.sql
\ No newline at end of file |