1332 Commits

Author SHA1 Message Date
aleos89
81ca299d91 Bug Fixes
* Fixed Overbrand swing damage ground placement. (bugreport:8856)
* Fixed Wug Dash not getting ATK bonus from Tooth of Wug.
* Cleaned up Gates of Hell damage formula.
* Corrected Hell Gate skill define to be passive.
* Added missing immobilization duration reduction for Poem of Netherworld and blocked it from working on MVP. (bugreport:8877)
* Cleaned up NPC_RUN to show e_hlp and not get stuck in a follow state. (bugreport:8875)
* Fixed item bonus DefRatioAtkEle/DefRatioAtkRaceDefRatioAtkClass not working for left handed weapons. (bugreport:8495, bugreport:8808, bugreport:8847)
* Fixed SubSize/SubRace/SubClass stacking to create 100+% immunity. Thanks to @cydh. (bugreport:8827, bugreport:8879)
* Small cleanup to clif_parse_StatusUp.
* Fixed Sling Item to copy the source skill ID and not the dummy ID.
* Fixed spirit spheres not giving ATK bonus. (bugreport:8130, bugreport:8285, bugreport:8686)
* Acid Demonstration is now forced to neutral in renewal.
* Follow up to e2d2494 to fix cooldown for Unlimit.
* Follow up to e2d2494 to clean up some compile warnings.
* Follow up to da0da73 to fix SC_ITEMSCRIPT to only use an icon if val2 is not empty.
2014-04-09 10:10:32 -04:00
Cydh Ramdh
c8c40a1377 Follow up 0081e25, 8a723ee (msg_conf stuffs)
- Revert MAP_MAX_MSG to 1500
- Moved some messages to empty spaces
- Added warning message if msg_number is invalid when msg_conf files are being read
- And minor stuffs

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-04-04 22:28:11 +07:00
aleos89
d876272283 Bug Fixes
* Cleaned up the card fix calculations once more. (bugreport:8848)
* Fixed Kaite pre-renewal effect. (bugreport:6415)
* Fixed a possible crash from Elemental Action.
* Cleaned up the costume atcommand messages.
* Fixed a few issues from the CppCheck report.
2014-04-03 14:38:58 -04:00
aleos89
0081e25922 Costume System cleanup.
- Cleaned up overall system to work like officials.
- Added costume atcommand to easily enable/disable costumes.
2014-04-03 11:26:38 -04:00
aleos89
2fe8140f96 Quest Log system improvement. (Hercules 6f55c00)
- Improved memory usage of the quest log system. (saves up to 75kB per online character).
- Fixed various issues with quest entries disappearing from characters without an apparent reason, or monster kill counters getting stuck - the issues were caused by a de-synchronization between the two parallel questlog arrays in map_session_data.
- Added some code documentation.
- Thanks to @shennetsind and @MishimaHaruna.
2014-04-03 09:39:34 -04:00
aleos89
cc59315323 Fixed some 3rd class skill effects not displaying properly. (bugreport:8144, 8804) (Hercules 8cc9012) 2014-04-03 08:48:49 -04:00
aleos89
0fed97c1d9 Bug Fixes
* Follow up to 6e795af expiration timer passing wrong time value. Thanks to @MrKeiKun.
* Follow up to 26afd76 to force players to use skill_sit before pc_setsit to invoke pc_stop_walking and pc_stop_attack first.
* Follow up to 26afd76 to revert change on Extremity Fist status icon.
* Fixed some Gentle Touch - Revitalize typos.
* Fixed some Gentle Touch - Energy Gain typos. (bugreport:8846)
* Corrected Explosion Spirits effect for renewal. (bugreport:8842)
* Rebound status from Full Throttle will now disable HP and SP regeneration.
* Fixed Mainframe Restructure not giving DEF bonus. (bugreport:8840)
* Added Hiding and Sight to the list of skills not usable while riding Mado using _INF3 and removed hardcoded checks.
* Increased the max skill unit layout to accommodate the addition of Fire Rain. (bugreport:8775)
* Fixed Unlimit to not work with Warg skills and sets DEF/MDEF to 1 per Ziu's tests.
* Fixed damage and life (hits) for Wall of Thorn.
* Added an extra check for Crescent Elbow to check for short range and to handle knockback with the autospell skill.
2014-04-01 14:26:37 -04:00
aleos89
5e02af25af Fixed quest information icons not displaying properly on NPC. (bugreport:8156, bugreport:8157) (Hercules 1ab0017) 2014-03-31 08:17:45 -04:00
aleos89
1f26499994 Bug Fixes
* Fixed Group A Songs not showing their respective skill animation. (bugreport:7379)
* Fixed Cart Revolution pushing targets East rather than West. (bugreport:8806)
* Chemical Protection should not remove Strip status. (bugreport:8807)
* Concentration now casts Endure. (bugreport:4262, bugreport:8756)
* Fixed the Riding Mount icon not showing up after relogging for Dragons and Mado Gear. (bugreport:8805)
* Crescent Elbow will now knock the target back 8 cells.
* Other miscellaneous cleanups.
2014-03-20 12:59:18 -04:00
lighta
51f26d43d2 Follow up e0c8e01
Move skill_get_cooldown_ into pc_get_skillcooldown
and add a short src_doc description to promote his usage
(and avoid duplicate code)
Fix few cppcheck issues (variable scope optimisation mostly)
2014-03-18 17:36:23 -04:00
Euphy
0602234e4d Follow-up 165609d: fixed damage issue. (bugreport:8768, credits: Jey)
http://rathena.org/board/tracker/issue-8768-about-the-damage-i-think-the-race-or-resist/

