diff options
Diffstat (limited to 'conf')
63 files changed, 601 insertions, 393 deletions
diff --git a/conf/atcommand.conf b/conf/atcommand.conf index 5a0a5b289..6e35d5327 100644 --- a/conf/atcommand.conf +++ b/conf/atcommand.conf @@ -56,6 +56,14 @@ aliases: { guildstorage: ["gstorage"] accinfo: ["accountinfo"] itemreset: ["clearinventory"] + channel: ["main"] +} + +/* list of commands that should not be logged at all */ +/* add as many commands as you like */ +nolog: { + iteminfo: 1 + mobinfo: 1 } /* Commands help file */ 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..b4c0b2fbd 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 //-------------------------------------------------------------- @@ -9,21 +9,6 @@ // assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun) //-------------------------------------------------------------- -// Melee damage adjustments (non skills) for Battleground maps (Note 2) -bg_short_attack_damage_rate: 80 - -// Ranged damage adjustments (non skills) for Battleground maps (Note 2) -bg_long_attack_damage_rate: 80 - -// Weapon skills damage adjustments for Battleground maps (Note 2) -bg_weapon_attack_damage_rate: 60 - -// Magic skills damage adjustments for Battleground maps (Note 2) -bg_magic_attack_damage_rate: 60 - -// Misc skills damage adjustments for Battleground maps (Note 2) -bg_misc_attack_damage_rate: 60 - // Flee penalty on BG grounds. // NOTE: It's %, not absolute, so 20 is -20% of your total flee bg_flee_penalty: 20 diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 0522e9425..086932d4b 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 //-------------------------------------------------------------- @@ -9,29 +9,6 @@ // assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary) //-------------------------------------------------------------- -// Set here which client version do you accept. Add all values of clients: -// Clients older than accepted versions, and versions not set to 'accepted' -// here will be rejected when logging in -// 0x00001: Clients older than 2004-09-06aSakray (packet versions 5-9) -// 0x00002: 2004-09-06aSakexe (version 10) -// 0x00004: 2004-09-20aSakexe (version 11) -// 0x00008: 2004-10-05aSakexe (version 12) -// 0x00010: 2004-10-25aSakexe (version 13) -// 0x00020: 2004-11-29aSakexe (version 14) -// 0x00040: 2005-01-10bSakexe (version 15) -// 0x00080: 2005-05-09aSakexe (version 16) -// 0x00100: 2005-06-28aSakexe (version 17) -// 0x00200: 2005-07-18aSakexe (version 18) -// 0x00400: 2005-07-19bSakexe (version 19) -// 0x00800: 2006-03-27aSakexe (version 20) -// 0x01000: 2007-01-08aSakexe (version 21) -// 0x02000: 2007-02-12aSakexe (version 22) -// 0x04000: 2008-09-10aSakexe (version 23) -// 0x08000: 2008-08-27aRagexeRE (version 24) -// 0x10000: 2008-09-10aRagexeRE (version 25) -// default value: 0xFFFFFF (all clients) -packet_ver_flag: 0xFFFFFF - // Minimum delay between whisper/global/party/guild messages (in ms) // Messages that break this threshold are silently omitted. min_chat_delay: 0 @@ -61,6 +38,10 @@ pet_hair_style: 100 // Visible area size (how many squares away from a player can they see) area_size: 14 +// Maximum walk path (how many cells a player can walk going to cursor) +// default: 17(official) +max_walk_path: 17 + // Maximum allowed 'level' value that can be sent in unit packets. // Use together with the aura_lv setting to tell when exactly to show the aura. // NOTE: You also need to adjust the client if you want this to work. @@ -88,25 +69,29 @@ wedding_modifydisplay: no // Save Clothes color. (This will degrade performance) (Note 1) save_clothcolor: yes -// Do not display cloth colors for the wedding class? +// Do not display cloth colors for the wedding costume? // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled // for this option to take effect. Set this to yes if your cloth palettes // pack doesn't has wedding palettes (or has less than the other jobs) wedding_ignorepalette: no -// Do not display cloth colors for the Xmas class? +// Do not display cloth colors for the Xmas costume? // Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs) xmas_ignorepalette: no -// Do not display cloth colors for the Summer class? +// Do not display cloth colors for the Summer costume? // Set this to yes if your cloth palettes pack doesn't has Summer palettes (or has less than the other jobs) summer_ignorepalette: no +// Do not display cloth colors for the Hanbok costume? +// Set this to yes if your cloth palettes pack doesn't has Hanbok palettes (or has less than the other jobs) +hanbok_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..7370da6c5 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 //-------------------------------------------------------------- @@ -29,4 +29,9 @@ ban_hack_trade: 5 // requires RENEWAL_DROP to be enabled (src/map/config/renewal.h) // modifies @mobinfo to display the users' real drop rate as per renewal_drop formula // modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level) -atcommand_mobinfo_type: 0
\ No newline at end of file +atcommand_mobinfo_type: 0 + +// Ignore warpable area configuration. +// Set the minimum group id to ignore invalid cells when warping. +// Default group is 2. Use 100 to disable this setting. +gm_ignore_warpable_area: 2 diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf index 234c73994..cc22c327f 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 //-------------------------------------------------------------- @@ -23,21 +23,6 @@ guild_skill_relog_delay: yes // Damage adjustments for WOE battles against defending Guild monsters (Note 2) castle_defense_rate: 100 -// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2) -gvg_short_attack_damage_rate: 80 - -// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2) -gvg_long_attack_damage_rate: 80 - -// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2) -gvg_weapon_attack_damage_rate: 60 - -// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2) -gvg_magic_attack_damage_rate: 60 - -// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2) -gvg_misc_attack_damage_rate: 60 - // Flee penalty on gvg grounds. Official value is 20 (Note 2) // NOTE: It's %, not absolute, so 20 is -20% of your total flee gvg_flee_penalty: 20 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..05aadfecd 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 //-------------------------------------------------------------- @@ -75,3 +75,14 @@ gtb_sc_immunity: 50 // NOTE: Different cards that grant the same skill will both // always work independently of each other regardless of setting. autospell_stacking: no + +// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them? +// 1 (official): yes +// 0: no +item_restricted_consumption_type:1 + +// Enable all NPC to allow changing of equipments while interacting? (Note 1) +// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt) +// 1 : yes(official) +// 0 : no +item_enabled_npc:1
\ No newline at end of file diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf index 0105e542b..32b9c511e 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 //-------------------------------------------------------------- @@ -35,14 +35,6 @@ pk_min_level: 55 // players to let them attack each other. 0 disables said limit. pk_level_range: 0 -// For PK servers. Damage adjustment settings, these follow the same logic -// as their WoE counterparts (see guild.conf) -pk_short_attack_damage_rate: 80 -pk_long_attack_damage_rate: 70 -pk_weapon_attack_damage_rate: 60 -pk_magic_attack_damage_rate: 60 -pk_misc_attack_damage_rate: 60 - // Display skill usage in console? (for debug only) (default: off) (Note 3) skill_log: off 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..f493f6b67 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 //-------------------------------------------------------------- @@ -46,7 +46,8 @@ basic_skill_check: yes // When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds) // That is, when you go to a map and don't move, how long before the monsters will notice you. -// If you attack a monster, it will attack you back regaurdless of this setting. (I think) +// When moving, attacking or doing similar actions, the effect ends instantly. +// Value is also affected by 'invincible_time_inc' mapflag player_invincible_time: 5000 // The time interval for HP to restore naturally. (in milliseconds) @@ -139,6 +140,6 @@ character_size: 0 // items from Autoloot (0: disabled). idle_no_autoloot: 0 -// Minimum distance a vending must be from a NPC in order to be placed +// Minimum distance a vending/chat room must be from a NPC in order to be placed // Default: 3 (0: disabled). -min_npc_vending_distance: 3
\ No newline at end of file +min_npc_vendchat_distance: 3
\ No newline at end of file diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf index 39e1b357a..df419b262 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 //-------------------------------------------------------------- @@ -234,10 +234,6 @@ emergency_call: 11 //16: Disable skill from affecting Guild Master guild_aura: 31 -// Max Possible Level of Monster skills -// Note: If your MVPs are too tough, reduce it to 10. -mob_max_skilllvl: 100 - // Allows players to skip menu when casting Teleport level 1 // Menu contains two options. "Random" and "Cancel" skip_teleport_lv1_menu: no @@ -275,3 +271,12 @@ invincible.nodamage: no // On official server, a fix is in place that prevents the switching of weapons to cancel songs. // Default: yes dancing_weaponswitch_fix: yes + +// Skill Trap Type (GvG) +// 0: (official) Traps in GvG only make player stop moving after its walk path is complete, and it activates other traps on the way. +// 1: Traps in GvG make player stop moving right when stepping over it. +skill_trap_type: 0 + +// Max Possible Level of Monster skills +// Note: If your MVPs are too tough, reduce it to 10. +mob_max_skilllvl: 100
\ No newline at end of file diff --git a/conf/battle/status.conf b/conf/battle/status.conf index 717db68bf..5341b606b 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 //-------------------------------------------------------------- @@ -27,14 +27,6 @@ debuff_on_logout: 3 pc_status_def_rate: 100 mob_status_def_rate: 100 -// Required luk to gain inmunity to status changes. -// Luk increases resistance by closing the gap between natural resist and max -// linearly. This setting indicates required luk to gain complete immunity. -// Eg: 40 vit -> 40% resist. 150 luk -> +50% of the missing gap. -// So 40% + (50% of 60%) = 70% -pc_luk_status_def: 300 -mob_luk_status_def: 300 - // Maximum resistance to status changes. (100 = 100%) // NOTE: Cards and equipment can go over this limit, so it only applies to natural resist. pc_max_status_def: 100 diff --git a/conf/channels.conf b/conf/channels.conf new file mode 100644 index 000000000..3584fc2ea --- /dev/null +++ b/conf/channels.conf @@ -0,0 +1,59 @@ +//==================================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//= +//= http://hercules.ws/board/ +//==================================================== +//= http://hercules.ws/board/topic/316-introducing-hercules-channel-system/ +chsys: ( +{ + /* default channels (available on boot) */ + default_channels: { + /* channel_name : channel_messages_color */ + main: "Orange" /* available as #main */ + support: "Blue" /* available as #support */ + trade: "Red" /* available as #trade */ + offtopic: "Cyan" /* available as #offtopic */ + /* as many channels as you like */ + } + /* colors available */ + colors: { + Default: "0xffffff" /* custom channels will use the first in the list unless a font is selected thru @channel */ + Red: "0xff0000" + Blue: "0x83cfe9" + Orange: "0xe57c00" + Cyan: "0x00b89d" + Yellow: "0xffff90" + Green: "0x28bf00" + Light_Green: "0x3dff98" + Normal: "0x00ff00" + /* as many colors as you like */ + } + /* allow users to create their own (private) channels through @channels command? */ + /* (must also allow players to use @channels in groups.conf) */ + allow_user_channel_creation: true + /* "map_local_channel" is a instanced channel unique to each map */ + map_local_channel: true + map_local_channel_name: "map" /* available as #map */ + map_local_channel_color: "Yellow" + map_local_channel_autojoin: true /* can disable autojoin in specific maps through a mapflag or zone */ + /* "ally_channel" is a channel shared by all your guild allies */ + ally_channel_enabled: true + ally_channel_name: "ally" /* available as #ally */ + ally_channel_color: "Green" + ally_channel_autojoin: true /* will members autojoin to their respective #ally chats when they log-in? */ + /* "irc_channel" is a special channel connected to a specific chat room in any irc network */ + irc_channel_enabled: false + irc_channel_name: "irc" /* available as #irc */ + irc_channel_color: "Light_Green" + irc_channel_network: "irc.rizon.net:6665" /* network to connect to (:and port) */ + irc_channel_channel: "#Hercules" /* channel in the network above to join */ + irc_channel_nick: "Hercules_chSysBot" /* nick the bot will use */ + irc_channel_nick_pw: "" /* password to this nick (if any) to identify to nick server on the irc network */ +} +) + diff --git a/conf/char-server.conf b/conf/char-server.conf index bd2e2793c..b2120471c 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 @@ -61,11 +61,6 @@ stdout_with_ansisequence: no //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4) console_silent: 0 -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Type of server. // No functional side effects at the moment. // Displayed next to the server name in the client. @@ -79,8 +74,9 @@ char_new: 1 // Display (New) in the server list. char_new_display: 0 -// Maximum users able to connect to the server. Set to 0 for unlimited. -max_connect_user: 0 +// Maximum users able to connect to the server. +// Set to 0 to disable users to log-in. (-1 means unlimited) +max_connect_user: -1 // Group ID that is allowed to bypass the server limit of users. // Default: -1 = nobody (there are no groups with ID < 0) @@ -98,11 +94,9 @@ save_log: yes // Start point, Map name followed by coordinates (x,y) start_point: new_1-1,53,111 -// Starting weapon for new characters -start_weapon: 1201 - -// Starting armor for new characters -start_armor: 2301 +// Starting items for new characters +// Format is: id1,qt1,idn,qtn +start_items: 1201,1,2301,1 // Starting zeny for new characters start_zeny: 0 @@ -138,11 +132,6 @@ char_name_option: 1 // Note: Don't add spaces unless you mean to add 'space' to the list. char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 -// How many Characters are allowed per Account ? (0 = disabled) -// You can not exceed the limit of MAX_CHARS slots, defined in mmo.h -// Doing that, chars_per_account will be default to MAX_CHARS. -chars_per_account: 0 - // Restrict character deletion by BaseLevel // 0: no restriction (players can delete characters of any level) // -X: you can't delete chars with BaseLevel <= X @@ -158,4 +147,30 @@ char_del_delay: 86400 // What folder the DB files are in (item_db.txt, etc.) db_path: db +//================================================================== +// Pincode system -- INCOMPLETE / BROKEN +//================================================================== + +// A window is opened before you can select your character and you will have to enter a pincode by using only your mouse +// NOTE: Requires client 2011-03-09aragexeRE or newer. +// 0: disabled +// 1: enabled +pincode_enabled: 1 + +// Request Pincode only on login or on everytime char select is accessed? +// 0: only on login (default) +// 1: everytime the char select window is accessed +pincode_charselect: 0 + +// How often does a user have to change his pincode? +// Default: 0 +// 0: never +// X: every X minutes +pincode_changetime: 0 + +// How often can a user enter the wrong password? +// Default: 3 +// NOTE: The maximum on clientside is 3 +pincode_maxtry: 3 + import: conf/import/char_conf.txt diff --git a/conf/groups.conf b/conf/groups.conf index a243716e6..7c97352dc 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -41,7 +41,7 @@ Command names must not be aliases. <log_commands> Boolean value. If true then all commands used by the group will be logged to atcommandlog. If setting is omitted in a group definition, false is assumed. -Requires 'log_commands' to be enabled in 'conf/log_athena.conf'. +Requires 'log_commands' to be enabled in 'conf/logs.conf'. <permissions> A group of settings @@ -72,11 +72,6 @@ Syntax ------ This config file uses libconfig syntax: http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files - - -Upgrading from revisions before r15572 -------------------------------------- -http://rathena.org/board/index.php?showtopic=58877 */ groups: ( @@ -123,13 +118,13 @@ groups: ( refresh: true noask: true noks: true - main: true autoloot: true alootid: true autotrade: true request: true go: true breakguild: true + channel: true } permissions: { } @@ -272,6 +267,7 @@ groups: ( use_check: true use_changemaptype: true all_commands: true + hchsys_admin: true } } ) diff --git a/conf/help.txt b/conf/help.txt index 105371e9f..6f202091e 100644 --- a/conf/help.txt +++ b/conf/help.txt @@ -6,7 +6,6 @@ // This file uses libconfig syntax. help: "Params: <command>\n" "Shows help for specified command." -main: "Params: [on|off|<message>]\n" "Turns on or off main (server-wide) chat. Sends message to main chat." noask: "Auto rejects deals/invites." gmotd: "Broadcasts the Message of The Day to all players." me: "Params: <message>\n" "Displays normal text as a message in this format: *name message* (like /me in mIRC)." diff --git a/conf/inter-server.conf b/conf/inter-server.conf index b116a6a88..bf8d9e7a3 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 @@ -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] @@ -107,8 +119,4 @@ mapreg_db: mapreg //Use SQL item_db, mob_db and mob_skill_db for the map server use_sql_db: no -// Nick for sending mainchat -// messages like whisper -main_chat_nick: Main - import: conf/import/inter_conf.txt diff --git a/conf/login-server.conf b/conf/login-server.conf index b75f50bd2..8f2fa1bf1 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 "//" @@ -35,11 +35,6 @@ stdout_with_ansisequence: no //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4) console_silent: 0 -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Can you use _M/_F to make new accounts on the server? new_account: yes 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..cac5421e6 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 "//" @@ -76,11 +76,6 @@ enable_spy: no // as referenced by grf-files.txt rather than from the mapcache? use_grf: no -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Database autosave time // All characters are saved on this time in seconds (example: // autosave of 60 secs with 60 characters online -> one char is saved every @@ -94,18 +89,19 @@ minsave_time: 100 // Apart from the autosave_time, players will also get saved when involved // in the following (add as needed): -// 1: after every successful trade -// 2: after every vending transaction -// 4: after closing storage/guild storage. +// 1: After every successful trade +// 2: After every vending transaction +// 4: After closing storage/guild storage. // 8: After hatching/returning to egg a pet. // 16: After successfully sending a mail with attachment // 32: After successfully submitting an item for auction // 64: After successfully get/delete/complete a quest +// 128: After every buying store transaction // NOTE: These settings decrease the chance of dupes/lost items when there's a // server crash at the expense of increasing the map/char server lag. If your // server rarely crashes, but experiences interserver lag, you may want to set // these off. -save_settings: 127 +save_settings: 255 // Message of the day file, when a character logs on, this message is displayed. motd_txt: conf/motd.txt 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..0c96bf896 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), @@ -201,13 +199,13 @@ force_1-2 mapflag nobranch force_1-3 mapflag nobranch ordeal_1-1 mapflag nobranch ordeal_1-2 mapflag nobranch -ordeal_1-3 mapflag nobranch +//ordeal_1-3 mapflag nobranch ordeal_2-1 mapflag nobranch ordeal_2-2 mapflag nobranch -ordeal_2-3 mapflag nobranch +//ordeal_2-3 mapflag nobranch ordeal_3-1 mapflag nobranch ordeal_3-2 mapflag nobranch -ordeal_3-3 mapflag nobranch +//ordeal_3-3 mapflag nobranch pvp_2vs2 mapflag nobranch pvp_c_room mapflag nobranch quiz_00 mapflag nobranch 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..f6628bf46 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. @@ -496,13 +494,13 @@ force_4-1 mapflag nomemo force_5-1 mapflag nomemo ordeal_1-1 mapflag nomemo ordeal_1-2 mapflag nomemo -ordeal_1-3 mapflag nomemo +//ordeal_1-3 mapflag nomemo ordeal_2-1 mapflag nomemo ordeal_2-2 mapflag nomemo -ordeal_2-3 mapflag nomemo +//ordeal_2-3 mapflag nomemo ordeal_3-1 mapflag nomemo ordeal_3-2 mapflag nomemo -ordeal_3-3 mapflag nomemo +//ordeal_3-3 mapflag nomemo pvp_c_room mapflag nomemo quiz_00 mapflag nomemo quiz_01 mapflag nomemo 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 deleted file mode 100644 index f4bd6d175..000000000 --- a/conf/mapflag/restricted.txt +++ /dev/null @@ -1,128 +0,0 @@ -//===== rAthena 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. -//===== Additional Comments: ================================= -//= 1.1 - Added WoE:SE Map restrictions. [L0ne_W0lf] -//= 1.2 - Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf] -//= 1.3 - Added Orc's Memory, Nidhoggur's Nest and towns restrictions. [Daegaladh] -//============================================================ - -//Aldebaran Turbo Track -alde_tt02 mapflag restricted 1 -turbo_n_1 mapflag restricted 1 -turbo_n_4 mapflag restricted 1 -turbo_n_8 mapflag restricted 1 -turbo_n_16 mapflag restricted 1 -turbo_e_4 mapflag restricted 1 -turbo_e_8 mapflag restricted 1 -turbo_e_16 mapflag restricted 1 - -//Jail -sec_pri mapflag restricted 2 - -//Izlude Battle Arena -force_1-1 mapflag restricted 3 -force_2-1 mapflag restricted 3 -force_3-1 mapflag restricted 3 -force_4-1 mapflag restricted 3 -force_5-1 mapflag restricted 3 -force_1-2 mapflag restricted 3 -force_1-3 mapflag restricted 3 -prt_are_in mapflag restricted 3 - -//WoE:SE Maps -schg_cas01 mapflag restricted 4 -schg_cas02 mapflag restricted 4 -schg_cas03 mapflag restricted 4 -schg_cas04 mapflag restricted 4 -schg_cas05 mapflag restricted 4 -arug_cas01 mapflag restricted 4 -arug_cas02 mapflag restricted 4 -arug_cas03 mapflag restricted 4 -arug_cas04 mapflag restricted 4 -arug_cas05 mapflag restricted 4 - -//Sealed Shrine ================== -1@cata mapflag restricted 5 -2@cata mapflag restricted 5 - -//Endless Tower ================== -1@tower mapflag restricted 6 -2@tower mapflag restricted 6 -3@tower mapflag restricted 6 -4@tower mapflag restricted 6 -5@tower mapflag restricted 6 -6@tower mapflag restricted 6 - -//Orc's Memory =================== -1@orcs mapflag restricted 6 -2@orcs mapflag restricted 6 - -// Nidhoggr's Instance =========== -1@nyd mapflag restricted 6 -2@nyd mapflag restricted 6 - -// Misty Forest Labyrinth =========== -1@mist mapflag restricted 6 - -// Octopus Cave =========== -1@cash mapflag restricted 6 - -// Drain =========== -1@pump mapflag restricted 6 -2@pump mapflag restricted 6 - -// Somatology Laboratory =========== -1@lhz mapflag restricted 6 - -// Bangungot Hospital F2 =========== -1@ma_h mapflag restricted 6 - -// Buwaya Cave =========== -1@ma_c mapflag restricted 6 - -// Bakonawa Hideout =========== -1@ma_b mapflag restricted 6 - -// Inside Eclage =========== -1@ecl mapflag restricted 6 - -//Towns -alberta mapflag restricted 7 -aldebaran mapflag restricted 7 -amatsu mapflag restricted 7 -ayothaya mapflag restricted 7 -brasilis mapflag restricted 7 -comodo mapflag restricted 7 -einbroch mapflag restricted 7 -einbech mapflag restricted 7 -geffen mapflag restricted 7 -gonryun mapflag restricted 7 -izlude mapflag restricted 7 -jawaii mapflag restricted 7 -hugel mapflag restricted 7 -lighthalzen mapflag restricted 7 -louyang mapflag restricted 7 -manuk mapflag restricted 7 -mid_camp mapflag restricted 7 -moc_ruins mapflag restricted 7 -morocc mapflag restricted 7 -moscovia mapflag restricted 7 -niflheim mapflag restricted 7 -prontera mapflag restricted 7 -payon mapflag restricted 7 -pay_arche mapflag restricted 7 -rachel mapflag restricted 7 -splendide mapflag restricted 7 -umbala mapflag restricted 7 -veins mapflag restricted 7 -xmas mapflag restricted 7 -yuno mapflag restricted 7 diff --git a/conf/mapflag/skillduration.txt b/conf/mapflag/skillduration.txt new file mode 100644 index 000000000..ca2f82a40 --- /dev/null +++ b/conf/mapflag/skillduration.txt @@ -0,0 +1,22 @@ +//===== Hercules Script ====================================== +//= Mapflag: Adjust Skill Duration. +//===== By: ================================================== +//= Hercules Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= This mapflag allows you to control the duration of unit +//= skills in any map. +//= Example (1): +//= prontera mapflag adjust_unit_duration PR_SANCTUARY 50 +//= Halves the duration of Sanctuary in Prontera. +//= +//= Example (2): +//= prontera mapflag adjust_unit_duration WZ_QUAGMIRE 250 +//= Increases duration of Quagmire by 2.5 times in Prontera. +//===== Disclaimer: ========================================== +//= Be aware that some skill units have their visual effect +//= durations not controlled by the server (e.g. Storm Gust). +//===== Additional Comments: ================================= +//= 1.0 - Initial script. +//============================================================
\ No newline at end of file diff --git a/conf/mapflag/skillmodifier.txt b/conf/mapflag/skillmodifier.txt new file mode 100644 index 000000000..bd60806f7 --- /dev/null +++ b/conf/mapflag/skillmodifier.txt @@ -0,0 +1,19 @@ +//===== Hercules Script ====================================== +//= Mapflag: Adjust Skill Damage. +//===== By: ================================================== +//= Hercules Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= This mapflag allows you to modify the damage of any skill +//= in any map. +//= Example (1): +//= prontera mapflag adjust_skill_damage MG_FIREBOLT 50 +//= Halves the damage of Firebolt in Prontera. +//= +//= Example (2): +//= prontera mapflag adjust_skill_damage MG_FIREBOLT 200 +//= Doubles the damage of Firebolt in Prontera. +//===== Additional Comments: ================================= +//= 1.0 - Initial script. +//============================================================
\ No newline at end of file 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/conf/mapflag/zone.txt b/conf/mapflag/zone.txt new file mode 100644 index 000000000..62047effa --- /dev/null +++ b/conf/mapflag/zone.txt @@ -0,0 +1,110 @@ +//===== Hercules============================================== +//= Mapflag: Zone. +//===== By: ================================================== +//= Ind/Hercules +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Flags maps as part of zones defined in map_zone_db.txt +//===== Additional Comments: ================================= +//============================================================ + +//Aldebaran Turbo Track +alde_tt02 mapflag zone Aldebaran Turbo Track +turbo_n_1 mapflag zone Aldebaran Turbo Track +turbo_n_4 mapflag zone Aldebaran Turbo Track +turbo_n_8 mapflag zone Aldebaran Turbo Track +turbo_n_16 mapflag zone Aldebaran Turbo Track +turbo_e_4 mapflag zone Aldebaran Turbo Track +turbo_e_8 mapflag zone Aldebaran Turbo Track +turbo_e_16 mapflag zone Aldebaran Turbo Track + +//Jail +sec_pri mapflag zone Jail + +//Izlude Battle Arena +force_1-1 mapflag zone Izlude Battle Arena +force_2-1 mapflag zone Izlude Battle Arena +force_3-1 mapflag zone Izlude Battle Arena +force_4-1 mapflag zone Izlude Battle Arena +force_5-1 mapflag zone Izlude Battle Arena +force_1-2 mapflag zone Izlude Battle Arena +force_1-3 mapflag zone Izlude Battle Arena +prt_are_in mapflag zone Izlude Battle Arena + +//Sealed Shrine ================== +1@cata mapflag zone Sealed Shrine +2@cata mapflag zone Sealed Shrine + +//Endless Tower ================== +1@tower mapflag zone Memorial Dungeon +2@tower mapflag zone Memorial Dungeon +3@tower mapflag zone Memorial Dungeon +4@tower mapflag zone Memorial Dungeon +5@tower mapflag zone Memorial Dungeon +6@tower mapflag zone Memorial Dungeon + +//Orc's Memory =================== +1@orcs mapflag zone Memorial Dungeon +2@orcs mapflag zone Memorial Dungeon + +// Nidhoggr's Instance =========== +1@nyd mapflag zone Memorial Dungeon +2@nyd mapflag zone Memorial Dungeon + +// Misty Forest Labyrinth =========== +1@mist mapflag zone Memorial Dungeon + +// Octopus Cave =========== +1@cash mapflag zone Memorial Dungeon + +// Drain =========== +1@pump mapflag zone Memorial Dungeon +2@pump mapflag zone Memorial Dungeon + +// Somatology Laboratory =========== +1@lhz mapflag zone Memorial Dungeon + +// Bangungot Hospital F2 =========== +1@ma_h mapflag zone Memorial Dungeon + +// Buwaya Cave =========== +1@ma_c mapflag zone Memorial Dungeon + +// Bakonawa Hideout =========== +1@ma_b mapflag zone Memorial Dungeon + +// Inside Eclage =========== +1@ecl mapflag zone Memorial Dungeon + +//Towns +alberta mapflag zone Towns +aldebaran mapflag zone Towns +amatsu mapflag zone Towns +ayothaya mapflag zone Towns +brasilis mapflag zone Towns +comodo mapflag zone Towns +einbroch mapflag zone Towns +einbech mapflag zone Towns +geffen mapflag zone Towns +gonryun mapflag zone Towns +izlude mapflag zone Towns +jawaii mapflag zone Towns +hugel mapflag zone Towns +lighthalzen mapflag zone Towns +louyang mapflag zone Towns +manuk mapflag zone Towns +mid_camp mapflag zone Towns +moc_ruins mapflag zone Towns +morocc mapflag zone Towns +moscovia mapflag zone Towns +niflheim mapflag zone Towns +prontera mapflag zone Towns +payon mapflag zone Towns +pay_arche mapflag zone Towns +rachel mapflag zone Towns +splendide mapflag zone Towns +umbala mapflag zone Towns +veins mapflag zone Towns +xmas mapflag zone Towns +yuno mapflag zone Towns
\ No newline at end of file diff --git a/conf/maps.conf b/conf/maps.conf index 9820bce44..458c9feff 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -195,9 +195,6 @@ map: pay_fild08 map: pay_fild09 map: pay_fild10 map: pay_fild11 -//map: payon //moved down to new maps -//map: payon_in01 //moved down to new maps -//map: payon_in02 //moved down to new maps //map: priest_1-1 //map: priest_2-1 //map: priest_3-1 @@ -1055,9 +1052,102 @@ map: ecl_tdun03 map: ecl_tdun04 map: ecl_hub01 map: que_avan01 + +// Pyramids Basement Nightmare Mode map: moc_prydn1 map: moc_prydn2 +// =============================== +// New Maps added 2013-02-10 (Thanks Streusel!) +// Credits to Baneado for reporting some +// =============================== +// Izlude Novice Academy & Tutorial +map: iz_int +map: iz_int01 +map: iz_int02 +map: iz_int03 +map: iz_int04 +map: iz_ac01 +map: iz_ac02 +map: iz_ng01 +map: treasure_n1 +map: treasure_n2 +map: iz_ac01_d +map: iz_ac02_d +map: iz_ac01_c +map: iz_ac02_c +map: iz_ac01_b +map: iz_ac02_b +map: iz_ac01_a +map: iz_ac02_a +map: izlude_d +map: izlude_c +map: izlude_b +map: izlude_a + +map: prt_fild08d +map: prt_fild08c +map: prt_fild08b +map: prt_fild08a + +// War of Emperium - Third Edition (TE) +map: te_prt_gld +map: te_prtcas01 +map: te_prtcas02 +map: te_prtcas03 +map: te_prtcas04 +map: te_prtcas05 +map: teg_dun01 +map: teg_dun02 +map: te_alde_gld +map: te_aldecas1 +map: te_aldecas2 +map: te_aldecas3 +map: te_aldecas4 +map: te_aldecas5 + +// Glast Heim Memorial & Nightmare +map: gl_cas02_ +map: gl_chyard_ +map: 1@gl_k +map: 2@gl_k + +map: silk_lair +map: evt_bomb + +//Wave Mode Memorial Dungeon +map: 1@def01 +map: 1@def02 +map: 1@def03 + +// Heroes' Trails - Part 1 +map: 1@face +map: 1@sara +map: 1@tnm1 +map: 1@tnm2 +map: 1@tnm3 +map: 1@ge_st +map: 1@gef +map: 1@gef_in +map: 1@spa +map: dali +map: dali02 + +//Episode 14.3 +map: moro_vol +map: moro_cav +map: 1@dth1 +map: 1@dth2 +map: 1@dth3 +map: 1@rev +map: 1@xm_d +map: 1@eom +map: 1@jtb + +//Clock Tower Nightmare Mode +map: c_tower2_ +map: c_tower3_ + //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- diff --git a/conf/messages.conf b/conf/messages.conf index 7c3a8b8a4..ac2be835a 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1,4 +1,4 @@ -// rAthena msg_athena.conf +// Hercules messages.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 @@ -443,6 +443,9 @@ // Homunculus messages 450: You already have a homunculus +// Return pet to egg message +451: You can't return your pet because your inventory is full. + // Messages of others (not for GM commands) // ---------------------------------------- @@ -830,12 +833,12 @@ // @reloadatcommand 1036: Error reading groups.conf, reload failed. -1037: Error reading atcommand_athena.conf, reload failed. +1037: Error reading atcommand.conf, reload failed. // @mapinfo 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>). 1039: ------ Map Info ------ -1040: Map Name: %s | Players In Map: %d | NPCs In Map: %d | Chats In Map: %d +1040: Map: %s (Zone:%s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d 1041: ------ Map Flags ------ 1042: Town Map 1043: Autotrade Enabled @@ -1013,7 +1016,7 @@ // @skillid 1163: Please enter a skill name to look up (usage: @skillid <skill name>). -1164: skill %d: %s +1164: skill %d: %s (%s) // @useskill 1165: Usage: @useskill <skill ID> <skill level> <target> @@ -1242,8 +1245,9 @@ 1294: They are family... wish them luck. // @version -1295: rAthena Version SVN r%s -1296: Cannot determine SVN revision. +1295: Git Hash '%s' +1296: Cannot determine version. +1436: SVN r%s // @mutearea 1297: Please enter a time in minutes (usage: @mutearea/@stfu <time in minutes>). @@ -1406,5 +1410,94 @@ 1396: You do not have a cart to be cleaned. 1397: Your cart was cleaned. +// @skillid (extension) +1398: -- Displaying first %d partial matches + +// @join +1399: Unknown Channel (usage: %s <#channel_name>) +1400: Unknown Channel '%s' (usage: %s <#channel_name>) +1401: '%s' Channel is password protected (usage: %s <#channel_name> <password>) +1403: You're now in the '%s' channel + +// Hercules Chat Feature +1402: You're not in that channel, type '@join <#channel_name>' +1475: You're already in the '%s' channel +1435: You're now in the '#%s' channel for '%s' + +// @channel +1404: %s failed +1405: Channel name must start with a '#' +1406: Channel length must be between 3 and %d +1407: Channel '%s' is not available +1408: Channel password may not contain spaces +1409: - #%s ( %d users ) +1410: -- Public Channels +1411: Unknown color '%s' +1412: You're not the owner of channel '%s' +1413: '%s' channel color updated to '%s' +1414: --- Available options: +1415: -- %s create <channel name> <channel password> +1416: - creates a new channel +1417: -- %s list +1418: - lists public channels +1419: -- %s list colors +1420: - lists colors available to select for custom channels +1421: -- %s setcolor <channel name> <color name> +1422: - changes <channel name> color to <color name> +1423: -- %s leave <channel name> +1424: - leaves <channel name> +1425: You're not part of the '%s' channel +1426: You've left the '%s' channel +1427: -- %s bindto <channel name> +1428: - binds your global chat to <channel name>, making anything you type in global be sent to the channel +1429: -- %s unbind +1430: - unbinds your global chat from its attached channel (if binded) +1431: Your global chat is now binded to the '%s' channel +1432: Your global chat is not binded to any channel +1433: Your global chat is now unbinded from the '#%s' channel +1434: Player '%s' was not found +1437: Player '%s' has now been banned from '%s' channel +1438: You cannot join the '%s' channel because you've been banned from it +1439: Channel '%s' has no banned players +1440: Player '%s' is not banned from this channel +1441: Player '%s' has now been unbanned from the '%s' channel +1442: Removed all bans from '%s' channel +1443: -- '%s' ban list +1444: - %s +1445: - %s (%d) +1446: You need to input a option +1447: '%s' is not a known channel option +1448: -- Available options +1449: option '%s' is already enabled, if you'd like to disable it type '@channel opt %s 0' +1450: option '%s' is now enabled for channel '%s' +1451: value '%d' for option '%s' is out of range (limit is 0-10) +1452: option '%s' is now enabled for channel '%s' with %d seconds +1453: option '%s' is now disabled for channel '%s' +1454: option '%s' is not enabled on channel '%s' +1455: You're talking too fast! +1456: -- %s ban <channel name> <character name> +1457: - bans <character name> from <channel name> channel +1458: -- %s banlist <channel name> +1459: - lists all banned characters from <channel name> channel +1460: -- %s unban <channel name> <character name> +1461: - unbans <character name> from <channel name> channel +1462: -- %s setopt <channel name> <option name> <option value> +1463: - adds or removes <option name> with <option value> to <channel name> channel +1464: Ban failed, not possible to ban this user. +1465: Player '%s' is already banned from this channel +1466: For '%s' you need the amount of seconds (from 0 to 10) +1467: -- %s unbanall <channel name> +1468: - unbans everyone from <channel name> + +// @costume +1469: '%s' is not a known costume +1470: You're already with a '%s' costume, type '@costume' to remove it. +1471: -- %s +1472: - Available Costumes +1473: Costume '%s' removed. + +//src/map/pc.c::pc_isUseitem +1474: You cannot use this item while sitting + //Custom translations import: conf/import/msg_conf.txt 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/plugins.conf b/conf/plugins.conf new file mode 100644 index 000000000..5233c4ed4 --- /dev/null +++ b/conf/plugins.conf @@ -0,0 +1,15 @@ +//==================================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//= +//= http://hercules.ws/board/ +//==================================================== +// == http://hercules.ws/board/topic/549-introducing-hercules-plugin-manager/ +plugins_list:[ + //"sample" + //"other" +]
\ No newline at end of file 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 //-------------------------------------------------------- |