diff options
| -rw-r--r-- | conf/groups.conf | 5 | ||||
| -rw-r--r-- | doc/sample/npc_test_skill.txt | 10 | ||||
| -rw-r--r-- | doc/script_commands.txt | 23 | ||||
| -rw-r--r-- | src/config/classes/general.h | 3 |
4 files changed, 20 insertions, 21 deletions
diff --git a/conf/groups.conf b/conf/groups.conf index d3bd6a514..7c97352dc 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -72,11 +72,6 @@ Syntax ------ This config file uses libconfig syntax: http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files - - -Upgrading from revisions before r15572 -------------------------------------- -http://rathena.org/board/index.php?showtopic=58877 */ groups: ( diff --git a/doc/sample/npc_test_skill.txt b/doc/sample/npc_test_skill.txt index 1168014ea..cc6de3bbc 100644 --- a/doc/sample/npc_test_skill.txt +++ b/doc/sample/npc_test_skill.txt @@ -1,9 +1,9 @@ //===== Hercules Script ======================================= //= Sample: Skill //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== -//= 20121003 +//= 20130426 //===== Description: ========================================= //= Demonstrates the 'skill' command. //============================================================ @@ -12,12 +12,13 @@ // flag=0 Grants the skill permanently // flag=1 Grants the skill temporarily // flag=2 Level bonus, stackable +// flag=3 Grants the skill permanently even after skill resets/job changes // If flag is undefined, it defaults to 1 // View db/(pre-)re/skill_db.txt for skill IDs prontera,157,182,0 script Skills 116,{ mes "What skill would you like?"; - switch(select("First Aid:Play Dead:Heal:None")) { + switch(select("First Aid:Play Dead:Heal:Sight:None")) { case 1: skill 142,1,0; // Permanently gives player level 1 First Aid close; @@ -28,6 +29,9 @@ prontera,157,182,0 script Skills 116,{ skill 28,3,1; // Temporarily gives player level 3 Heal close; case 4: + skill 10,1,3; // Permanently gives player level 1 Sight, even after skill resets/job changes + close; + case 5: close; } } diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 277df7ee4..bf462c812 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1,4 +1,4 @@ -//===== Hercules Documentation ================================ +//===== Hercules Documentation ================================ //= Hercules Script Commands //===== By: ================================================== //= Hercules Dev Team @@ -540,9 +540,9 @@ If you try to set Zeny to a negative number, the script will be terminated with Assigning variables --------- --------- -As of rAthena revision 15982, variables can be accessed and assigned values directly -without the use of the built-in 'set' function. This means that variables can be -accessed and modified much like other programming languages. +Variables can be accessed and assigned values directly without the use of the built-in +'set' function. This means that variables can be accessed and modified much like other +programming languages. @x = 100; @x = @y = 100; @@ -1475,8 +1475,8 @@ generally cleaner: return 1;// it's odd } -Alternately, as of rAthena revision 15979 and 15981, user-defined functions -may be called directly without the use of the 'callfunc' script command. +Alternately, user-defined functions may be called directly without the use of +the 'callfunc' script command. function<TAB>script<TAB>SayHello<TAB>{ mes "Hello " + getarg(0); @@ -4125,12 +4125,13 @@ wall), the character is pushed only up to the obstacle. --------------------------------------- -*get_revision() +*get_version() -This command will return the SVN revision number that the server is -currently running on. +This command will return the SVN revision number or Git SHA-1 hash that the server +is currently running on (depends on whether you used a SVN or Git client for +getting Hercules. - if ( get_revision() >= 15000 ) + if ( get_version() >= 15000 ) mes "Welcome Hercules!"; --------------------------------------- @@ -6959,7 +6960,7 @@ uppercase/lowercase. Otherwise, 0. Characters not of the alphabelt will return 0 Example: - charisupper("Hercules", 1); //returns 1 + charisupper("Hercules", 0); //returns 1 --------------------------------------- diff --git a/src/config/classes/general.h b/src/config/classes/general.h index 6e6cc1425..cab0180d7 100644 --- a/src/config/classes/general.h +++ b/src/config/classes/general.h @@ -4,8 +4,7 @@ #define _CONFIG_GENERAL_H_ /** - * rAthena configuration file (http://rathena.org) - * For detailed guidance on these check http://rathena.org/wiki/SRC/config/ + * Hercules configuration file (http://hercules.ws) **/ /** |