diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
| commit | 7a20f13a210f395b8276cb19583e0b302f4f6a1f (patch) | |
| tree | 4a0dd554aa88f68f97f5d9f9676d23d1cfc9da15 | |
| parent | 7626b141f8e56b1739abce76f5a99cbbb2b4b159 (diff) | |
| parent | 24d6aba263ff25724b8e6c9d6a228bba9fd6e756 (diff) | |
| download | hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.gz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.bz2 hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.xz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
206 files changed, 480 insertions, 690 deletions
diff --git a/README.txt b/README.txt index f82c1b942..25ba050e9 100644 --- a/README.txt +++ b/README.txt @@ -1,11 +1,7 @@ //============================================================ -//= rAthena Readme File +//= Hercules Readme File //===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= $Revision$ -//===== Last Updated: ======================================== -//= $LastChangedDate$ +//= Hercules Dev Team //===== Description: ========================================= //= Basic information and installation guide with links to //= various forum posts and Wiki articles. @@ -14,7 +10,7 @@ ============================ || Table of Contents || ============================ -|| 1. What is rAthena? || +|| 1. What is Hercules? || || 2. Prerequisites || || 3. Installation || || 4. Troubleshooting || @@ -24,26 +20,27 @@ ============================ -|| 1. What is rAthena? || +|| 1. What is Hercules? || ============================ -rAthena is a collaborative software development project revolving around the +Hercules is a collaborative software development project revolving around the creation of a robust massively multiplayer online role playing game (MMORPG) server package. Written in C, the program is very versatile and provides NPCs, warps and modifications. The project is jointly managed by a group of volunteers located around the world as well as a tremendous community providing QA and -support. rAthena is a continuation of the eAthena project. +support. Hercules is a continuation of the original Athena project. ============================ || 2. Prerequisites || ============================ -Before installing rAthena there are certain tools and applications you will need. +Before installing Hercules there are certain tools and applications you will need. This differs between the varying operating systems available, so the following is broken down into Windows and Linux prerequisites. Windows - * TortoiseSVN (http://tortoisesvn.net/downloads.html) + * TortoiseGIT (http://code.google.com/p/tortoisegit/) + * MSysGit (http://code.google.com/p/msysgit/downloads/list?can=2) * MySQL (http://www.mysql.com/downloads/mysql/) * MySQL Workbench (http://www.mysql.com/downloads/workbench/) * MS Visual C++ (http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express) @@ -55,7 +52,7 @@ Linux (names of packages may require specific version numbers on certain distrib * mysql-devel * mysql-server * pcre-devel - * subversion + * git * zlib-devel @@ -68,23 +65,26 @@ relevant to your Operation System, please refer to the Wiki (links at the end of Windows * Install prerequisites - * Create a folder to download rAthena into (e.g. C:\rAthena) - * Right click this folder and select "SVN Checkout". - * Paste the SVN URL into the box: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ + * Create a folder to download Hercules into (e.g. C:\Hercules) + * Right click this folder and select "Git Clone". + * Paste the GIT URL into the box: https://github.com/HerculesWS/Hercules.git * Open MySQL Workbench and create an instance to connect to your MySQL Server - * Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE) + * Create a database (hercules), a user (hercules), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE) and then login using the new user - * Use MySQL Workbench to run the .sql files in /sql-files/ on the new rathena database + * Use MySQL Workbench to run the .sql files in /sql-files/ on the new Hercules database Linux - (For CentOS) Type: yum install gcc make mysql mysql-devel mysql-server pcre-devel subversion zlib-devel - (For Debian) Type: apt-get install subversion make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev + (For CentOS) Step 1: yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel + Step 2: rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm + Step 3: yum install --enablerepo=webtatic git-all + Step 4: yum install --enablerepo=webtatic --disableexcludes=main git-all + (For Debian) Type: apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev * Type: mysql_secure_installation * Start your MySQL server - * Setup a MySQL user: CREATE USER 'rathena'@'localhost' IDENTIFIED BY 'password'; - * Assign permissions: GRANT SELECT,INSERT,UPDATE,DELETE ON `rathena\_rag`.* TO 'rathena'@'localhost'; - * Type: svn checkout https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ ~/trunk - * Insert SQL files: mysql --user=root -p rathena_rag < trunk/sql-files/main.sql (and others) + * Setup a MySQL user: CREATE USER 'hercules'@'localhost' IDENTIFIED BY 'password'; + * Assign permissions: GRANT SELECT,INSERT,UPDATE,DELETE ON `hercules\_rag`.* TO 'hercules'@'localhost'; + * Type: git clone https://github.com/HerculesWS/Hercules.git ~/Hercules + * Insert SQL files: mysql --user=root -p hercules_rag < trunk/sql-files/main.sql (and others) * Type: cd trunk && ./configure && make clean && make sql * When you're ready, type: ./athena-start start @@ -136,29 +136,25 @@ Examples: ============================ || 5. Helpful Links || ============================ -The following list of links point to various help files within the SVN, articles or -pages on the Wiki or topics within the rAthena forum. +The following list of links point to various help files within the GIT, articles or +pages on the Wiki or topics within the Hercules forum. -* rAthena Forums - http://rathena.org/ +* Hercules Forums + http://hercules.ws/board/ -* SVN Repository URL: - https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ - -* Full Installation Instructions: - Windows http://rathena.org/wiki/Installation_on_Windows - CentOS http://rathena.org/wiki/Installation_(CentOS) - Debian http://rathena.org/wiki/Installation_(Debian) +* GIT Repository URL: + https://github.com/HerculesWS/Hercules -* rAthena IRC Channel - irc://irc.rathena.net +* Hercules IRC Channel + irc.rizon.net + Channel: #Hercules ============================ || 6. More Documentation || ============================ -rAthena has a large collection of help files and sample NPC scripts located in /doc/ +Hercules has a large collection of help files and sample NPC scripts located in /doc/ * Scripting It is recommended to look through /doc/script_commands.txt for help, pointers or @@ -170,7 +166,7 @@ rAthena has a large collection of help files and sample NPC scripts located in / For an in-depth explanation, please see /doc/atcommands.txt * Permissions - The rAthena emulator has a permission system that enables certain groups of players + The Hercules emulator has a permission system that enables certain groups of players to perform certain actions, or have access to certain visual enhancements or in-game activity. To see what permissions are available, they are detailed in /doc/permissions.txt diff --git a/conf/inter-server.conf b/conf/inter-server.conf index 70bf80e5c..523437007 100644 --- a/conf/inter-server.conf +++ b/conf/inter-server.conf @@ -56,6 +56,18 @@ log_db_db: ragnarok log_codepage: log_login_db: loginlog +// == MySQL Reconnect Settings +// =========================== +// - mysql_reconnect_type +// - 1: when mysql disconnects during runtime, the server tries to reconnect mysql_reconnect_count times and, +// -- if unsuccessful, the server is shut down +// - 2: when mysql disconnects during runtime it tries to reconnect indefinitely +mysql_reconnect_type:2 +// - mysql_reconnect_count +// - number of reconnect attempts the server should do when the database disconnects during runtime +// - only used when mysql_reconnect_type is 1 +mysql_reconnect_count:1 + // DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL // this is meant for people who KNOW their stuff, and for some reason want to change their // database layout. [CLOWNISIUS] diff --git a/conf/mapflag/battleground.txt b/conf/mapflag/battleground.txt index 86dcf95f0..f7404c139 100644 --- a/conf/mapflag/battleground.txt +++ b/conf/mapflag/battleground.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Battleground map setting. //===== By: ================================================== //= Epoque //===== Current Version: ===================================== //= 1.0a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Defines a Battleground map. //= Additional parameter '2' shows scoreboard. diff --git a/conf/mapflag/gvg.txt b/conf/mapflag/gvg.txt index 31430d856..055a1d733 100644 --- a/conf/mapflag/gvg.txt +++ b/conf/mapflag/gvg.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Guild versus Guild mode. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Players can attack other guilds, and will have their guild //= icons shown. WoE damage reductions will also take place. diff --git a/conf/mapflag/jail.txt b/conf/mapflag/jail.txt index 024a5cd6f..0a8b00846 100644 --- a/conf/mapflag/jail.txt +++ b/conf/mapflag/jail.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Jail. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= pvp: Turns on PvP mode //= pvp_noparty: Can't attack player in same party diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt index 4584f068f..c3e8a47fe 100644 --- a/conf/mapflag/night.txt +++ b/conf/mapflag/night.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Night mode. //===== By: ================================================== //= Skotlex //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Enables night mode effects. //===== Additional Comments: ================================= diff --git a/conf/mapflag/nightmare.txt b/conf/mapflag/nightmare.txt index 9c7d3f8f7..106ee665a 100644 --- a/conf/mapflag/nightmare.txt +++ b/conf/mapflag/nightmare.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Nightmare mode. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Players drop items/equipment on death. //= pvp_nightmaredrop id,type,percent diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index f9eea4890..a05c37df5 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable Dead Branch use. //===== By: ================================================== -//= rAthena Dev Team +//= HerculesDev Team //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables the following items: //= Dead Branch (604), Bloody Branch (12103), diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt index 4161a923c..0b6fe20c6 100644 --- a/conf/mapflag/noexp.txt +++ b/conf/mapflag/noexp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable EXP gain. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Same as 'nobaseexp' and 'nojobexp' combined. //===== Additional Comments: ================================= diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt index 392bf16e0..5b6e6ad12 100644 --- a/conf/mapflag/noicewall.txt +++ b/conf/mapflag/noicewall.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable Ice Wall. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Blocks usage of WZ_ICEWALL. //===== Additional Comments: ================================= diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt index adab17a5d..380dc506c 100644 --- a/conf/mapflag/noloot.txt +++ b/conf/mapflag/noloot.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable monster drops. //===== By: ================================================== //= Epoque //===== Current Version: ===================================== //= 1.0a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Same as 'nomobloot' and 'nomvploot' combined. //===== Additional Comments: ================================= diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 12321f7c1..dbb35a164 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable Warp Portal memory. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.8b -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Prevents players from using /memo on a map. //= Also disables marriage warp skills. diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index 2517a3759..083d86105 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable death penalty. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Same as 'noexppenalty' and 'nozenypenalty' combined. //===== Additional Comments: ================================= diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt index 3bb9d681a..9f876c49b 100644 --- a/conf/mapflag/nopvp.txt +++ b/conf/mapflag/nopvp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable Player versus Player mode. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Prevents PvP mode on a map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt index da694de91..696d81460 100644 --- a/conf/mapflag/noreturn.txt +++ b/conf/mapflag/noreturn.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable return warp. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables the following items: //= Butterfly Wing (602), Siege Teleport Scroll (14591), diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt index fe7e03dfa..59a59fcae 100644 --- a/conf/mapflag/nosave.txt +++ b/conf/mapflag/nosave.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable auto-save. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Characters logging out on the specified map will be warped //= to the map specified in the last field, or "SavePoint". diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt index 8a25aa137..81540b45a 100644 --- a/conf/mapflag/noskill.txt +++ b/conf/mapflag/noskill.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable skill use. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables all skills on the map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index 4ef0639ee..df25145d8 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable teleportation. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.6a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables all means of teleportation within a map. //= Script commands 'warp', 'areawarp', 'warpchar', diff --git a/conf/mapflag/novending.txt b/conf/mapflag/novending.txt index 816d52252..5f7ef8e82 100644 --- a/conf/mapflag/novending.txt +++ b/conf/mapflag/novending.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable vending. //===== By: ================================================== //= Epoque //===== Current Version: ===================================== //= 1.0a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables skill MC_VENDING on a map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt index bc41d29a6..cfeb938a2 100644 --- a/conf/mapflag/nowarp.txt +++ b/conf/mapflag/nowarp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable warping. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables use of @go to a map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index 0f9734799..2490b8e61 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Disable warpto. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables use of @warp to a map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/partylock.txt b/conf/mapflag/partylock.txt index 3afda71d5..e8d7051f2 100644 --- a/conf/mapflag/partylock.txt +++ b/conf/mapflag/partylock.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Party lock. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Blocks all party modifications on a map: //= /organize, /leave, /invite, @changeleader diff --git a/conf/mapflag/pvp.txt b/conf/mapflag/pvp.txt index 8463b8923..4e3ca5762 100644 --- a/conf/mapflag/pvp.txt +++ b/conf/mapflag/pvp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Player versus Player mode. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Enables PvP on a map. //===== Additional Comments: ================================= diff --git a/conf/mapflag/pvp_noguild.txt b/conf/mapflag/pvp_noguild.txt index 731739dd1..166b65764 100644 --- a/conf/mapflag/pvp_noguild.txt +++ b/conf/mapflag/pvp_noguild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Ignore guilds. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Ignores guild alliances on GvG-enabled maps. //===== Additional Comments: ================================= diff --git a/conf/mapflag/pvp_noparty.txt b/conf/mapflag/pvp_noparty.txt index abc9529d2..bd5e866f6 100644 --- a/conf/mapflag/pvp_noparty.txt +++ b/conf/mapflag/pvp_noparty.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Ignore parties. //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Ignores party alliances on PvP-enabled maps. //===== Additional Comments: ================================= diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt index 24adf9f3a..5354580b9 100644 --- a/conf/mapflag/reset.txt +++ b/conf/mapflag/reset.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Enable Neuralizer use. //===== By: ================================================== //= Daegaladh //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Maps where Neuralizer (12213) can be used. //===== Additional Comments: ================================= diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt index f4bd6d175..9c2a44bd8 100644 --- a/conf/mapflag/restricted.txt +++ b/conf/mapflag/restricted.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Restricted. //===== By: ================================================== //= Komurka //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Disables items configured in item_noequip.txt //= and skills configured in skill_nocast_db.txt. diff --git a/conf/mapflag/town.txt b/conf/mapflag/town.txt index 8dabb2c4a..319785524 100644 --- a/conf/mapflag/town.txt +++ b/conf/mapflag/town.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Mapflag: Town. //===== By: ================================================== //= Epoque //===== Current Version: ===================================== //= 1.0a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Designates a map as a town, granting mailbox access. //===== Additional Comments: ================================= diff --git a/doc/atcommands.txt b/doc/atcommands.txt index a0afa043c..fae920300 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Atcommand List //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20130115 //===== Description: ========================================= diff --git a/doc/ea_job_system.txt b/doc/ea_job_system.txt index f29278f50..e25f10689 100644 --- a/doc/ea_job_system.txt +++ b/doc/ea_job_system.txt @@ -1,4 +1,4 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= eAthena Job System //===== By: ================================================== //= Skotlex diff --git a/doc/effect_list.txt b/doc/effect_list.txt index c24791260..19b323cc6 100644 --- a/doc/effect_list.txt +++ b/doc/effect_list.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Client Effects List //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120822 //===== Description: ========================================= diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index 490f3bc24..e331dbf7b 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ -//= rAthena Item Bonuses List +//===== Hercules Documentation ================================ +//= Hercules Item Bonuses List //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121219 //===== Description: ========================================= diff --git a/doc/item_db.txt b/doc/item_db.txt index d474b08c9..8aa09ce53 100644 --- a/doc/item_db.txt +++ b/doc/item_db.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Item Database //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120904 //===== Description: ========================================= diff --git a/doc/map_cache.txt b/doc/map_cache.txt index 9bb401863..99e54ef06 100644 --- a/doc/map_cache.txt +++ b/doc/map_cache.txt @@ -1,11 +1,11 @@ -//===== rAthena Documentation ================================ -//= rAthena Map Cache Builder and Format Documentation +//===== Hercules Documentation ================================ +//= Hercules Map Cache Builder and Format Documentation //===== By: ================================================== //= DracoRPG //===== Current Version: ===================================== //= 20070724 //===== Description: ========================================= -//= A complete manual for rAthena's map cache generator as +//= A complete manual for Hercules' map cache generator as //= well as a reference on the map cache format used. //============================================================ @@ -14,7 +14,7 @@ Preface: Since SVN revision ~10000, the map-server no longer knows how to read GRFs directly. It reads maps from a "map cache" file that contains all and only the useful data about the maps. A map cache containing every official -kRO Sakray map currently supported by rAthena is provided as a default. +kRO Sakray map currently supported by Hercules is provided as a default. If you have custom maps or want to minimize the size of your map cache because your server does not load all of them (multi-map-server or light test server), you can use the map cache builder to generate a new one fitting your needs. @@ -22,7 +22,7 @@ Map cache builder manual: ------------------------------------------------------------------------------- The source code for the map cache builder is located in src/tool/. It can be built using "make tools" if you use the Makefile -or using the "mapcache" project under Visual Studio. Named "mapcache", the executable will be in your rAthena main folder. +or using the "mapcache" project under Visual Studio. Named "mapcache", the executable will be in your Hercules main folder. The map cache builder needs 3 file paths : one is a list of GRFs and/or data directory containing the maps, the second is the list of maps to add to the map cache, and the last one is the path of the map cache to generate. Default values for those paths are "tools/mapcache/grf_files.txt", "db/map_index.txt" and "db/(pre-)re/map_cache.dat". diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt index b374335cb..10760a695 100644 --- a/doc/md5_hashcheck.txt +++ b/doc/md5_hashcheck.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= MD5 Hash Check //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120921 //===== Description: ========================================= diff --git a/doc/mob_db_mode_list.txt b/doc/mob_db_mode_list.txt index 4c2b85e4a..f747e38b0 100644 --- a/doc/mob_db_mode_list.txt +++ b/doc/mob_db_mode_list.txt @@ -1,11 +1,11 @@ -//===== rAthena Documentation ================================ -//= rAthena Monster Modes Reference +//===== Hercules Documentation ================================ +//= Hercules Monster Modes Reference //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120630 //===== Description: ========================================= -//= A reference description of rAthena's mob_db 'mode' field. +//= A reference description of Hercules' mob_db 'mode' field. //============================================================ Bit Legend: diff --git a/doc/packet_struct_notation.txt b/doc/packet_struct_notation.txt index 25951acb5..c1598f3be 100644 --- a/doc/packet_struct_notation.txt +++ b/doc/packet_struct_notation.txt @@ -1,4 +1,4 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Packet Structure Notation //===== By: ================================================== //= Ai4rei @@ -29,7 +29,7 @@ The first line contains a brief description of what the packet does, or what it is good for, followed by it's AEGIS name in parentheses; first two letters of the AEGIS name specify origin (first letter) and destination (second letter) of the packet. If the packet's name -is not known or is not applicable (rAthena server-server packets), +is not known or is not applicable (Hercules server-server packets), specify at least these two letters to indicate the direction of the packet. Do not use S(end)/R(ecv) for this, as it is inaccurate and location dependent (if the description is copied to different server diff --git a/doc/permissions.txt b/doc/permissions.txt index 129d384f4..619282c94 100644 --- a/doc/permissions.txt +++ b/doc/permissions.txt @@ -1,7 +1,7 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Permission List //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120606 //===== Description: ========================================= diff --git a/doc/quest_variables.txt b/doc/quest_variables.txt index 8b9a6f3a3..556210dca 100644 --- a/doc/quest_variables.txt +++ b/doc/quest_variables.txt @@ -1,4 +1,4 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= Permanent Quest Variables //===== By: ================================================== //= Lupus diff --git a/doc/sample/bank_test.txt b/doc/sample/bank_test.txt index b040f80f2..e63ef7e12 100644 --- a/doc/sample/bank_test.txt +++ b/doc/sample/bank_test.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Bank Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20070315 //===== Description: ========================================= diff --git a/doc/sample/basejob_baseclass_upper.txt b/doc/sample/basejob_baseclass_upper.txt index fc0e9282e..04f7d310f 100644 --- a/doc/sample/basejob_baseclass_upper.txt +++ b/doc/sample/basejob_baseclass_upper.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Class Constants //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20110123 //===== Description: ========================================= diff --git a/doc/sample/checkoption.txt b/doc/sample/checkoption.txt index 0af9b2d36..eb768b9b2 100644 --- a/doc/sample/checkoption.txt +++ b/doc/sample/checkoption.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Checkoption //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20070315 //===== Description: ========================================= diff --git a/doc/sample/delitem2.txt b/doc/sample/delitem2.txt index 6810a3c26..f38d59c27 100644 --- a/doc/sample/delitem2.txt +++ b/doc/sample/delitem2.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Delitem2 //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20070315 //===== Description: ========================================= diff --git a/doc/sample/getequipcardid.txt b/doc/sample/getequipcardid.txt index 9c2e506d4..0447bf533 100644 --- a/doc/sample/getequipcardid.txt +++ b/doc/sample/getequipcardid.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Getequipcardid //===== By: ================================================== //= Lupus diff --git a/doc/sample/getequipid.txt b/doc/sample/getequipid.txt index 02d80780f..654c58f3b 100644 --- a/doc/sample/getequipid.txt +++ b/doc/sample/getequipid.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Getequipid //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121003 //===== Description: ========================================= diff --git a/doc/sample/getiteminfo.txt b/doc/sample/getiteminfo.txt index f2076cc75..15b81b749 100644 --- a/doc/sample/getiteminfo.txt +++ b/doc/sample/getiteminfo.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Getiteminfo //===== By: ================================================== //= Lupus diff --git a/doc/sample/getmonsterinfo.txt b/doc/sample/getmonsterinfo.txt index 084924739..079d9e7e9 100644 --- a/doc/sample/getmonsterinfo.txt +++ b/doc/sample/getmonsterinfo.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Getmonsterinfo //===== By: ================================================== //= Lupus diff --git a/doc/sample/gstorage_test.txt b/doc/sample/gstorage_test.txt index 9745b4b09..559f7f76e 100644 --- a/doc/sample/gstorage_test.txt +++ b/doc/sample/gstorage_test.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Guild Storage Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20070315 //===== Description: ========================================= diff --git a/doc/sample/localized_npc.txt b/doc/sample/localized_npc.txt index b3946162e..91bf46062 100644 --- a/doc/sample/localized_npc.txt +++ b/doc/sample/localized_npc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample localized NPC //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= v1.0 -//===== Compatible With: ===================================== -//= rAthena with setd, getd //===== Description: ========================================= //= Example of a localized NPC. //= diff --git a/doc/sample/npc_live_dialogues.txt b/doc/sample/npc_live_dialogues.txt index 6ba1c7ee2..22422d9af 100644 --- a/doc/sample/npc_live_dialogues.txt +++ b/doc/sample/npc_live_dialogues.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Live Dialogue //===== By: ================================================== //= Lupus diff --git a/doc/sample/npc_shop_test.txt b/doc/sample/npc_shop_test.txt index c86562cb4..fa58f3f52 100644 --- a/doc/sample/npc_shop_test.txt +++ b/doc/sample/npc_shop_test.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Shops //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20090206 //===== Description: ========================================= diff --git a/doc/sample/npc_test_array.txt b/doc/sample/npc_test_array.txt index 97aa5baf0..b6185adbc 100644 --- a/doc/sample/npc_test_array.txt +++ b/doc/sample/npc_test_array.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Array Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20090206 //===== Description: ========================================= diff --git a/doc/sample/npc_test_chat.txt b/doc/sample/npc_test_chat.txt index 7a8a65471..24176b802 100644 --- a/doc/sample/npc_test_chat.txt +++ b/doc/sample/npc_test_chat.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Chat Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121003 //===== Description: ========================================= diff --git a/doc/sample/npc_test_checkweight.txt b/doc/sample/npc_test_checkweight.txt index 195ff856e..e2560cedf 100644 --- a/doc/sample/npc_test_checkweight.txt +++ b/doc/sample/npc_test_checkweight.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: CheckWeight //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121113 //===== Description: ========================================= diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt index 46684c3d2..237e7e57d 100644 --- a/doc/sample/npc_test_duplicate.txt +++ b/doc/sample/npc_test_duplicate.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Duplicate Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20070915 //===== Description: ========================================= diff --git a/doc/sample/npc_test_func.txt b/doc/sample/npc_test_func.txt index 1a60ac69d..fbde70cd1 100644 --- a/doc/sample/npc_test_func.txt +++ b/doc/sample/npc_test_func.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Functions //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20120901 //===== Description: ========================================= diff --git a/doc/sample/npc_test_npctimer.txt b/doc/sample/npc_test_npctimer.txt index f3f661b6d..f3c2d8bee 100644 --- a/doc/sample/npc_test_npctimer.txt +++ b/doc/sample/npc_test_npctimer.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: NPC Timers //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121003 //===== Description: ========================================= diff --git a/doc/sample/npc_test_npctimer2.txt b/doc/sample/npc_test_npctimer2.txt index bd634b9d2..6c5d139f0 100644 --- a/doc/sample/npc_test_npctimer2.txt +++ b/doc/sample/npc_test_npctimer2.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Attached NPC Timers //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121003 //===== Description: ========================================= diff --git a/doc/sample/npc_test_pcre.txt b/doc/sample/npc_test_pcre.txt index adc96f585..09f65e607 100644 --- a/doc/sample/npc_test_pcre.txt +++ b/doc/sample/npc_test_pcre.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: PCRE //===== By: ================================================== //= rAthena Dev Team diff --git a/doc/sample/npc_test_quest.txt b/doc/sample/npc_test_quest.txt index 15fcdc210..39f838e23 100644 --- a/doc/sample/npc_test_quest.txt +++ b/doc/sample/npc_test_quest.txt @@ -1,7 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Quest Test //===== By: ================================================== -//= rAthena Dev Team +//= Hercules Dev Team //===== Current Version: ===================================== //= 20121227 //===== Description: ========================================= diff --git a/doc/sample/npc_test_setitemx.txt b/doc/sample/npc_test_setitemx.txt index eba53e008..10d8daaaa 100644 --- a/doc/sample/npc_test_setitemx.txt +++ b/doc/sample/npc_test_setitemx.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Setiteminfo & Setitemscript //===== By: ================================================== //= Lupus diff --git a/doc/sample/npc_test_setmapflag.txt b/doc/sample/npc_test_setmapflag.txt index 00da0d37d..010a6f85d 100644 --- a/doc/sample/npc_test_setmapflag.txt +++ b/doc/sample/npc_test_setmapflag.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Mapflag Test //===== By: ================================================== //= Jbain diff --git a/doc/sample/npc_test_skill.txt b/doc/sample/npc_test_skill.txt index 99eaa9f37..1168014ea 100644 --- a/doc/sample/npc_test_skill.txt +++ b/doc/sample/npc_test_skill.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Skill //===== By: ================================================== //= rAthena Dev Team diff --git a/doc/sample/npc_test_time.txt b/doc/sample/npc_test_time.txt index 8c5cbdb3e..f9c40b910 100644 --- a/doc/sample/npc_test_time.txt +++ b/doc/sample/npc_test_time.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Sample: Time Test //===== By: ================================================== //= rAthena Dev Team diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 2b1aa5d59..3c93490bb 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1,18 +1,14 @@ -//===== rAthena Documentation ================================ -//= rAthena Script Commands +//===== Hercules Documentation ================================ +//= Hercules Script Commands //===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= $Revision$ -//===== Last Updated: ======================================== -//= $LastChangedDate$ +//= Hercules Dev Team //===== Description: ========================================= -//= A reference manual for the rAthena scripting language. +//= A reference manual for the Hercules scripting language. //= Commands are sorted depending on their functionality. //============================================================ This document is a reference manual for all the scripting commands and functions -available in current rAthena SVN. It is not a simple tutorial. When people tell +available in current Hercules GIT. It is not a simple tutorial. When people tell you to "Read The F***ing Manual", they mean this. The information was mostly acquired through looking up how things actually work @@ -75,7 +71,7 @@ Wherever you refer to a map name, it's always 'mapname' or 'mapname.gat' Script loading structure ------------------------ -Scripts are loaded by the map server as referenced in the 'conf/map_athena.conf' +Scripts are loaded by the map server as referenced in the 'conf/map-server.conf' configuration file, but in the default configuration, it doesn't load any script files itself. Instead, it loads the file 'npc/scripts_main.conf' which itself contains references to other files. The actual scripts are loaded from txt @@ -83,7 +79,7 @@ files, which are linked up like this: npc: <path to a filename> -Any line like this, invoked, ultimately, by 'map_athena.conf' will load up the +Any line like this, invoked, ultimately, by 'map-server.conf' will load up the script contained in this file, which will make the script available. No file will get loaded twice, to prevent possible errors. @@ -101,7 +97,7 @@ place it. // This line will be ignored when processing the script. Block comments can also be used, where you can place /* and */ between any text you -wish rAthena to ignore. +wish Hercules to ignore. Example: /* This text, @@ -154,12 +150,12 @@ Monster name is the name the monsters will have on screen, and has no relation whatsoever to their names anywhere else. It's the mob id that counts, which identifies monster record in 'mob_db.txt' database of monsters. If the mob name is given as "--ja--", the 'japanese name' field from the monster database is -used, (which, in rAthena, actually contains an English name) if it's "--en--", +used, (which, in Hercules, actually contains an English name) if it's "--en--", it's the 'english name' from the monster database (which contains an uppercase name used to summon the monster with a GM command). Amount is the amount of monsters that will be spawned when this command is -executed, it is affected by spawn rates in 'battle_athena.conf'. +executed, it is affected by spawn rates in 'battle.conf'. Delay1 and delay2 control monster respawn delays - the first one is the fixed base respawn time, and the second is random variance on top of the base time. @@ -407,7 +403,7 @@ Variables The meat of every programming language is variables - places where you store data. -In the rAthena scripting language, variable names are not case sensitive. +In the Hercules scripting language, variable names are not case sensitive. Variables are divided into and uniquely identified by the combination of: prefix - determines the scope and extent (or lifetime) of the variable @@ -584,7 +580,7 @@ To include symbol '"' in a string you should use prefix '\"' Arrays ------ -Arrays (in rAthena at least) are essentially a set of variables going under the +Arrays (in Hercules at least) are essentially a set of variables going under the same name. You can tell between the specific variables of an array with an 'array index', a number of a variable in that array: @@ -731,7 +727,7 @@ Logical bitwise operators work only on numbers, and they are the following: | - Or. The bitwise operator AND (&) is used to test two values against each other, and results in setting bits which are active in both arguments. This can - be used for a few things, but in rAthena this operator is usually used to + be used for a few things, but in Hercules this operator is usually used to create bit-masks in scripts. The bitwise operator OR (|)sets to 1 a binary position if the binary position @@ -1429,7 +1425,7 @@ receive free Zeny as a result. Since trunk r12192 the command has two optional arguments and a return value. The default value of 'min' and 'max' can be set with 'input_min_value' and -'input_max_value' in script_athena.conf. +'input_max_value' in script.conf. For numeric inputs the value is capped to the range [min,max]. Returns 1 if the value was higher than 'max', -1 if lower than 'min' and 0 otherwise. For string inputs it returns 1 if the string was longer than 'max', -1 is @@ -1995,7 +1991,7 @@ Example: for ( set .@i,0; .@i<.@bigloop; set .@i, .@i+1 ) { dothis; // will sleep the script for 1ms when detect an infinity loop to - // let rAthena do what it need to do (socket, timer, process, etc.) + // let Hercules do what it need to do (socket, timer, process, etc.) } freeloop(0); // disable @@ -2516,7 +2512,7 @@ See 'getequipid' for a full list of valid equipment slots. *getitemname(<item id>) Given the database ID number of an item, this function will return the text -stored in the 'japanese name' field (which, in rAthena, stores an English name +stored in the 'japanese name' field (which, in Hercules, stores an English name the players would normally see on screen.) --------------------------------------- @@ -2904,7 +2900,7 @@ http://www.delorie.com/gnu/docs/glibc/libc_437.html All the format characters given in there should properly work. Max length is the maximum length of a time string to generate. -The example given in rAthena sample scripts works like this: +The example given in Hercules sample scripts works like this: mes gettimestr("%Y-%m/%d %H:%M:%S",21); @@ -3375,7 +3371,7 @@ Example 2: *basicskillcheck() This function will return the state of the configuration option -'basic_skill_check' in 'battle_athena.conf'. It returns 1 if the option is +'basic_skill_check' in 'battle.conf'. It returns 1 if the option is enabled and 0 if it isn't. If the 'basic_skill_check' option is enabled, which it is by default, characters must have a certain number of basic skill levels to sit, request a trade, use emotions, etc. Making your script behave differently @@ -3924,7 +3920,7 @@ changing jobs, which can be checked for later in scripts. *jobname (<job number>) -This command retrieves the name of the given job using the msg_athena entries 550->650. +This command retrieves the name of the given job using the messages.conf entries 550->650. mes "[Kid]"; mes "I never thought I'd met a "+jobname(Class)+" here of all places."; @@ -4094,7 +4090,7 @@ sprites, which is essential for making custom headgear. Since a lot of people have different palettes for hair and clothes, it's impossible to tell you what all the color numbers are. If you want a serious -example, there is a Stylist script inside the default rAthena installation that +example, there is a Stylist script inside the default Hercules installation that you can look at: 'npc/custom/stylist.txt' --------------------------------------- @@ -4121,7 +4117,7 @@ This command will return the SVN revision number that the server is currently running on. if ( get_revision() >= 15000 ) - mes "Welcome rAthena!"; + mes "Welcome Hercules!"; --------------------------------------- \\ @@ -4830,7 +4826,7 @@ Used in reset NPC's (duh!) This command takes off all the skill points on the invoking character, so they only have Basic Skill blanked out (lvl 0) left, and returns the points for them to spend again. Nothing else will change but the skills. Quest skills will also -reset if 'quest_skill_reset' option is set to Yes in 'battle_athena.conf'. If +reset if 'quest_skill_reset' option is set to Yes in 'battle.conf'. If the 'quest_skill_learn' option is set in there, the points in the quest skills will also count towards the total. @@ -5897,7 +5893,7 @@ hold information about the name id (item id) sold and the amount sold of it. Sam goes for the OnSellItem label, only the variables are named different (@sold_nameid, @sold_quantity, @sold_refine, @sold_attribute, @sold_identify, @sold_card1, @sold_card2, @sold_card3, @sold_card4). An example on a shop comes -with rAthena, and can be found in the doc/sample/npc_dynamic_shop.txt file. +with Hercules, and can be found in the doc/sample/npc_dynamic_shop.txt file. This example shows how to use the labels and their set variables to create a dynamic shop. @@ -6032,7 +6028,7 @@ characters are present in the room to mess up the script. The 'enablearena'/'disablearena' commands are just aliases with no parameter. These are supposedly left here for compatibility with official server scripts, -but no rAthena script uses these at the moment. +but no Hercules script uses these at the moment. --------------------------------------- @@ -6350,7 +6346,7 @@ will not be displayed anywhere else. *logmes "<message>"; This command will write the message given to the map server NPC log file, as -specified in 'conf/log_athena.conf'. In the TXT version of the server, the log +specified in 'conf/logs.conf'. In the TXT version of the server, the log file is 'log/npclog.log' by default. In the SQL version, if SQL logging is enabled, the message will go to the 'npclog' table, otherwise, it will go to the same log file. @@ -6937,7 +6933,7 @@ uppercase/lowercase. Otherwise, 0. Characters not of the alphabelt will return 0 Example: - charisupper("rAthena", 1); //returns 1 + charisupper("Hercules", 1); //returns 1 --------------------------------------- @@ -7154,7 +7150,7 @@ at the maximum possible. The behavior modified with the above mentioned commands will only be exhibited if the pet is loyal and appropriate configuration options are set in -'battle_athena.conf'. +'battle.conf'. Pet scripts in the database normally run whenever a pet of that type hatches from the egg. Other commands usable in item scripts (see 'bonus') will also diff --git a/doc/whisper_sys.txt b/doc/whisper_sys.txt index 2e71558c3..c5c042f4d 100644 --- a/doc/whisper_sys.txt +++ b/doc/whisper_sys.txt @@ -1,11 +1,11 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= NPC Whisper System //===== By: ================================================== //= lordalfa //===== Current Version: ===================================== //= 20120904 //===== Description: ========================================= -//= A description of rAthena's NPC whispering system. +//= A description of Hercules' NPC whispering system. //============================================================ This piece of code to allows characters to execute events in NPCs by whispering diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt index 099a5a15e..2b645118e 100644 --- a/doc/woe_time_explanation.txt +++ b/doc/woe_time_explanation.txt @@ -1,4 +1,4 @@ -//===== rAthena Documentation ================================ +//===== Hercules Documentation ================================ //= WoE Time Explanation //===== By: ================================================== //= erKURITA diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index d145afb98..0deca7d29 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= The Airship System Script //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= The Airship System used in the official servers. //===== Additional Comments: ================================= diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 6997187fb..178b526f3 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= // BattleGround System - Common NPCs //===== By: ================================================== //= ????, L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Battleground NPCs: diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 27d60a48a..c0787516a 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alberta Town //===== By: ================================================== //= DZeroX //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= Town-specific Alberta NPCs //===== Additional Comments: ================================= diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 0a28caade..19c675cf3 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al De Baran Town //===== By: ================================================== //= rAthena dev team; L0ne_W0lf //===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Al De Baran Town NPCs diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 1458815c7..de44a5a82 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Town //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Amatsu Town Script diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index abba76866..5f4e4ab54 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayotaya Town //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Ayotaya Town Script diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index de4460cd3..f18c18a54 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Universal Rental NPC //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= One-click automatic mount rentals. //============================================================ diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index b2dce9b6f..e1a4f90f6 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Card Removal NPC //===== By: ================================================== //= TyrNemesis^ //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Removes cards from equipped items. //===== Additional Comments: ================================= diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index 2469b6a24..ac784b599 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= elRO Airship //===== By: ================================================== //= Draike, Bluto, Hephaestus //===== Current Version: ===================================== //= 2.2a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= It's the elRO airship. XD //===== Additional Comments: ================================= diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index ed514c901..b7a62d228 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Banker Script //===== By: ================================================== //= Syrus22 (1.0) //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= Any rAthena version with Account variables. //===== Description: ========================================= //= An account wide Banker to store Zeny //===== Additional Comments: ================================= diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index 734c129d5..5ac35fe85 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= The 2nd Bank of Prontera (with daily 0.01% income!) //===== By: ================================================== //= Lupus (1.0) //===== Current Version: ===================================== //= 1.2a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= A bank which has an interest % //===== Additional Comments: ================================= diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt index 951af3f68..405409236 100644 --- a/npc/custom/etc/blackjack.txt +++ b/npc/custom/etc/blackjack.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Black Jack //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Black Jack card game. Gameplay based off standard casino //= black jack rules. Dealer must have at least 17 to stay and will diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index 0fba60f2f..bc0f2e061 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bandit Beard Quest //===== By: ================================================== //= Mega Man Expert & Lupus //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= A harmless quest for a simply item w/o any bonuses "Bandit Beard" //===== Additional Comments: ================================= diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index cfaf78980..02f5e561b 100644 --- a/npc/custom/quests/berzebub.txt +++ b/npc/custom/quests/berzebub.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Berzebub Card Quest //===== By: ================================================== //= jabs //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Quest to get the Berzebub Card //===== Additional Comments: ================================= diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 514193cbd..a50fa4980 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bossnia Warp NPCs //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena //===== Description: ========================================= //= Bossnia Warp NPC's. //===== Additional Comments: ================================= diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 27376df86..36ebdf941 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium - WoE Auto-Start //===== By: ================================================== //= kalen (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= rAthena SVN; RO Episode 4+ //===== Description: ========================================= //= Auto Start for War of Emperium //============================================= diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 1175d5a5a..8f4253299 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium Guild Template File //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [ Aegis Conversion] //= ---------------------------------------------------------- diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index e194e9433..06d523e09 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt index 3aae1b699..e5c931239 100644 --- a/npc/guild/aldeg_cas02.txt +++ b/npc/guild/aldeg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 2 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt index 751e404ac..9666bdaf0 100644 --- a/npc/guild/aldeg_cas03.txt +++ b/npc/guild/aldeg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 3 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt index 0afba08bd..cc91a0207 100644 --- a/npc/guild/aldeg_cas04.txt +++ b/npc/guild/aldeg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 4 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt index 2f43685b5..229c5ea36 100644 --- a/npc/guild/aldeg_cas05.txt +++ b/npc/guild/aldeg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 5 //===== Additional Comments: ================================= diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index f37580617..dfe2887e0 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Template File //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Like agit_main, this file is required //= for SE castles to function. diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt index 81e16ac36..7601fd18b 100644 --- a/npc/guild2/agit_start_se.txt +++ b/npc/guild2/agit_start_se.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Auto-Start //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN; RO Episode 11.3 //===== Description: ========================================= //= Auto Start for War of Emperium //= To know how to set up WoE times, go to doc\woe_time_explanation.txt diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 1dcffa9c1..61ada97c5 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Mardol //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 1d786902f..0fcfeaa30 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Cyr //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index fa25cffd3..86c3f5c26 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Horn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index e26ec613f..977dc2fbd 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Gefn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index 621ac8ad9..38be97b8d 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== HerculesScript ======================================= //= War of Emperium SE - Banadis //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 9c25f72ac..29e210c8e 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Assassin Job Quest //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 3.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job Change quest for Assassin class. diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 96e291fc7..ba60ca5b4 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== HerculesScript ======================================= //= Blacksmith Job Quest //===== By: ================================================== //= EREMES THE CANIVALIZER(Aegis) @@ -8,8 +8,6 @@ //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== //= 2.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job Change quest for Blacksmith class. diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index 0776825fb..04d44bb79 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Advance Class jobchanger after kRO Normals. //===== By: ================================================== //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 + //===== Description: ========================================= //= Advance Class jobchanger after kRO Normals. //===== Additional Comments: ================================= diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 6d06a8a91..e6128b437 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alchemist Job Quest //===== By: ================================================== //= nestor_zulueta (Fusion), converted by Darkchild //===== Current Version: ===================================== //= 3.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Alchemist classes diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index 06ffee93c..e61faf8d6 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bard Job Quest //===== By: ================================================== //= Muad_Dib(The Prometheus Project), Lupus, Samuray22 //===== Current Version: ===================================== //= 2.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Bard class diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index 28cd5a9e0..d0ca625df 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Advance Class jobchanger after kRO Normals. //===== By: ================================================== //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 + //===== Description: ========================================= //= Advance Class jobchanger after kRO Normals. //===== Additional Comments: ================================= diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index b99f7bf25..d3506244d 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alchemist Shop //===== By: ================================================== //= rAthena Team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Selling Alchemist Materials and Manuals //===== Additional Comments: ================================= diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index fadf8b03f..75d203123 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Magazine Dealer Kenny //===== By: ================================================== //= rAthena dev team //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Turns bullets into magazines/packs. //===== Additional Comments: ================================= diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 71f189c6e..b9d515ad4 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bullet Dealer Tony //===== By =================================================== //= Playtester, Paradox924X //===== Version ============================================== //= 1.5 -//===== Compatible With ====================================== -//= rAthena SVN //===== Description ========================================== //= Bullet trader. //===== Comments ============================================= diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index 4e9065b8e..93e7d0f0b 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Buying Shop Scripts //===== By: ================================================== //= Kisuka, skyiing, Scriptor //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Buying Shop licenses and catalogs. //===== Additional Comments: ================================= diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index 168445fa0..3028d302d 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Cash Hair Stylist //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Exchange cash item, New_Style_Coupon, for new hair styles. //===== Additional Comments: ================================= diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index 2de6e794e..1063800f6 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Cash Shop NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Sell Cash shop items. //= Based on iRO's Cash shop. Headgears omitted. diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index fa309738a..e0887b30e 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Headgear Dyer (Cash) //===== By: ================================================== //= Xantara //= Maud_Dib //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Change headgear's color. Cost is a Mysterious Dyestuff diff --git a/npc/mobs/bossnia.txt b/npc/mobs/bossnia.txt index 31b5e25d0..115f0c2ba 100644 --- a/npc/mobs/bossnia.txt +++ b/npc/mobs/bossnia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bossnia Monster Spawn Script //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any rAthena Version //===== Description: ========================================= //= Spawns boss monsters / MvP's in the Bossnia Dungeons. //============================================================ diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 07630674b..9a17dacda 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Cash Shop Functions //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Used explicitly in the Item Database for Cash shop items //= - Kafra Card diff --git a/npc/other/auction.txt b/npc/other/auction.txt index 48e74107f..dd8ccd068 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Auction system //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Auction house releated NPCs, and warps diff --git a/npc/other/books.txt b/npc/other/books.txt index 6175e383f..29b2586b1 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Prontera Library //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Various Books found in Prontera Library diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index 3047f2ace..4f09306fc 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Official scripts for beginners from iRO //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Added Alberta, Prontera, Izlude, Payon, Byalan Island, //= Archer Village, Payon Cave and Coal Mine diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt index 8afff06e7..5d1b6e6f9 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Card Trader //===== By: ================================================== //= Elias (og2) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN r15340+ //===== Description: ========================================= //= Card and Points Trader //===== Additional Comments: ================================= diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index f5408b611..7cdf6544b 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alberta Town Pre-Renewal //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Alberta town NPCs. //===== Additional Comments: ================================= diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 841a96524..d61c06fc2 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Acolyte Job Quest //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Acolyte classes diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index a4a96fff0..ec4eb2d2f 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Archer Job Quest //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Archer classes diff --git a/npc/pre-re/mobs/dungeons/abbey.txt b/npc/pre-re/mobs/dungeons/abbey.txt index 922356452..5babfaabd 100644 --- a/npc/pre-re/mobs/dungeons/abbey.txt +++ b/npc/pre-re/mobs/dungeons/abbey.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Abbey Dungeon Monster Spawn Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Initial version [$ephiroth] //= 1.1 Updated spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/abyss.txt b/npc/pre-re/mobs/dungeons/abyss.txt index 6bce6bcbc..65167a9bd 100644 --- a/npc/pre-re/mobs/dungeons/abyss.txt +++ b/npc/pre-re/mobs/dungeons/abyss.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Abyss Lake Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Real spawns by Poki#3 [Nexon] //= 1.1 More official spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/alde_dun.txt b/npc/pre-re/mobs/dungeons/alde_dun.txt index e78f2d6ff..bd31e20dd 100644 --- a/npc/pre-re/mobs/dungeons/alde_dun.txt +++ b/npc/pre-re/mobs/dungeons/alde_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al De Baran Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/ama_dun.txt b/npc/pre-re/mobs/dungeons/ama_dun.txt index 7f3504d06..482708d66 100644 --- a/npc/pre-re/mobs/dungeons/ama_dun.txt +++ b/npc/pre-re/mobs/dungeons/ama_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/anthell.txt b/npc/pre-re/mobs/dungeons/anthell.txt index 3df4faca1..62ba3acb9 100644 --- a/npc/pre-re/mobs/dungeons/anthell.txt +++ b/npc/pre-re/mobs/dungeons/anthell.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ant Hell Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/ayo_dun.txt b/npc/pre-re/mobs/dungeons/ayo_dun.txt index b3c9c7fa4..91733887e 100644 --- a/npc/pre-re/mobs/dungeons/ayo_dun.txt +++ b/npc/pre-re/mobs/dungeons/ayo_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Using euRO data [Ishizu] //= 1.2 Moved Tao Gunka to west cave of Comodo [Lupus] diff --git a/npc/pre-re/mobs/dungeons/beach_dun.txt b/npc/pre-re/mobs/dungeons/beach_dun.txt index 5ecd025b1..e6d34f789 100644 --- a/npc/pre-re/mobs/dungeons/beach_dun.txt +++ b/npc/pre-re/mobs/dungeons/beach_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Beach Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Small 11.1 spawn update [Playtester] diff --git a/npc/pre-re/mobs/dungeons/c_tower.txt b/npc/pre-re/mobs/dungeons/c_tower.txt index a6bc486e2..02db67e94 100644 --- a/npc/pre-re/mobs/dungeons/c_tower.txt +++ b/npc/pre-re/mobs/dungeons/c_tower.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Clock Tower Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Split from combined Alde and CT spawn file. [L0ne_W0lf] //============================================================ diff --git a/npc/pre-re/mobs/fields/amatsu.txt b/npc/pre-re/mobs/fields/amatsu.txt index a59e48b64..1b886b073 100644 --- a/npc/pre-re/mobs/fields/amatsu.txt +++ b/npc/pre-re/mobs/fields/amatsu.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus] //= 1.2 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/ayothaya.txt b/npc/pre-re/mobs/fields/ayothaya.txt index cb6d9a869..e60e4491b 100644 --- a/npc/pre-re/mobs/fields/ayothaya.txt +++ b/npc/pre-re/mobs/fields/ayothaya.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Using EuRO data [Ishizu] //= 1.2 According the guide book, added a Choco [Lupus&VP] diff --git a/npc/pre-re/other/arena/arena_aco.txt b/npc/pre-re/other/arena/arena_aco.txt index d0830135e..4ffc6308b 100644 --- a/npc/pre-re/other/arena/arena_aco.txt +++ b/npc/pre-re/other/arena/arena_aco.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Acolyte Battle Arena //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_lvl50.txt b/npc/pre-re/other/arena/arena_lvl50.txt index 87f61825b..6c2138458 100644 --- a/npc/pre-re/other/arena/arena_lvl50.txt +++ b/npc/pre-re/other/arena/arena_lvl50.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena lvl 50 //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 50 //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_lvl60.txt b/npc/pre-re/other/arena/arena_lvl60.txt index 37d076683..0835b64ad 100644 --- a/npc/pre-re/other/arena/arena_lvl60.txt +++ b/npc/pre-re/other/arena/arena_lvl60.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena lvl 60 //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 60 //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_lvl70.txt b/npc/pre-re/other/arena/arena_lvl70.txt index c5ca4d1e2..e683dea8c 100644 --- a/npc/pre-re/other/arena/arena_lvl70.txt +++ b/npc/pre-re/other/arena/arena_lvl70.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena lvl 70 //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 70 //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_lvl80.txt b/npc/pre-re/other/arena/arena_lvl80.txt index 796d668e1..cc09dfa57 100644 --- a/npc/pre-re/other/arena/arena_lvl80.txt +++ b/npc/pre-re/other/arena/arena_lvl80.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena lvl 80 //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 80 //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_party.txt b/npc/pre-re/other/arena/arena_party.txt index e907b0890..4755cc866 100644 --- a/npc/pre-re/other/arena/arena_party.txt +++ b/npc/pre-re/other/arena/arena_party.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Party Arena //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Party Battle Arena //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena/arena_point.txt b/npc/pre-re/other/arena/arena_point.txt index 7a6501cfa..8452e0692 100644 --- a/npc/pre-re/other/arena/arena_point.txt +++ b/npc/pre-re/other/arena/arena_point.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Point Exchanger //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Point exchanger: Turbo track points -> Arena Points diff --git a/npc/pre-re/other/arena/arena_room.txt b/npc/pre-re/other/arena/arena_room.txt index 3156d5c57..85a15fe60 100644 --- a/npc/pre-re/other/arena/arena_room.txt +++ b/npc/pre-re/other/arena/arena_room.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Izlude Arena Room //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Main Room //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/other/arena.txt b/npc/pre-re/warps/other/arena.txt index f0bb7e8df..dbda03a66 100644 --- a/npc/pre-re/warps/other/arena.txt +++ b/npc/pre-re/warps/other/arena.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Arena Warps //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points related to Izlude Arena && Control Panel //===== Additional Comments: ================================= diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index abba818b7..a735464f7 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Wandering Minstrel Quest //===== By: ================================================== //= Riotblade and L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Help the bard remember how his song goes. //===== Comments: ============================================ diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 629de4e4d..267e772b5 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bunny Band Quest //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Quest to obtain a Bunny Band headgear. diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 42e5ceb12..4ba6c165c 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= 2004 Headgear Quests //===== By: ================================================== //= Dj-Yhn //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= 2004 New Headgears. Official Quests diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index d638d777c..f50372cae 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= 2005 Headgear Quests //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena //===== Description: ========================================= //= [Aegis Conversion] //= 2005 Headgears Official Quest. diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index 2d9fd8236..da3f6cfdb 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= 2006 Headgear //===== By: ================================================== //= DiviniaRO members, cleaned by reddozen //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask, diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index c634bb2f0..0f3698eec 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/npc/quests/newgears/2008_headgears.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= 2008 Headgear //===== By: ================================================== //= Masao //= Credits: Muad_Dib //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= SVN rA //===== Description: ========================================= //= [Aegis Conversion] //= Cats Footprint, Cute Ribbon Dyer and Brides Corolla. diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 3242ede5e..2e64bbfb3 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brisingamen seal unlocking NPCs. //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena //===== Description: ========================================= //= Quest for breaking the seal of Brisingamen. //===== Additional Comments: ================================= diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 2d797d714..012c499c8 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Acolyte Skill Quest //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Quest for skills: Holy Light //===== Additional Comments: ================================= diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index 987c6751d..07f3514cc 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alchemist Skills Quests //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis COnversion] //= Quests for item: Elemental_Create_Book diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index 2e27cf900..e9f87ae6d 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Archer Skill Quest //===== By: ================================================== //= rAthena dev team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Quest for skills: Arrow Crafting, Arrow Repel //===== Additional Comments: ================================= diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index e39444e32..7136634f0 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Assassin Skills Quests //===== By: ================================================== //= Lupus, Reddozen //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Quests for skills: Venom Knife, Sonic Acceleration diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 2ed03ba75..1b16c8362 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bard Skill Quest //===== By: ================================================== //= Lupus, Reddozen; L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Official quest for the Bard skill "Pang Voice" diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index aef3a8155..4ffbb06fe 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Blacksmith Skills Quests //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Quests for skills: Dubious Salesmanship, Greed diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt index a0a417510..ba74fbb13 100644 --- a/npc/re/cities/alberta.txt +++ b/npc/re/cities/alberta.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alberta Town Renewal //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Alberta town NPCs. //===== Additional Comments: ================================= diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 389c5863f..63c791feb 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Town //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Brasilis Town Script diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 40562a418..138c641e1 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Renewal Acolyte Job Quest //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Job Change to Acolyte Class //===== Additional Comments: ================================= diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 3740058cb..d0050e428 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Renewal Archer Job Quest //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Job Change to Archer Class //===== Additional Comments: ================================= diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 0da34bbe8..c71e2abd3 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Arch Bishop Job Quest //===== By: ================================================== //= L0ne_W0lf //= Credits: Gepard //===== Current Version: ===================================== //= 1.7a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Priest / High Priest -> Arch Bishop. diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index 1fac05c49..ceb6d9922 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= 3rd Item Seller //===== By: ================================================== //= Masao, Mercurial //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Sells some 3rd Job related items. diff --git a/npc/re/mobs/dungeons/abbey.txt b/npc/re/mobs/dungeons/abbey.txt index c39adfe4e..9560313e8 100644 --- a/npc/re/mobs/dungeons/abbey.txt +++ b/npc/re/mobs/dungeons/abbey.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Abbey Dungeon Monster Spawn Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Initial version [$ephiroth] //= 1.1 Updated spawns [Playtester] diff --git a/npc/re/mobs/dungeons/abyss.txt b/npc/re/mobs/dungeons/abyss.txt index 1c1ee63b0..ecf0336f8 100644 --- a/npc/re/mobs/dungeons/abyss.txt +++ b/npc/re/mobs/dungeons/abyss.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Abyss Lake Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Real spawns by Poki#3 [Nexon] //= 1.1 More official spawns [Playtester] diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index cc7dfb0e9..e74d40741 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al De Baran Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/re/mobs/dungeons/ama_dun.txt b/npc/re/mobs/dungeons/ama_dun.txt index 039afd13b..5d5af9259 100644 --- a/npc/re/mobs/dungeons/ama_dun.txt +++ b/npc/re/mobs/dungeons/ama_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/re/mobs/dungeons/anthell.txt b/npc/re/mobs/dungeons/anthell.txt index 9794f1e26..907c02e4f 100644 --- a/npc/re/mobs/dungeons/anthell.txt +++ b/npc/re/mobs/dungeons/anthell.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ant Hell Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/re/mobs/dungeons/ayo_dun.txt b/npc/re/mobs/dungeons/ayo_dun.txt index 2d82007f3..3f49111ca 100644 --- a/npc/re/mobs/dungeons/ayo_dun.txt +++ b/npc/re/mobs/dungeons/ayo_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Using euRO data [Ishizu] //= 1.2 Moved Tao Gunka to west cave of Comodo [Lupus] diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index cbadc8e5e..01704525f 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Beach Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Small 11.1 spawn update [Playtester] diff --git a/npc/re/mobs/dungeons/bra_dun.txt b/npc/re/mobs/dungeons/bra_dun.txt index 8e22c6e29..88cf0263e 100644 --- a/npc/re/mobs/dungeons/bra_dun.txt +++ b/npc/re/mobs/dungeons/bra_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Brasilis Dungeon Monster Spawn Script //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Official monster spawns in Brasilis Dungeon. //===== Additional Comments: ================================= diff --git a/npc/re/mobs/dungeons/c_tower.txt b/npc/re/mobs/dungeons/c_tower.txt index 752a2437a..16c0673cf 100644 --- a/npc/re/mobs/dungeons/c_tower.txt +++ b/npc/re/mobs/dungeons/c_tower.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Clock Tower Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Split from combined Alde and CT spawn file. [L0ne_W0lf] //============================================================ diff --git a/npc/re/mobs/fields/amatsu.txt b/npc/re/mobs/fields/amatsu.txt index 4368fc5a7..6c6761814 100644 --- a/npc/re/mobs/fields/amatsu.txt +++ b/npc/re/mobs/fields/amatsu.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus] //= 1.2 Official kRO 10.1 spawns [Playtester] diff --git a/npc/re/mobs/fields/ayothaya.txt b/npc/re/mobs/fields/ayothaya.txt index 896435a20..db26edb43 100644 --- a/npc/re/mobs/fields/ayothaya.txt +++ b/npc/re/mobs/fields/ayothaya.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Using EuRO data [Ishizu] //= 1.2 According the guide book, added a Choco [Lupus&VP] diff --git a/npc/re/mobs/fields/bifrost.txt b/npc/re/mobs/fields/bifrost.txt index e38f468f3..d060a61f2 100644 --- a/npc/re/mobs/fields/bifrost.txt +++ b/npc/re/mobs/fields/bifrost.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ======================================== //= Bifrost Field Monster Spawn Script //===== By: ================================================== //= Chilly //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Official kRO monster spawns //===== Additional Comments: ================================= diff --git a/npc/re/mobs/fields/brasilis.txt b/npc/re/mobs/fields/brasilis.txt index 923fa6ccc..ff882402d 100644 --- a/npc/re/mobs/fields/brasilis.txt +++ b/npc/re/mobs/fields/brasilis.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Fields Monster Spawn Script //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Official spawns from Aegis [Kisuka] //============================================================ diff --git a/npc/re/mobs/towns/brasilis.txt b/npc/re/mobs/towns/brasilis.txt index a8598a4b4..1714cc557 100644 --- a/npc/re/mobs/towns/brasilis.txt +++ b/npc/re/mobs/towns/brasilis.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Quest Monsters //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= 1.0 First version //============================================================ diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 4e5d95a4d..37de338a4 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [11 - 25] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 11 - 25. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index 267cc0994..6c318f99d 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [26 - 40] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 26 - 40. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index dfa5e2df5..71d302440 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [41 - 55] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 41 - 55. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index 79a6af3ec..88ae54604 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [56 - 70] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 56 - 70. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index e1f9b17a9..c36fb219d 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [71 - 85] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 71 - 85. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index eea07144c..5e3f26e13 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [86 - 90] //===== By: ================================================== //= Chilly //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 86 - 90. //===== Additional Comments: ================================= diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 2e7e7dd28..e834189a4 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Eden Group Quests - Mission [91 - 99] //===== By: ================================================== //= Chilly //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Repetable Quests for Players between Baselevel 91 - 99. //===== Additional Comments: ================================= diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt index 131b4d1ca..3518f348b 100644 --- a/npc/re/warps/cities/brasilis.txt +++ b/npc/re/warps/cities/brasilis.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Town Warps Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 13.1+ //===== Description: ========================================= //= [Aegis Conversion] //= Warp Points for Brasilis diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt index a151ed645..bbf164d06 100644 --- a/npc/re/warps/dungeons/bra_dun.txt +++ b/npc/re/warps/dungeons/bra_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Dungeon Warp //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Aegis Conversion] //= Brasilis Dungeon warp script diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index d6f6505e4..2d94c224e 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bifrost Field Warp Script //===== By: ================================================== //= Chilly //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Warp Points for Bifrost Field //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt index 1f0fe24ba..13a18eba7 100644 --- a/npc/re/warps/fields/bra_fild.txt +++ b/npc/re/warps/fields/bra_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Brasilis Fild Warps Script //===== By: ================================================== //= Protimus //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Aegis Conversion] //= Warp Points for Brasilis diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt index 66e3ce6eb..4523bbb72 100644 --- a/npc/warps/cities/alberta.txt +++ b/npc/warps/cities/alberta.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alberta Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Alberta, Treasure Island & Turtle Island //===== Additional Comments: ================================= diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index f1d6398af..0c047dfbf 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al de Baran Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Al de Baran //===== Additional Comments: ================================= diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 8614869d3..26ac52a7b 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Warps Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= [Aegis COnversion] //= Warp Points for Amatsu diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt index 2d24763e8..789314453 100644 --- a/npc/warps/cities/ayothaya.txt +++ b/npc/warps/cities/ayothaya.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Town Warps Script //===== By: ================================================== //= Muad_Dib, L0ne_W0lf (1.0) //===== Current Version: ===================================== //= 1.5a -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Ayothaya //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/abbey.txt b/npc/warps/dungeons/abbey.txt index 437290a7d..ac97ebeb8 100644 --- a/npc/warps/dungeons/abbey.txt +++ b/npc/warps/dungeons/abbey.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Abbey Dungeon Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Abbey Dungeon //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index b669a3226..75d48e5e8 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Abyss Lake Dungeon Warp Script //===== By: ================================================== //= Muad-Dib (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Abyss Lake Dungeon //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt index a51ccf413..cee943b20 100644 --- a/npc/warps/dungeons/alde_dun.txt +++ b/npc/warps/dungeons/alde_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al de Baran Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Al De Baran Dungeon //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt index a13422204..07cc1d173 100644 --- a/npc/warps/dungeons/ama_dun.txt +++ b/npc/warps/dungeons/ama_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Dungeon Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= [Aegis Conversion] //= Warp Points for Amatsu Dungeon diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index 10714a214..fe3435fd7 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ant Hell Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Ant Hell //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt index c1b013baf..28c08f73b 100644 --- a/npc/warps/dungeons/ayo_dun.txt +++ b/npc/warps/dungeons/ayo_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Ayothaya Dungeon Warp Script //===== By: ================================================== //= rAthena Team (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Ayothaya Dungeon //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt index 13ba8b428..199a5d391 100644 --- a/npc/warps/dungeons/beach_dun.txt +++ b/npc/warps/dungeons/beach_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Comodo Dungeon Warp //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Aegis Conversion] //= Comodo Beach Dungeon warp script diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt index e75f8e449..493fd1f9f 100644 --- a/npc/warps/dungeons/c_tower.txt +++ b/npc/warps/dungeons/c_tower.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Al de Baran Clock Tower Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Clock Tower //===== Additional Comments: ================================= diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index 8c4ea1e1c..284104155 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Abyss Cave Warper //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warper to Abyss Cave. and warper out //===== Additional Comments: ================================= diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt index 37e94c3b8..93c5eccf2 100644 --- a/npc/warps/fields/amatsu_fild.txt +++ b/npc/warps/fields/amatsu_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Amatsu Field Warp's //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Aegis COnversion] //= Warp Points for Amatsu Field diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt index 83afc6893..336268eb3 100644 --- a/npc/warps/other/airplane.txt +++ b/npc/warps/other/airplane.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Airports & Airplanes Warp Script //===== By: ================================================== //= Sara-chan (1.0), SSUNNY@YOUNG(1.6) //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for All Airplanes and Airports //===== Additional Comments: ================================= diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt index 28cfda019..2ecf6145f 100644 --- a/npc/warps/other/bossnia.txt +++ b/npc/warps/other/bossnia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bossnia Warps //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any rAthena Version //===== Description: ========================================= //= Back Warp Points related to the Bossnia event. //===== Additional Comments: ================================= diff --git a/src/char/char.c b/src/char/char.c index 83b58a0a7..d454e8bd0 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3991,6 +3991,35 @@ int parse_char(int fd) return 0; RFIFOSKIP(fd,6); break; + // char rename request + // R 08fc <char ID>.l <new name>.24B + case 0x8fc: + FIFOSD_CHECK(30); + { + int i, cid =RFIFOL(fd,2); + char name[NAME_LENGTH]; + char esc_name[NAME_LENGTH*2+1]; + safestrncpy(name, (char *)RFIFOP(fd,6), NAME_LENGTH); + RFIFOSKIP(fd,30); + + ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid ); + if( i == MAX_CHARS ) + break; + + normalize_name(name,TRIM_CHARS); + Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH)); + if( !check_char_name(name,esc_name) ) { + i = 1; + safestrncpy(sd->new_name, name, NAME_LENGTH); + } else + i = 0; + + WFIFOHEAD(fd, 4); + WFIFOW(fd,0) = 0x28e; + WFIFOW(fd,2) = i; + WFIFOSET(fd,4); + } + break; // char rename request // R 028d <account ID>.l <char ID>.l <new name>.24B diff --git a/src/common/core.c b/src/common/core.c index 1e3dbb3d7..b1714b7a5 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #include "../common/mmo.h" #include "../common/showmsg.h" @@ -11,6 +12,7 @@ #include "../common/timer.h" #include "../common/thread.h" #include "../common/mempool.h" +#include "../common/sql.h" #endif #include <stdio.h> @@ -319,6 +321,7 @@ int main (int argc, char **argv) display_title(); usercheck(); + Sql_Init(); rathread_init(); mempool_init(); db_init(); diff --git a/src/common/sql.c b/src/common/sql.c index 800aa89b0..d00b51694 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #include "../common/cbasetypes.h" #include "../common/malloc.h" @@ -15,7 +16,10 @@ #include <string.h>// strlen/strnlen/memcpy/memset #include <stdlib.h>// strtoul +void hercules_mysql_error_handler(unsigned int ecode); +int mysql_reconnect_type; +int mysql_reconnect_count; /// Sql handle struct Sql @@ -74,7 +78,7 @@ Sql* Sql_Malloc(void) self->lengths = NULL; self->result = NULL; self->keepalive = INVALID_TIMER; - + self->handle.reconnect = 1; return self; } @@ -266,12 +270,14 @@ int Sql_QueryV(Sql* self, const char* query, va_list args) if( mysql_real_query(&self->handle, StringBuf_Value(&self->buf), (unsigned long)StringBuf_Length(&self->buf)) ) { ShowSQL("DB error - %s\n", mysql_error(&self->handle)); + hercules_mysql_error_handler(mysql_errno(&self->handle)); return SQL_ERROR; } self->result = mysql_store_result(&self->handle); if( mysql_errno(&self->handle) != 0 ) { ShowSQL("DB error - %s\n", mysql_error(&self->handle)); + hercules_mysql_error_handler(mysql_errno(&self->handle)); return SQL_ERROR; } return SQL_SUCCESS; @@ -291,12 +297,14 @@ int Sql_QueryStr(Sql* self, const char* query) if( mysql_real_query(&self->handle, StringBuf_Value(&self->buf), (unsigned long)StringBuf_Length(&self->buf)) ) { ShowSQL("DB error - %s\n", mysql_error(&self->handle)); + hercules_mysql_error_handler(mysql_errno(&self->handle)); return SQL_ERROR; } self->result = mysql_store_result(&self->handle); if( mysql_errno(&self->handle) != 0 ) { ShowSQL("DB error - %s\n", mysql_error(&self->handle)); + hercules_mysql_error_handler(mysql_errno(&self->handle)); return SQL_ERROR; } return SQL_SUCCESS; @@ -639,6 +647,7 @@ int SqlStmt_PrepareV(SqlStmt* self, const char* query, va_list args) if( mysql_stmt_prepare(self->stmt, StringBuf_Value(&self->buf), (unsigned long)StringBuf_Length(&self->buf)) ) { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); + hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); return SQL_ERROR; } self->bind_params = false; @@ -660,6 +669,7 @@ int SqlStmt_PrepareStr(SqlStmt* self, const char* query) if( mysql_stmt_prepare(self->stmt, StringBuf_Value(&self->buf), (unsigned long)StringBuf_Length(&self->buf)) ) { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); + hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); return SQL_ERROR; } self->bind_params = false; @@ -721,12 +731,14 @@ int SqlStmt_Execute(SqlStmt* self) mysql_stmt_execute(self->stmt) ) { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); + hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); return SQL_ERROR; } self->bind_columns = false; if( mysql_stmt_store_result(self->stmt) )// store all the data { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); + hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); return SQL_ERROR; } @@ -868,6 +880,7 @@ int SqlStmt_NextRow(SqlStmt* self) if( err ) { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); + hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); return SQL_ERROR; } @@ -946,3 +959,63 @@ void SqlStmt_Free(SqlStmt* self) aFree(self); } } +/* receives mysql error codes during runtime (not on first-time-connects) */ +void hercules_mysql_error_handler(unsigned int ecode) { + static unsigned int retry = 1; + switch( ecode ) { + case 2003:/* Can't connect to MySQL (this error only happens here when failing to reconnect) */ + if( mysql_reconnect_type == 1 ) { + if( ++retry > mysql_reconnect_count ) { + ShowFatalError("MySQL has been unreachable for too long, %d reconnects were attempted. Shutting Down\n", retry); + exit(EXIT_FAILURE); + } + } + break; + } +} +void Sql_inter_server_read(const char* cfgName, bool first) { + int i; + char line[1024], w1[1024], w2[1024]; + FILE* fp; + + fp = fopen(cfgName, "r"); + if(fp == NULL) { + if( first ) { + ShowFatalError("File not found: %s\n", cfgName); + exit(EXIT_FAILURE); + } else + ShowError("File not found: %s\n", cfgName); + return; + } + + while(fgets(line, sizeof(line), fp)) { + i = sscanf(line, "%[^:]: %[^\r\n]", w1, w2); + if(i != 2) + continue; + + if(!strcmpi(w1,"mysql_reconnect_type")) { + mysql_reconnect_type = atoi(w2); + switch( mysql_reconnect_type ) { + case 1: + case 2: + break; + default: + ShowError("%s::mysql_reconnect_type is set to %d which is not valid, defaulting to 1...\n", cfgName, mysql_reconnect_type); + mysql_reconnect_type = 1; + break; + } + } else if(!strcmpi(w1,"mysql_reconnect_count")) { + mysql_reconnect_count = atoi(w2); + if( mysql_reconnect_count < 1 ) + mysql_reconnect_count = 1; + } else if(!strcmpi(w1,"import")) + Sql_inter_server_read(w2,false); + } + fclose(fp); + + return; +} + +void Sql_Init(void) { + Sql_inter_server_read("conf/inter-server.conf",true); +} diff --git a/src/common/sql.h b/src/common/sql.h index 898e2c778..5ac92665e 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #ifndef _COMMON_SQL_H_ #define _COMMON_SQL_H_ @@ -339,6 +340,7 @@ void SqlStmt_ShowDebug_(SqlStmt* self, const char* debug_file, const unsigned lo /// Frees a SqlStmt returned by SqlStmt_Malloc. void SqlStmt_Free(SqlStmt* self); +void Sql_Init(void); #endif /* _COMMON_SQL_H_ */ diff --git a/src/map/battle.c b/src/map/battle.c index 2198b25ec..4505b6a63 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -808,13 +808,12 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag * in RE, SW possesses a lifetime equal to 3 times the caster's health **/ #ifdef RENEWAL + d->dmg_lv = ATK_BLOCK; if ( ( group->val2 - damage) > 0 ) { group->val2 -= damage; - d->dmg_lv = ATK_BLOCK; - return 0; } else - damage -= group->val2; - skill_delunitgroup(group); + skill_delunitgroup(group); + return 0; #else if (--group->val2<=0) skill_delunitgroup(group); diff --git a/src/map/clif.c b/src/map/clif.c index f8b5119eb..e04941336 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9358,6 +9358,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) } map_iwall_get(sd); // Updates Walls Info on this Map to Client + status_calc_pc(sd, false);/* some conditions are map-dependent so we must recalculate */ sd->state.changemap = false; } @@ -11112,13 +11113,13 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) uint8 select = RFIFOB(fd,6); if( (select > sd->npc_menu && select != 0xff) || select == 0 ) { -#ifdef SECURE_NPCTIMEOUT +#if SECURE_NPCTIMEOUT if( sd->npc_idle_timer != INVALID_TIMER ) { #endif TBL_NPC* nd = map_id2nd(npc_id); ShowWarning("Invalid menu selection on npc %d:'%s' - got %d, valid range is [%d..%d] (player AID:%d, CID:%d, name:'%s')!\n", npc_id, (nd)?nd->name:"invalid npc id", select, 1, sd->npc_menu, sd->bl.id, sd->status.char_id, sd->status.name); clif_GM_kick(NULL,sd); -#ifdef SECURE_NPCTIMEOUT +#if SECURE_NPCTIMEOUT } #endif return; diff --git a/src/map/pc.c b/src/map/pc.c index abfbbcc12..49b905c0d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #include "../common/cbasetypes.h" #include "../common/core.h" // get_svn_revision() @@ -700,24 +701,24 @@ int pc_setequipindex(struct map_session_data *sd) return 0; } +//static int pc_isAllowedCardOn(struct map_session_data *sd,int s,int eqindex,int flag) +//{ +// int i; +// struct item *item = &sd->status.inventory[eqindex]; +// struct item_data *data; +// +// //Crafted/made/hatched items. +// if (itemdb_isspecial(item->card[0])) +// return 1; +// +// /* scan for enchant armor gems */ +// if( item->card[MAX_SLOTS - 1] && s < MAX_SLOTS - 1 ) +// s = MAX_SLOTS - 1; +// +// ARR_FIND( 0, s, i, item->card[i] && (data = itemdb_exists(item->card[i])) != NULL && data->flag.no_equip&flag ); +// return( i < s ) ? 0 : 1; +//} -static int pc_isAllowedCardOn(struct map_session_data *sd,int s,int eqindex,int flag) -{ - int i; - struct item *item = &sd->status.inventory[eqindex]; - struct item_data *data; - - //Crafted/made/hatched items. - if (itemdb_isspecial(item->card[0])) - return 1; - - /* scan for enchant armor gems */ - if( item->card[MAX_SLOTS - 1] && s < MAX_SLOTS - 1 ) - s = MAX_SLOTS - 1; - - ARR_FIND( 0, s, i, item->card[i] && (data = itemdb_exists(item->card[i])) != NULL && data->flag.no_equip&flag ); - return( i < s ) ? 0 : 1; -} bool pc_isequipped(struct map_session_data *sd, int nameid) { @@ -860,18 +861,18 @@ int pc_isequip(struct map_session_data *sd,int n) #endif if(item->sex != 2 && sd->status.sex != item->sex) return 0; - if(!map_flag_vs(sd->bl.m) && ((item->flag.no_equip&1) || !pc_isAllowedCardOn(sd,item->slot,n,1))) + if(!map_flag_vs(sd->bl.m) && ((item->flag.no_equip&1))) return 0; - if(map[sd->bl.m].flag.pvp && ((item->flag.no_equip&2) || !pc_isAllowedCardOn(sd,item->slot,n,2))) + if(map[sd->bl.m].flag.pvp && ((item->flag.no_equip&2))) return 0; - if(map_flag_gvg(sd->bl.m) && ((item->flag.no_equip&4) || !pc_isAllowedCardOn(sd,item->slot,n,4))) + if(map_flag_gvg(sd->bl.m) && ((item->flag.no_equip&4))) return 0; - if(map[sd->bl.m].flag.battleground && ((item->flag.no_equip&8) || !pc_isAllowedCardOn(sd,item->slot,n,8))) + if(map[sd->bl.m].flag.battleground && ((item->flag.no_equip&8))) return 0; if(map[sd->bl.m].flag.restricted) { int flag =8*map[sd->bl.m].zone; - if (item->flag.no_equip&flag || !pc_isAllowedCardOn(sd,item->slot,n,flag)) + if (item->flag.no_equip&flag) return 0; } @@ -8618,33 +8619,27 @@ int pc_checkitem(struct map_session_data *sd) if( sd->state.vending ) //Avoid reorganizing items when we are vending, as that leads to exploits (pointed out by End of Exam) return 0; - if( battle_config.item_check ) - {// check for invalid(ated) items - for( i = 0; i < MAX_INVENTORY; i++ ) - { + if( battle_config.item_check ) { // check for invalid(ated) items + for( i = 0; i < MAX_INVENTORY; i++ ) { id = sd->status.inventory[i].nameid; - if( id && !itemdb_available(id) ) - { + if( id && !itemdb_available(id) ) { ShowWarning("Removed invalid/disabled item id %d from inventory (amount=%d, char_id=%d).\n", id, sd->status.inventory[i].amount, sd->status.char_id); pc_delitem(sd, i, sd->status.inventory[i].amount, 0, 0, LOG_TYPE_OTHER); } } - for( i = 0; i < MAX_CART; i++ ) - { + for( i = 0; i < MAX_CART; i++ ) { id = sd->status.cart[i].nameid; - if( id && !itemdb_available(id) ) - { + if( id && !itemdb_available(id) ) { ShowWarning("Removed invalid/disabled item id %d from cart (amount=%d, char_id=%d).\n", id, sd->status.cart[i].amount, sd->status.char_id); pc_cart_delitem(sd, i, sd->status.cart[i].amount, 0, LOG_TYPE_OTHER); } } } - for( i = 0; i < MAX_INVENTORY; i++) - { + for( i = 0; i < MAX_INVENTORY; i++) { it = sd->inventory_data[i]; if( sd->status.inventory[i].nameid == 0 ) @@ -8653,31 +8648,27 @@ int pc_checkitem(struct map_session_data *sd) if( !sd->status.inventory[i].equip ) continue; - if( sd->status.inventory[i].equip&~pc_equippoint(sd,i) ) - { + if( sd->status.inventory[i].equip&~pc_equippoint(sd,i) ) { pc_unequipitem(sd, i, 2); calc_flag = 1; continue; } - if( it ) - { // check for forbiden items. + if( it ) { // check for forbiden items. int flag = (map[sd->bl.m].flag.restricted?(8*map[sd->bl.m].zone):0) | (!map_flag_vs(sd->bl.m)?1:0) | (map[sd->bl.m].flag.pvp?2:0) | (map_flag_gvg(sd->bl.m)?4:0) | (map[sd->bl.m].flag.battleground?8:0); - if( flag && (it->flag.no_equip&flag || !pc_isAllowedCardOn(sd,it->slot,i,flag)) ) - { + if( flag && (it->flag.no_equip&flag) ) { pc_unequipitem(sd, i, 2); calc_flag = 1; } } } - if( calc_flag && sd->state.active ) - { + if( calc_flag && sd->state.active ) { pc_checkallowskill(sd); status_calc_pc(sd,0); } diff --git a/src/map/skill.c b/src/map/skill.c index 448f54406..f806c4ec5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #include "../common/cbasetypes.h" #include "../common/timer.h" diff --git a/src/map/status.c b/src/map/status.c index 0379d05d2..8171f20ec 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena dev team #include "../common/cbasetypes.h" #include "../common/timer.h" |