summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-01-13Merge latest rathena commits to Herculesmalufett6-66595/+66611
Merge r17093, r17094, r17095 of rAthena to Hercules. Welcome Hercules!! my first commit <3
2013-01-12Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind0-0/+0
2013-01-12Test1, testing for the commit widget, need to edit something.Trojal1315-0/+830889
Test2, testing for the commit widget, need to edit something. Signed-off-by: shennetsind <ind@henn.et>
2013-01-10Merge rathena repository to form Hercules initial commit.Trojal1315-0/+830889
2013-01-11* Fixed minor issues in Guillotine Cross job change quest (bugreport:7145).euphyy5-9/+19
* 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-10Initial commitshennetsind1-0/+2
2013-01-10Implemented official walk path dealing with obstacle.(bugreport:6159)rud0lp203-26/+20
-see 'src/config/core.h' for settings[OFFICIAL_WALKPATH]. Fixed bugreport:7057 where HP_ASSUMPTIO should only double eDEF & eMDEF. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-10Fixed bugreport:7151 where NJ_ISSEN don't consume HP on plant type monsters.rud0lp203-4/+11
Fixed bugreport:7154 where RC_BOSS type monsters are not immune with SC_DEEPSLEEP. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17090 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-09Fixed bugreport:7105 where pierce defense must ignore def and add (def/2) as ↵rud0lp203-9/+8
additional ATK damage. Fixed bugreport:7148 where r17072 broke the ability of smiths to forge weapons. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17089 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Fixed bugreport:7125 changed CH_PALMSTRIKE to aspd based like official.rud0lp202-3/+3
Fixed bugreport:7131 where negative def in PRE causes instant death to target. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17088 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08- Added svn:eol-style=native property.brianluau2-26/+26
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17087 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08* Renaming variable name from nsiuid to unique_id for better understanding ↵markzd13-51/+62
of its meaning, as requested on tid:69380. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17086 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Another fix with the @follow issue.ediejohnny2-3/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17085 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Fixed a problem with the @follow command, that was stick the character when ↵ediejohnny1-4/+8
turned the @follow off. (bugreport:7139) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17084 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07- Fixed a typo on SQL single quote, in int_storage.c, follow up ↵markzd1-1/+1
r17080.(bugreport:7141) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17083 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Fixed a compiling error which happened when PACKATVER was set as < 7. ↵markzd1-2/+0
(tid:76890) 1. Also a merge of eAthena: https://trac.paradoxsystems.net/changeset/15166 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17082 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Follow Up: r17080markzd4-15/+22
1. Removed an unnecessary update call. 2. Implemented interreg table at main.sql. * Follow Up: r17077, r17072, r17065 1. Fixed bugreport:7078, removed unnecessary checks. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Implemented Unique identifier for Non stackable items. (tid:69380)markzd15-37/+174
* Set as off by default, it can be changed in /src/config/core.h. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17080 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05Reverted 're/scripts_main.conf' from r17078..sorry folks..:)rud0lp201-1/+16
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17079 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05Fixed bugreport:6332 updated NJ_TATAMIGAESHI to its RE behavior.rud0lp205-24/+17
Fixed bugreport:7101 where MO_EXTREMITYFIST don't consume sp when used against plant type monster. Fixed bugreport:7116 missing duration for HW_MAGICPOWER. Fixed bugreport:7117 where WL_WHITEIMPRISON doesn't work properly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17078 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05* Follow up r17065markzd5-9/+10
1. Removed some unnecessary checks.(bugreport:7078) 2. Fixed some index's which would access an invalid array position, crashing the server. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17077 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-04> Follow-up to r17065:aleos2-184/+184
* Further harmonized skill_id and skill_lv variables. * Fixed trap skill item requirement checking for signed return and being set to unsigned variable. (bugreport:7085, bugreport:7114) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17076 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-04* Documented OnTouch_ label.euphyy4-11/+14
* Fixed some bugs in Rune Knight job quest (incl. bugreport:7083). * Removed a duplicate item in custom Item Mall script (bugreport:7115). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17075 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-03- Fixed an warning of type casting. (bugreport:7081)markzd3-12/+11
- Removed an unecessary type cast before atoi. - Fixed Ray of Genesis Attack Formula. (bugreport:7053) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-02Reverted r17070 XD.(bugreport:7094)rud0lp201-33/+33
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17073 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-02-Follow up r17065 glighta8-49/+43
--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
2013-01-02Modified the formula of the Ice Pick, it was def1+vit_def, but according to ↵ediejohnny1-3/+3
iROWiki, it's Hard Def/2, so, def1/2 now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17071 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-01Follow up r17017 fixed some wrong type casted variables.rud0lp201-33/+33
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17070 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-01Update NJ_ISSEN to its official RE behavior.(bugreport:6114, bugreport:5426)rud0lp206-598/+600
Fixed bugreport:6688 MO_EXTRIMITYFIST skill effect. Updated all non 3rd job skills to there official RE cast time delays. Updated WL_WHITEIMPRISON where cooldown should trigger whether success or not. Added missing status icon for SC_MATKPOTION and SC_ATKPOTION. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17069 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-31> Follow-up to r17048:aleos1-6/+17
* 'npcskill' now uses AREA_SIZE as maximum distance rather than using skill distance. (bugreport:7069) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17068 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-31-Follow up r17065 fiw splash skill being broken.glighta3-4/+6
-Also revert unintentional change of GDI_SKILLLV (even if useless enum) bugreport:7076 --All type change related to tid:75123 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17067 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30* Follow up r17065markzd4-11/+8
Fixed some error when creating vars and some warnings.(bugreport:7074) * Removed an undisered warning on script's sscanf. (bugreport:7059) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17066 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30-Harmonize skillid, skill_num, skillnum, skill, to skill_id and same for ↵glighta40-3435/+3448
skill_lv -Optimise type from int to int16 in order to reduce ram consumtion. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30Follow up r17062 where ignore def is not working properly.XDrud0lp203-12/+15
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, ↵euphyy22-276/+694
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-29Fixed bugreport:6074 updated Renewal Def and MDef damage reduction formula. ↵rud0lp204-25/+47
Special thanks to KyleZ. Fixed bugreport:7028 where damage bonus of SR_GATEOFHELL has interchange with normal damage bonus. Fixed bugreport:6946 where CH_PALMSTRIKE causes damage when caster hides after casting. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17062 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-29-Update configure template to autoconf 2.68glighta2-160/+187
-Upd configure to disable warning only when enable-debug option ain't selected. (thus if you wanna see more warnings compile with enable-debug) -Add -Wconversion in configure. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17061 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-29* Added more Malangdo scripts.euphyy5-14/+1441
* Updated quest_db with more translated Malangdo entries. * Added and updated some newer items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-29Old Eleanor work :glighta11-86/+124
-Implement MH_TINDER_BREAKER, STYLE_CHANGE git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17059 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28- Increased MAX_QUEST_DB, follow up to r17056. (bugreport:7058)brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17058 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28* Follow-up r17056.euphyy2-7/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17057 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28* Added a small portion of official Malangdo Episode scripts.euphyy12-55/+1118
* Updated quest_db with translated Malangdo entries. * Fixed strmobinfo() to output empty strings for 'name' instead of zeros (partly follow-up r17055). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17056 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28* Added a point to 'npcskill' documentation.euphyy5-21/+29
* Added Malangdo Tool Dealer. * Fixed quest log sample, which never worked to begin with -- thanks clydelion! * Fixed potential error with clones in custom Hunting Missions script (bugreport:7055). * Follow-up r16990, forgot to commit the EXP fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28Removed the (int)var 'statlimit' from the pc.c to avoid some lines of code ↵ediejohnny1-13/+7
at "pc_setparam" function. Zephyr git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17054 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Fixed bugreport:7052, npcs with monster sprite now work.momacabu2-4/+17
* Follow up to r17052, now it properly resets the x and y coordinate for every npc and checks it after the map. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17053 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Also checks for righty coordinates before actually loading the npc. ↵momacabu1-5/+5
Improves fix for bugreport:419. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17052 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Fixed bugreport:3325, if bHPRecovRate was set to -100 you will actually ↵momacabu1-3/+5
regenerate 1 HP/SP and it shouldn't regenerate at all. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17051 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Fixed bugreport:4687, @lostskill was removing the skill from skill tree ↵momacabu2-4/+3
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-27> Follow-up r17048:euphyy19-452/+271
- Renamed 'useskilltopc' to 'npcskill'; - Removed cast time from NPC objects, code by mkbu95 (suspected official behavior); - Documented 'npcskill'; - Replaced all instances in scripts. * Fixed max level bypass, code by malufett (bugreport:5800). * Updated Malangdo spawns to official. * Some standardization of npc/quests/first_class/. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17049 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27* Implemented `useskilltopc' (tid:74685), and now if desired npcs can carry ↵momacabu4-6/+97
status such as str, atk, def, etc and level. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17048 54d463be-8e91-2dee-dedb-b68131a5f0ec