summaryrefslogtreecommitdiff
path: root/conf
AgeCommit message (Collapse)AuthorFilesLines
2013-02-03Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind26-97/+45
2013-02-03Introducing MySQL Reconnectshennetsind1-0/+12
* 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 ~Ind Signed-off-by: shennetsind <ind@henn.et>
2013-02-02Merge pull request #5 from Mysteries/mastershennetsind26-97/+45
Updated README.txt. Approving Mysterious pull request (Thanks!).
2013-01-30Fixing a typo on skill_trap_type descriptionshennetsind1-1/+1
Signed-off-by: shennetsind <ind@henn.et>
2013-01-29Updated some more placholders.Mysteries25-94/+44
2013-01-29Updated placeholders.Mysteries1-3/+1
2013-01-28New skill configshennetsind1-0/+5
After due consideration we thought it'd be in the best interest of the community to provide a switch to this official feature since it drastically change the way traps can be used Signed-off-by: shennetsind <ind@henn.et>
2013-01-27Renaming some more, also temporarily made "display_version" off by default ↵shennetsind28-36/+36
until we decide what to do with the version since it's git. Signed-off-by: shennetsind <ind@henn.et>
2013-01-25Dropping _athena file suffixesshennetsind12-2/+2
Signed-off-by: shennetsind <ind@henn.et>
2013-01-11* Fixed minor issues in Guillotine Cross job change quest (bugreport:7145).euphyy2-0/+12
* Fixed misplaced line in 13-2 quests (bugreport:7136). * Fixed mistakes in script_commands.txt (bugreport:7140). * Added 'nowarpto' and 'nomemo' mapflags to bossnia_0* maps (bugreport:7118). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17092 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-02-Follow up r17065 glighta1-2/+2
--removing useless check on skill_id --fix few broken atcommand due to failed sscanf -Change skill_amotion_leniency as pointed out on tid:76492 so amotion delay wont be twice by default, (also increase intervall if you do want higher acd) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17072 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30Follow up r17062 where ignore def is not working properly.XDrud0lp201-3/+3
Fixed bugreport:6408 where casting WL_WHITEIMPRISON caster is not attach to trigger autoloot and events. Update WZ_ESTIMATION settings to RE default. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17064 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30* Added Somotology Laboratory F4 quest (written by Ziu, translated by Heris, ↵euphyy1-0/+1
uses some iRO dialogues). * Updated quest_db with Somotology Laboratory F4 entries (5113-5125 are placeholders, may be incorrect). * Moving of warp files, reducing the number of duplicates in pre-re/re paths. * Added a note to documentation (bugreport:7065) and fixed a small mistake (bugreport:7068). * Follow-up r17056, missing $ (bugreport:7067) and added a missing item. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17063 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Fixed bugreport:4687, @lostskill was removing the skill from skill tree ↵momacabu1-2/+2
and not disabling it (making it grey); * Fixed mercenary window not showing up critical (bugreport:2369). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17050 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23* Documented @refreshall (r17035), @breakguild, @hommutate (r17038).euphyy2-10/+10
* Follow-up r16972, fixed a naming mistake (bugreport:7038). * Edited format of default grf-files.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17039 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23* Implemented @breakguild (tid:75159) and @hommutate (tid:74651).momacabu1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17038 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23* Fixed typo in castle_db.txt (bugreport:7036).momacabu1-1/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17036 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23* Removed @adopt as it was not working properly (bugreport:6384);momacabu1-0/+2
* Introduced @refreshall, it will @refresh all players in-game. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17035 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-22Community Contribution Time!momacabu1-1/+1
* Fixed bugreport:6303: official servers now always reshuffle the dice emoticon. To disable change the configuration to 'no'. Thanks to Vianna for providing the information! * Fixed bugreport:7026: creating a guild and exiting in a short amount of time wouldn't save the guild properly. Thank you clydelion! * Fixed bugreport:7030: removed warning introduced by r16987. Thanks Mr. Brian and Sir BuildBot for pointing! * Fixed bugreport:7031: if a player crashed during warp it would cause OnTouch_ to not trigger anymore. Thanks to flaviojs (eA-r15185) for the fix and Napster for pointing out! * Fixed bugreport:7032: Clementia and Canto Candidus give an additional of +1 str/agi/dex each 10 job levels (from caster). Thanks solvent! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17034 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-20* Follow-up r17030: documented and added bMagicAtkEle to item_combo_db ↵euphyy1-0/+1
(bugreport:6943). * Follow-up r17029: moved 'clearinventory' alias to atcommand_athena.conf. * Custom Quest Shop updated to v1.5, which replaces categories with shop IDs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17031 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-19Implemented @clearstorage, @cleargstorage, @clearcart, @clearinventory ↵momacabu1-0/+8
(alias for @itemreset) as suggested in tid:70764. For further details read the documentation in doc/atcommands.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17029 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-15* Updated Minstrel and Shadow Chaser job quests to their latest versions.euphyy1-1/+1
* Fixed more Izlude RE coordinates (bugreport:6285). * Disabled "Fish Tails" NPC in El Dicastes quests until Izlude RE coordinates are found; also, fixed a small mistake. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17024 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-12- Added $Revision$ and $LastChangedDate$ keyword properties to README.txtbrianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17019 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-08* Updated Geneticist, Warlock, and Sura job quests to their latest versions.euphyy1-2/+3
* Added a clearer example for party_even_share_bonus (tid:58005). * Standardized job headers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17010 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-30- Minor tweak in @jobchange, it will now read msg_athena.conf job names;momacabu1-0/+15
- Fixed warning in cleanmap command (follow up to r16971). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16986 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27* Follow-up r16971, documentation for map-cleaning commands.euphyy1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16972 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27Applied suggestion in tid:74775. Added script command cleanmap and cleanarea ↵momacabu1-0/+1
script commands. Also modified @cleanmap to properly clean the entire map and added @cleanarea to clean an specified area. A documentation will be done in shortly. Automagically copy files from import-tmpl to import folder on Windows after building the project (only works with rAthena-10 and rAthena-12) (tid:74635). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16971 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25* Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to ↵euphyy1-0/+2
Muad_Dib! * Changed all commands in atcommands.txt to their defined names, not aliases, and added two more common aliases. * Documented 'makerune' in script_commands.txt. * Documented '@accinfo' in atcommands.txt. * Follow-up r16965, database update for rune crafting formula. * Updated Magic Mushroom DB according to 3CeAM revision 703. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16966 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23* Added Guillotine Cross job quest, again thanks to Muad_Dib! (bugreport:5834)euphyy1-1/+1
* Follow-up r16941: added documentation. * Updated WOE Controller script to v1.4, which modifies LoadEvent mapflag settings for easier cross-compatibility and standardizes script format. * Minor tweaks here and there. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16947 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-20Minor improvement in char_per_account setting, which could be greater than ↵momacabu1-0/+2
MAX_CHARS. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16937 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-13- Fixed bugreport:6887, a variable was not initialized;momacabu1-1/+1
- Make @addwarp <npc name> parameter mandatory as per requests; - Changed SCB_ALL to SCB_BASE on SC_INTRAVISION case, it should be enough. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12Modified @addwarp to accept a new optional parameter <npc name>. If <npc ↵momacabu1-1/+1
name> is specified, then the warp created will have that name. Otherwise it will use a name chosen by the emulator. If there is already another warp with that name the generic name will be used instead. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16919 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12-Add Homon-S skills, 1st implementation (all done except Eleanors)glighta1-1/+1
--Upd Skill conf to set land-limit for homonculus by default (ground skill limit) --Mv MH_HEILIGE_STANGE and MH_ANGRIFFS_MODUS skill from Eleanor to Bayeri -Enforce all zeny transaction to use pc_payzeny and pc_getzeny handlers, (auto log and clif) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16914 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-11* Cleaning of script_commands.txt, with db paths updated to reflect ↵euphyy1-4/+3
pre-re/re changes. * Follow-up r16905, clarified documentation. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16909 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10- Added configuration to wheter the monster size would change experience ↵momacabu1-0/+7
earned, drop rates and the monster status (such as hp, strength etc). Awesome suggestion by Euphy :) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10Commented out poring_c01/02 since they are no longer present in the latest ↵shennetsind1-2/+2
grfs which would make the map server pointlessly output that they are removed from the cache on every boot, also modified map load so that it doesn't output the amount of maps being loaded twice - special thanks to mkbu95! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16902 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10- Fixed bugreport:6816, bugreport:6818, bugreport:6843, buying a Pet Egg is ↵momacabu1-1/+1
now working. Special thanks to Ind; - Fixed a bug where pet egg was not deleted properly after clearing the floor. - Adjusted comment from msg_athena.conf, these IDs are being used! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-09- Updated the list of dnsbl_servers. (bugreport:6862)brianluau1-2/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-09Fixed bugreport:6851, two chrif-related messages had the same id as cash points.momacabu1-3/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-08- Fixed a typo in @mapflag example, since r15009.brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16875 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-07Added support to pre-re/re map_cache since some maps differ, this results in ↵shennetsind1-3/+0
map servers' map_cache_file config being dropped. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16867 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-29* Follow-up r16835: Some cleanup.euphyy1-6/+6
* Updated Hunting Missions script to v1.2b, which adds experience multipliers to config (custom\quests\hunting_missions.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16839 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-29-Add some src basic documentation.glighta1-8/+45
-Change some remaining -1 for status ending timer. -Move some hardcoded msg in msg_athena -Small optimisation on battle_attr_fix git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-21* Merged eAthena ea:15187 by ai4rei, effect list improvements ↵euphyy1-4/+5
(doc\effect_list.txt) * Follow-up r16787, revised documentation and comments on MD5 hash check * Added svn:eol-style=native property on some recent files git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16788 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-18* Fixed a misplaced quest log entry in Priest job quest, bugreport:6702 ↵euphyy1-2/+1
(jobs\2-1\priest.txt) * Fixed an incorrect check in Taekwon job quest, bugreport:6711 (jobs\1-1e\taekwon.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16786 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10Added client MD5 hash check option to login-server.greenboxal21-0/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16771 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-06Added new group permission as discussed with other developers ↵shennetsind1-0/+3
"disable_commands_when_dead" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16751 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-06Added @cart as per discussion in tid:70389 (mostly greatly helpful for ↵shennetsind1-0/+5
debugging), after some developer discussion we've decided to make @newmount a permanent command, we however decided to rename it so that if newer mounts are available it doesn't confuse anyone: @mount2. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16749 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01- Changed the column spacing in @go (town list) and @job (jobname list) so ↵brianluau2-88/+63
it lines up for Arial font, instead of fixed-width fonts. - Follow up to r15907, made atcommand_help_string() convert alias to real command name before looking up in help.txt - Moved the list of jobs to help.txt and converted @job to utilize atcommand_help_string(). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16729 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01- help.txt Params lists: changed "/" to "|" to match the rest of the file.brianluau1-19/+18
- Removed an extra 'packet_db_ver' comment from r15173. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16728 54d463be-8e91-2dee-dedb-b68131a5f0ec