Player-looking NPCs will now display properly. (Hercules 1007d60)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-14 16:19:08 -04:00
Euphy
8c133f139b Hercules merges.
- If a player has both a Cart and Magic Gear, removing them will now first remove the Magic Gear first (instead of both simultaneously).  (2f9a514)
- Added overflow check to 'itemheal'; documentation updated. (1849d35)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-13 16:20:56 -04:00
Cydh Ramdh
dd67f9de96 Bug Fixes:
- 'hp_rate' and 'sp_rate' config aren't working. http://rathena.org/board/tracker/issue-8742-max-hpsp-battleconf-not-working/
- Mercenary DB that aren't being read properly whic also happens for Homunculus DB. http://rathena.org/board/tracker/issue-8761-mercenary-db-import-folder-issue/
- Fixed Elemental DBs that aren't being imported yet. (also changed to sv_readdb)

Rebellion Skill Updates:
- Some updates according to kRO updates on http://forums.irowiki.org/showpost.php?p=1364894&postcount=579, http://forums.irowiki.org/showpost.php?p=1388802&postcount=981, and http://forums.irowiki.org/showpost.php?p=1389627&postcount=1008
- Partial merge from idAthena.
- Using 0x107 as temporary marker on mini-map for Crimson Marker target.
- Some stuffs maybe still wrong, feel free to report/fix it.
- Thank people on those links, Ziu, and idAthena.

