Permalink
3 comments
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #457 from rathena/feature/script_engine_upgrade
Script Engine Upgrade * More information here: https://rathena.org/board/topic/102946-script-engine-upgrade/
- Loading branch information
Showing
with
3,391 additions
and 2,138 deletions.
- +9 −3 conf/inter_athena.conf
- +14 −45 doc/script_commands.txt
- +4 −4 npc/custom/quests/hunting_missions.txt
- +72 −10 sql-files/main.sql
- +66 −0 sql-files/upgrades/upgrade_20150831.sql
- +34 −8 src/char/char.c
- +4 −2 src/char/char.h
- +62 −15 src/char/char_logif.c
- +3 −1 src/char/char_logif.h
- +233 −141 src/char/inter.c
- +2 −2 src/char/inter.h
- +2 −0 src/common/core.c
- +293 −125 src/common/db.c
- +148 −99 src/common/db.h
- +137 −71 src/common/ers.c
- +36 −30 src/common/ers.h
- +19 −21 src/common/mmo.h
- +204 −58 src/login/account.c
- +3 −2 src/login/account.h
- +3 −44 src/login/loginchrif.c
- +9 −9 src/map/atcommand.c
- +18 −8 src/map/chrif.c
- +1 −1 src/map/clif.c
- +2 −2 src/map/duel.c
- +16 −18 src/map/guild.c
- +8 −4 src/map/instance.c
- +7 −1 src/map/instance.h
- +174 −91 src/map/intif.c
- +1 −1 src/map/intif.h
- +225 −110 src/map/mapreg.c
- +20 −4 src/map/mapreg.h
- +3 −3 src/map/mob.c
- +13 −10 src/map/npc.c
- +253 −302 src/map/pc.c
- +39 −30 src/map/pc.h
- +1,049 −815 src/map/script.c
- +191 −19 src/map/script.h
- +13 −10 src/map/skill.c
- +1 −1 src/map/trade.c
- +0 −18 src/map/unit.c
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,66 @@ | ||
| ALTER TABLE `mapreg` ADD PRIMARY KEY (`varname`, `index`); | ||
| ALTER TABLE `mapreg` DROP INDEX `varname`; | ||
| ALTER TABLE `mapreg` DROP INDEX `index`; | ||
| ALTER TABLE `mapreg` MODIFY `varname` varchar(32) binary NOT NULL; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `acc_reg_num` ( | ||
| `account_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` int(11) NOT NULL default '0', | ||
| PRIMARY KEY (`account_id`,`key`,`index`), | ||
| KEY `account_id` (`account_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `acc_reg_str` ( | ||
| `account_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` varchar(254) NOT NULL default '0', | ||
| PRIMARY KEY (`account_id`,`key`,`index`), | ||
| KEY `account_id` (`account_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `char_reg_num` ( | ||
| `char_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` int(11) NOT NULL default '0', | ||
| PRIMARY KEY (`char_id`,`key`,`index`), | ||
| KEY `char_id` (`char_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `char_reg_str` ( | ||
| `char_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` varchar(254) NOT NULL default '0', | ||
| PRIMARY KEY (`char_id`,`key`,`index`), | ||
| KEY `char_id` (`char_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `global_acc_reg_num` ( | ||
| `account_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` int(11) NOT NULL default '0', | ||
| PRIMARY KEY (`account_id`,`key`,`index`), | ||
| KEY `account_id` (`account_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `global_acc_reg_str` ( | ||
| `account_id` int(11) unsigned NOT NULL default '0', | ||
| `key` varchar(32) binary NOT NULL default '', | ||
| `index` int(11) unsigned NOT NULL default '0', | ||
| `value` varchar(254) NOT NULL default '0', | ||
| PRIMARY KEY (`account_id`,`key`,`index`), | ||
| KEY `account_id` (`account_id`) | ||
| ) ENGINE=MyISAM; | ||
|
|
||
| INSERT INTO `acc_reg_num` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 2 AND `str` NOT LIKE '%$'; | ||
| INSERT INTO `acc_reg_str` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 2 AND `str` LIKE '%$'; | ||
| INSERT INTO `char_reg_num` (`char_id`, `key`, `index`, `value`) SELECT `char_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 3 AND `str` NOT LIKE '%$'; | ||
| INSERT INTO `char_reg_str` (`char_id`, `key`, `index`, `value`) SELECT `char_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 3 AND `str` LIKE '%$'; | ||
| INSERT INTO `global_acc_reg_num` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 1 AND `str` NOT LIKE '%$'; | ||
| INSERT INTO `global_acc_reg_str` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 1 AND `str` LIKE '%$'; | ||
| # DROP TABLE `global_reg_value`; |
Oops, something went wrong.
6295c77There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Many of my scriptsis not working after this update...This is a Example
new_1-1,45,113,4 script Guarda#Tuvok1 105,{
if (countitem(24366) == 0 ) {
getitem 24366,1;
}
query_sql( "SELECT
pacessFROMloginWHEREaccount_id= '"+escape_sql( getcharid(3) )+"'",.@return);if (.@return == 0) {
query_sql("UPDATE
loginSETpacess= 1 WHEREaccount_id= '"+escape_sql( getcharid(3) )+"'");mes "[Game Master]";
mes "Aqui está seu Box de Boas Vindas.";
mes "Tenha um bom jogo!";
getitem 24359,1;
close;
}
else {
mes "[Game Master]";
mes "Você já recebeu sua recompensa...";
close;
end;
}
end;
OnInit:
waitingroom "Retirar Prêmio",0;
end;
}
@edit
Vote4Points
PvP
Query_sqls
evertying is not working...
@edit 2
Sorry, this update will broke many things avaliable to "old servers"...Switching to stable...
6295c77There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in ebaefc1.
6295c77There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.