diff options
32 files changed, 39 insertions, 39 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de011379a..0ae227aae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,7 +393,7 @@ endif() ##################################################################### # package stuff # -set( CPACK_PACKAGE_NAME "rAthena" ) +set( CPACK_PACKAGE_NAME "Hercules" ) set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "MMORPG server package" ) set( CPACK_PACKAGE_VERSION ${SVNVERSION} ) set( CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ) @@ -459,8 +459,8 @@ set( DEVELOPMENT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_SOURCE_DIR}/configure" "${CMAKE_CURRENT_SOURCE_DIR}/configure.in" - "${CMAKE_CURRENT_SOURCE_DIR}/rAthena-9.sln" - "${CMAKE_CURRENT_SOURCE_DIR}/rAthena-10.sln" + "${CMAKE_CURRENT_SOURCE_DIR}/Hercules-9.sln" + "${CMAKE_CURRENT_SOURCE_DIR}/Hercules-10.sln" ) set( DEVELOPMENT_DIRECTORIES "3rdparty" diff --git a/rAthena-10.sln b/Hercules-10.sln index ea8847037..ea8847037 100644 --- a/rAthena-10.sln +++ b/Hercules-10.sln diff --git a/rAthena-12.sln b/Hercules-12.sln index e38ab4cbd..e38ab4cbd 100644 --- a/rAthena-12.sln +++ b/Hercules-12.sln diff --git a/rAthena-9.sln b/Hercules-9.sln index 8ea06598a..8ea06598a 100644 --- a/rAthena-9.sln +++ b/Hercules-9.sln diff --git a/conf/battle.conf b/conf/battle.conf index fe03deb7e..1eddfae35 100644 --- a/conf/battle.conf +++ b/conf/battle.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker // Splitted up into multiple files by Skotlex. diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf index 87ad91597..94f80a2a6 100644 --- a/conf/battle/battle.conf +++ b/conf/battle/battle.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/battleground.conf b/conf/battle/battleground.conf index 98b2dd8db..cce6bd84e 100644 --- a/conf/battle/battleground.conf +++ b/conf/battle/battleground.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 0522e9425..eaf233a5d 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- @@ -105,8 +105,8 @@ summer_ignorepalette: no // Set this to 1 if your clients have langtype problems and can't display motd properly motd_type: 0 -// Show rAthena version to users when the login? -display_version: yes +// Show Hercules version to users when the login? +display_version: no // When affected with the "Hallucination" status effect, send the effect to client? (Note 1) // Note: Set to 'no' if the client lags due to the "Wavy" screen effect. diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf index 104f08467..3704b9a0e 100644 --- a/conf/battle/drops.conf +++ b/conf/battle/drops.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf index fbc7c2967..7c781d3a3 100644 --- a/conf/battle/exp.conf +++ b/conf/battle/exp.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf index fa05efd8b..7e1f83707 100644 --- a/conf/battle/feature.conf +++ b/conf/battle/feature.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Feature Configuration File +// Hercules Feature Configuration File //-------------------------------------------------------------- // Note 1: Value is a config switch (on/off, yes/no or 1/0) // Note 2: Value is in percents (100 means 100%) diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf index e02efa9a8..0120476be 100644 --- a/conf/battle/gm.conf +++ b/conf/battle/gm.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf index 234c73994..3285ccb75 100644 --- a/conf/battle/guild.conf +++ b/conf/battle/guild.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf index 6ebd43bec..fb34792ce 100644 --- a/conf/battle/homunc.conf +++ b/conf/battle/homunc.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/items.conf b/conf/battle/items.conf index 7c0ee1ad3..9bc2e37cc 100644 --- a/conf/battle/items.conf +++ b/conf/battle/items.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf index 0105e542b..274cdee23 100644 --- a/conf/battle/misc.conf +++ b/conf/battle/misc.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index fa9947ec5..51136fbe0 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/party.conf b/conf/battle/party.conf index 63fc3a94a..e57bc4fc9 100644 --- a/conf/battle/party.conf +++ b/conf/battle/party.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- @@ -15,7 +15,7 @@ party_update_interval: 1000 // Method used to update party-mate hp-bars: // 0: Aegis - bar is updated every time HP changes (bandwidth intensive) -// 1: rAthena - bar is updated with the party map dots (up to 1 second delay) +// 1: Hercules - bar is updated with the party map dots (up to 1 second delay) party_hp_mode: 0 // When 'Party Share' item sharing is enabled in a party, diff --git a/conf/battle/pet.conf b/conf/battle/pet.conf index de9056972..e80826ce8 100644 --- a/conf/battle/pet.conf +++ b/conf/battle/pet.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/player.conf b/conf/battle/player.conf index 32e3673f7..cacc66e4d 100644 --- a/conf/battle/player.conf +++ b/conf/battle/player.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf index 39e1b357a..9006247a2 100644 --- a/conf/battle/skill.conf +++ b/conf/battle/skill.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/battle/status.conf b/conf/battle/status.conf index 717db68bf..6efe973b7 100644 --- a/conf/battle/status.conf +++ b/conf/battle/status.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Battle Configuration File +// Hercules Battle Configuration File // Originally Translated by Peter Kieser <pfak@telus.net> // Made in to plainer English by Ancyker //-------------------------------------------------------------- diff --git a/conf/char-server.conf b/conf/char-server.conf index bd2e2793c..929bad5d0 100644 --- a/conf/char-server.conf +++ b/conf/char-server.conf @@ -1,4 +1,4 @@ -// Athena Character configuration file. +// Character Server configuration file. // Note: "Comments" are all text on the right side of a double slash "//" // Whatever text is commented will not be parsed by the servers, and serves @@ -12,7 +12,7 @@ passwd: p1 // NOTE: Do not use spaces or any of these characters which are not allowed in // Windows filenames \/:*?"<>| // ... or else guild emblems won't work client-side! -server_name: rAthena +server_name: Hercules // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters) wisp_server_name: Server diff --git a/conf/inter-server.conf b/conf/inter-server.conf index b116a6a88..70bf80e5c 100644 --- a/conf/inter-server.conf +++ b/conf/inter-server.conf @@ -1,4 +1,4 @@ -// Athena InterServer configuration. +// Hercules InterServer (settings shared/used by more than 1 server) configuration. // Options for both versions diff --git a/conf/login-server.conf b/conf/login-server.conf index b75f50bd2..3e5bdb3f9 100644 --- a/conf/login-server.conf +++ b/conf/login-server.conf @@ -1,4 +1,4 @@ -// Athena Login Server configuration file. +// Hercules Login Server configuration file. // Translated by Peter Kieser <pfak@telus.net> // Note: "Comments" are all text on the right side of a double slash "//" diff --git a/conf/logs.conf b/conf/logs.conf index bbe2f55c2..2aeb1b52e 100644 --- a/conf/logs.conf +++ b/conf/logs.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -// rAthena Log Configuration File +// Hercules Log Configuration File //-------------------------------------------------------------- // Note 1: Value is a config switch (on/off, yes/no or 1/0) // Note 2: Value is in percents (100 means 100%) diff --git a/conf/map-server.conf b/conf/map-server.conf index e9c208e5b..0fc34d8b9 100644 --- a/conf/map-server.conf +++ b/conf/map-server.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------------- -//rAthena Map-Server Configuration File +//Hercules Map-Server Configuration File //-------------------------------------------------------------- // Note: "Comments" are all text on the right side of a double slash "//" diff --git a/conf/messages.conf b/conf/messages.conf index 7c3a8b8a4..a554c116d 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1,4 +1,4 @@ -// rAthena msg_athena.conf +// Hercules msg_athena.conf // Message Configuration // For translation, just change msg here (second line), no need to modify source code, // or alternatively, use conf/import/msg_conf.txt @@ -1242,8 +1242,8 @@ 1294: They are family... wish them luck. // @version -1295: rAthena Version SVN r%s -1296: Cannot determine SVN revision. +1295: Hercules Git Hash r%s +1296: Cannot determine Git Hash. // @mutearea 1297: Please enter a time in minutes (usage: @mutearea/@stfu <time in minutes>). diff --git a/conf/motd.txt b/conf/motd.txt index 28194cc3e..445fac937 100644 --- a/conf/motd.txt +++ b/conf/motd.txt @@ -1,2 +1,2 @@ // Internal default is limited to 128 lines. If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c -Welcome to rAthena SVN! Enjoy! Please report any bugs you find. +Welcome to Hercules! Enjoy! Please report any bugs you find. diff --git a/conf/packet.conf b/conf/packet.conf index 0741ac013..3528d73bb 100644 --- a/conf/packet.conf +++ b/conf/packet.conf @@ -1,4 +1,4 @@ -// Athena sockets Configuration file +// Hercules Sockets Configuration file // translated (davidsiaw) diff --git a/conf/readme.txt b/conf/readme.txt index 03d93117a..24b113983 100644 --- a/conf/readme.txt +++ b/conf/readme.txt @@ -3,18 +3,18 @@ What is the import folder for? The folder provides a way for you to change your config settings without having to update the files every time you update your server. You store your changes, -and the rest is updated with rAthena (usually though SVN). +and the rest is updated with Hercules (usually though GIT). How does this work? ------------------------------------------------------------------------------- Place only the settings you have changed in the import files. -For example, if you want to change a value in /battle/exp.conf: +For example, if you want to change a value in conf/battle/exp.conf: // Rate at which exp. is given. (Note 2) base_exp_rate: 700 -You could instead copy the setting into /import/battle_conf.txt, +You could instead copy the setting into conf/import/battle_conf.txt, and you'll eliminate any problems updating in the future. Neat, isn't it? diff --git a/conf/script.conf b/conf/script.conf index 309f8ee41..57442e87f 100644 --- a/conf/script.conf +++ b/conf/script.conf @@ -1,5 +1,5 @@ //-------------------------------------------------------- -// rAthena Script Configuration File +// Hercules Script Configuration File //-------------------------------------------------------- |