Misc changes:
- Changed some function names for homunculus.c/h with prefix hom_* and mercenary.c/h with prefix mercenary_*
- Change unnecessary 'int' return value tos 'void'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-03-13 23:59:29 +07:00
aleos89
5aa2f17fc1 Bug Fixes
* Fixed Guild Auras applying to other guilds. (bugreport:7073) (Hercules 81caf70, 7fc0697, eb53067)
* Fixed wrong packet being used for storages on 20071002 and older clients.
2014-03-07 11:53:14 -05:00
aleos89
df1b99212b Bug Fixes
* Updated /stats+ to support 2013-12 and newer clients. (bugreport:8726) (Hercules 42b5c04)
* Guild auras will no longer be removed on Land Protector. (Hercules 186fbc5)
* Fixed the animation for logout. (Hercules 3f473c2)
2014-03-06 15:14:26 -05:00
Euphy
cad0a57865 Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb)
- Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd)
- Added MAX_CHAT_USERS define. (Hercules 950e3eb)
- Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-01 15:42:49 -05:00
aleos89
96c768f9b7 Bug Fixes
* Fixed Severe Rainstorm damage formula. (bugreport:8581)
* Caster can no longer switch equips for the duration of Severe Rainstorm. (bugreport:8581)
* Cleaned up Demonic Fire and Fire Expansion combos. (bugreport:8620)
* Fixed Dragon Breath - Fire/Water damage formula and not being reduced by DEF or Flee. (bugreport:8620)
* Fixed the movement speed formula for Camouflage. (bugreport:8619)
* Fixed Overbrand Brandish area damage. (bugreport:8627)
* Fixed cast time for Magical Amplification.
* Fixed Moonlit Serenade MATK increase. (bugreport:8697)
* Fixed Phantom Thrust not casting. (bugreport:8652)
* Fixed Gentle Touch - Cure healing formula. (bugreport:8699)
* Fixed Wall of Thorns not dealing damage to players who touch it. (bugreport:8673)
* Fixed Flash Combo spirit sphere requirement. (bugreport:8286)
* Fixed Feint Bomb damage formula. (bugreport:8593)
* Fixed Circling Nature HP recovery and SP consumption being reversed. (bugreport:8670)
* Fixed Judex area of effect to be 3x3. (bugreport:8672)
* Fixed Abracadabra skill "Summon Monster" not displaying the monster's name. (bugreport:8671)
* Fixed Sight Blaster duration. (bugreport:8656)
* Fixed Ignition Break area of effect damage. (bugreport:8653)
* Fixed Poem of Netherworld not immobilizing enemies. (bugreport:8607)
* Fixed Rampage Blaster damage formula. (bugreport:8646)
* Adjusted Tiger Cannon damage formula and allow to bypass target's flee. (bugreport:8625)
* Fixed Self Destruction not working on self. (bugreport:8633)
* Fixed Repair not healing or consuming item requirements. (bugreport:8633)
* Fixed Silver Sniper and Magic Decoy AI types not being counted towards the land skill limit. (bugreport:8407)
* Fixed Silver Sniper bonus ATK formula.
* Fixed Magic Decoy maximum HP formula.
* Fixed Lion Howling damage formula. (bugreport:8654)
* Fixed Rapid Throw (Muchanage) damage formula. (bugreport:7861)
* Stasis no longer allows casting of Chorus skills.
* Fixed Chorus skills not checking for additional partners. (bugreport:6052)
* Body Paint no longer removes Chase Walk or Invisibility. (bugreport:6801)
* Recognized Spell is no longer cleared by Dispell or Abundance. (bugreport:6718)
* Epiclesis now removes Cloaking Exceed and will heal while in the Frenzy state. (bugreport:6679)
* Renovatio now heals while in the Frenzy state. (bugreport:6679)
* Fixed Firing Trap not having the fire element. (bugreport:8707)
* Fixed Icebound Trap not having the water element. (bugreport:8707)
* Fixed Axe Tornado not doing less damage for targets outside of the 5x5 area of effect.
* Updated the list of effects that Inspiration makes the caster immune to. (bugreport:5735)
* Cleaned up the effects of Vacuum Extreme to work as it should in GvG maps. (bugreport:6031)
* Corrected durations for Millennium Shield, Crush Strike, Refresh, and Weapon Crush.
2014-02-28 15:18:45 -05:00
Cydh Ramdh
3fce137cbb Follow up 4019fb4
- Wrong macro for itemdb_is_element, thx @exneval
- Incompatible type issue on UNT_BANDING. bugreport:8616 http://rathena.org/board/tracker/issue-8616-error-while-recompiling/
- Skill usage messages ot conf/msg_conf/map_msg.conf instead following official client fail message by clif_skill_fail() for each failure. (related with skill_require_db.txt)
--> "%s is required." (similar: 28 messages)
-->"[%s] Poison effect was applied to the weapon." (similar: 8 messages)
-->"Please equipped with a %s." (similar: 7 messages)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-07 09:54:59 +07:00
Cydh Ramdh
b4bdaebeeb * Replaced INF2_NO_AUTOSHADOWSPELL with INF2_AUTOSHADOWSPELL following AEGIS standard, reverted c9cf222.
* Fixed bugreport:8596 http://rathena.org/board/tracker/issue-8596-compile-warnings-with-fresh-svn/
* Removed temporary array while parsing shop NPC, makes remove the limit 100 items each NPC
* Added idRO cash trader according to Chinese New Year event

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-04 12:32:38 +07:00
Cydh Ramdh
c9cf2228a3 * Added skill INF2_NO_AUTOSHADOWSPELL for some skills that cannot be auto casted by Auto Shadow Spell as fix of bugreport:8582, http://rathena.org/board/tracker/issue-8582-shadow-chaserauto-shadow-spell-restricted-spells/
* Removed unused const.txt entries as fix of bugreport:8467, http://rathena.org/board/tracker/issue-8467-left-over-constants-from-mob-controller-system/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-03 01:17:28 +07:00
Cydh Ramdh
26025e600b * Fixed DB Import that not being read some imported files. bugreport:8543 http://rathena.org/board/tracker/issue-8543-import-folder-nolonger-working/
* Fixed packet_db always be 45. bugreport:8487 http://rathena.org/board/tracker/issue-8487-packet-version-is-always-45-for-map-server/
* Follow up 46ca940

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-02 19:19:37 +07:00
Cydh Ramdh
0ef4047306 Follow up fd063a8 bugreport:8576. Added sc check itself before using sc->data[SC_ALL_RIDING], http://rathena.org/board/tracker/issue-8576-loyal-pets-causing-map-server-to-crash/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-29 20:28:36 +07:00
Lilith
fd063a8e2d * Merged from 3CeAM r689 & r690
- Removed OPTION_MOUNTING
 - Added SC_ALL_RIDING
 - Added new option in battle/player.conf for changing speed of players when mounted: 'rental_mount_speed_boost'
2014-01-28 07:41:06 -08:00
Cydh Ramdh
03108701c0 Implemented suggestion "Script Command to block commands" http://rathena.org/board/topic/88888-script-command-to-block-commands/
-- Added new script commands: 'enable_command', 'disable_command'
-- Added new config 'atcommand_enable_npc' at conf/battle/gm.conf
-- Thank Kichi for the patch file

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-27 19:34:29 +07:00
Cydh Ramdh
31d97129f8 * Added @showrate to disable/enable the message of rate information when VIP is enabled. (Someone mention about this, I think the message has posibility will be annoying).
* Added 'vip_disp_rate' at player.conf to set the message of rate information is displayed or not by default.
* Added 'disp_serverbank_msg' at misc.conf to hide "login-serv has been asked to %s the player '%.*s'." message.
* Updated map_msg.conf and map_msg_idn.conf

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-25 21:44:36 +07:00
Cydh Ramdh
a0760f171b * Updated Silent Breeze effect, only gives chance to give silence status to target and the caster (Eira), bugreport:8529, http://rathena.org/board/tracker/issue-8529-homunculus-s-eira-silent-breeze/
* Follow up 80f7984, and some minors

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-24 22:44:26 +07:00
aleos89
27cbc7ff24 Merge pull request #40 from Lemongrass3110/master
Added autotrade persistence support.
- Players who are autotrading during a crash/shut down will be restored on start up.
- Live vendor data is stored in SQL.
- Credits to Ind and Lemongrass.
2014-01-23 07:49:18 -08:00
aleos89
b818c78f1d Added Oktoberfest costume.
- Requires client version 20131218 or newer.
2014-01-21 11:26:59 -05:00
Cydh Ramdh
1ba024069a Fixed bugreport:8468, http://rathena.org/board/tracker/issue-8468-item-not-exist-using-dummy-data/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-21 19:18:19 +07:00
Cydh Ramdh
e2e0a1818e Follow up a32d3a6, revert this litte thing. Thank Lemongrass
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-20 22:53:55 +07:00
Cydh Ramdh
a32d3a6e76 * Fixed bugreport:8471, http://rathena.org/board/tracker/issue-8471-star-gladiators-feeling-randomising-map/
* Follow up f4eb33e, 5a2849d

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-20 22:38:10 +07:00
Lemongrass3110
b7fd4dd274 Unneeded semicolons removed
Removed duplicate slashes
2014-01-14 23:38:12 +01:00
Lemongrass3110
07b9fe761f Autotrade persistency 2014-01-14 22:24:00 +01:00
Euphy
89896d751a Card compounding window no longer appears if no slotted items are available. (Hercules 763102b)
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-09 11:58:27 -05:00
Lilith
40f70143d4 * Added RC_PLAYER race.
* Updated all item bonuses.
* Fixed Bug: http://rathena.org/board/tracker/issue-8420-pc-bonus2-unknow-type-0-3-1/
* Fixed Bug: http://rathena.org/board/tracker/issue-8451-whats-wrong-on-bonus-bdefratioatkclass/
* Fixed Visible part of Shadow Equipment when storage is open.
2014-01-09 08:19:18 -08:00
lighta
b92230e33e Cppcheck
Fix typo in race bonus fix : race<RC_NONE_ && race<RC_MAX
Fix bugreport:8418 => clif_instance_changestatus possible mapcrash
Reduce lot of variable scope and fix unsafe scanf
2014-01-09 02:18:51 -05:00
aleos89
65d1ee32e4 Follow up to eca4fa0.
* Fixed a multi-hit damage issue for Falcon Assault (bugreport:8447).
* Fixed unsigned int specifier for sprint (bugreport:8448).
* Fixed WE_MALE and WE_FEMALE checking target rather than caster (bugreport:8449).
2014-01-08 15:27:33 -05:00
lighta
d6caec1c51 Various fixs
Fix bugreport:8418 (possible mapcrash from custom instance script)
Fix bugreport:8439 (pc_bonus_item_drop typos) thx to Baalberith
Fix some errors detected by cppcheck
upd install.sh (leftover of svn and wrong simlink)
2014-01-07 20:15:40 -05:00
aleos89
eca4fa0e38 Bug Fixes
* Fixed an operator check for WE_MALE and WE_FEMALE. Thanks Baalberith.
Optimizations
* Fixed a possible null pointer dereference in Spirit Ball check, Change Cart check, WE_BABY, MH_PYROCLASTIC, and MH_LIGHT_OF_REGENE.
* Fixed a reassigned value being reset before being checked.
* Fixed a homunculus expression always being false because of prior check.
* Fixed sprintf specifier output trying to display int value when return value is unsigned int.
* Fixed a redundant check for when monster's HP is less than 0 when HP is declared as an unsigned int.
* Fixed a redundant check for when uAccLen or uTokenLen are less then 0 when both are declared as unsigned int.
* Various other clean ups.
2014-01-06 14:20:50 -05:00
Lilith
a053ccea3f * Fixed bug: http://rathena.org/board/tracker/issue-8345-specialeffect-target-self-doesnt-work
* Fixed bug: http://rathena.org/board/tracker/issue-8169-hiding
* Fixed bug: http://rathena.org/board/tracker/issue-8366-egg-type-monster-issue
* Fixed bug: http://rathena.org/board/tracker/issue-8406-item-bonus-not-working
* Added fix with mob_hp update when mob get healed (Hercules merge)
2014-01-03 23:56:13 -08:00
lighta
28ecab5712 DB Import
Add folder import/ into db/ to load all customs
This folder is meant to hold all the customs file you wish override rA
one.
(In short it work like conf import)
related to tid:90199
2013-12-31 18:21:45 -05:00
Cydh Ramdh
e18bf43547 * Revert this 487f84e, please import upgrade_20131231.sql. Thank Lemongrass3110 and Toshiro90
* Follow up 7a9aa7f, enum errors
* Follow up 12007fe, function return type error
* Follow up dae8122, 'skill' to 'skill_learnlv'?

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-31 01:52:14 +07:00
aleos89
7a9aa7fbcf Bugfixes
* Fixed WE_MALE and WE_FEMALE up to You to not consume HP/SP when it's below 10%. (bugreport:3546)
* Fixed WE_CALLPARTNER, WE_CALLPARENT, and WE_CALLBABY to not recall target if they are autotrading. (bugreport:2479)
* Fixed WE_BABY not checking for parents if they are in the same party and in the area. (bugreport:2518)
* Fixed Dragon Breath - Water not requiring a dragon. (bugreport:8237)
* Added a new config 'char_del_option' to set whether email or birthdate should be used for deleting characters. (bugreport:8240)
* Follow up to 9a5a6b9. Fixed a missing define check for 2013 clients when deleting a character. (bugreport:8399)
* Fixed Weapon Refining to use clif_upgrademessage. (bugreport:2135)
* Fixed script command 'prompt' not ending script state when player selects Cancel from menu. (bugreport:7932)
* Fixed nomineeffect display on GvG enabled maps. (bugreport:7754)
Others
* All items, except for Cash items, can no longer be used when storage is open.
* Defined constants for a lot of item and monster IDs used throughout the source.
* Follow up to 0f2dd7f. Corrected a change to the wrong hostname array.
2013-12-30 13:20:33 -05:00
lighta
4212080bd9 Storagelist fix
Follow up hash:0f2dd7f (adding support to map<=>client to allow longer
storagelist)
Fix most of : [Error]: WFIFOSET: Maximum write buffer size for client
connection 7 exceeded, most likely caused by packet 0x0996 (len=11932,
ip=127.0.140733193388032.1). Still remain some if you openup the list
like 5time/s, see tid:90541
2013-12-26 04:13:32 -05:00
Cydh Ramdh
51074a0637 Added some official item packages!
- Added db/re/item_package.txt, imported file for item_group_db.txt
- Added doc/item_group.txt for more details about item group
- Added new IG_ids on db/const.txt, up to 300 additions
- Added 'getgroupitem' script command to get item from specified item group (see doc/script_commands.txt)
- Modified 'grouprandomitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Modified 'getrandgroupitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Updated db/re/item_db.txt
- Updated sql-files/item_db_re.sql, so for MySQL user, please udate your item db
NOTE:
- I ocmmented some lines because some items aren't exist yet on rAthena db (or maybe have different name?)
- For pre-re, maybe I can do it later, or will someone do it?
- If there's something I forget to tell you, it's habit

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 23:37:27 +07:00
lighta
00e63be81c Upd Documentation
Update some src documentation for doxygen
Fix typo in [hash:9cca188] in clif, making it uncompilable
2013-12-21 04:41:11 -05:00
lighta
9cca188908 Itemtype
Fix itemtype IT_ARMOR and IT_WEAPON being inverted, bugreport:8180
please run tools/convert_itemtype.pl to update your dbs.
Upd athena-start having some issue for some os.
Fix a typo on DC_SERVICEFORYOU for val1 assignment.
2013-12-21 01:02:41 -05:00
lighta
854f8fc502 Quickfix
Follow up hash:0f2dd7fcf, fixed a typo on packet lenght for storagelist
this should fix bugreport:8344
Hotfix for bugreport:8333, (we're now checking if we fully add object on
map before attempting to spawn it)
2013-12-19 18:27:01 -05:00
Lilith-
54dfc67925 * Fixed bug http://rathena.org/board/tracker/issue-8330-secure-npctimeout-bug-for-those-npc-who-have-no-dialog-window/
Merged Hercules adc2e6e
2013-12-16 05:04:52 -08:00
exneval
bc9eff5b0c Merge branch 'master' of github.com:rathena/rathena 2013-12-14 13:42:26 +07:00