diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-22 18:05:23 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-22 18:05:23 +0000 |
| commit | bc6ac0943bd618ae8cc484ba517d75d417e612a7 (patch) | |
| tree | 2aaf9855dd3623a5d9d497adb9fa042f88010b1d | |
| parent | 6e092fb71e98c4a13658eb4d18a228b73f987819 (diff) | |
| download | hercules-bc6ac0943bd618ae8cc484ba517d75d417e612a7.tar.gz hercules-bc6ac0943bd618ae8cc484ba517d75d417e612a7.tar.bz2 hercules-bc6ac0943bd618ae8cc484ba517d75d417e612a7.tar.xz hercules-bc6ac0943bd618ae8cc484ba517d75d417e612a7.zip | |
- Fixed a typo in eA Job System documentation.
- Fixed some bugs in Cursed Spirit quest. (bugreport:4914, bugreport:4917)
- Changed <dir> in movenpc to wrap around if the number is < 0 or > 7.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14830 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | doc/ea_job_system.txt | 2 | ||||
| -rw-r--r-- | npc/quests/quests_lighthalzen.txt | 4 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/ea_job_system.txt b/doc/ea_job_system.txt index 8e2d1c3ba..1ca05d6ce 100644 --- a/doc/ea_job_system.txt +++ b/doc/ea_job_system.txt @@ -102,7 +102,7 @@ EAJL_UPPER: EAJL_BABY: Check if a class is an adopted class. - if (@job&EAJ_BABY) + if (@job&EAJL_BABY) mes "Don't you hate being weak?"; EAJ_UPPERMASK: diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 83b18916b..27f46018f 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -3807,7 +3807,7 @@ OnTouch_: soundeffect "tao_gunka_stand.wav",0; sc_end SC_Blind; sc_start SC_Curse,3000,0; - if (!lhz_curse == 6) set lhz_curse,7; + if (lhz_curse == 6) set lhz_curse,7; } } end; @@ -3887,7 +3887,7 @@ OnTouch_: mes "............"; next; mes "............"; - close; + close2; soundeffect "tao_gunka_stand.wav",0; sc_end SC_Blind; sc_start SC_Curse,3000,0; diff --git a/src/map/script.c b/src/map/script.c index bf0b4f652..c635f6112 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11788,7 +11788,7 @@ BUILDIN_FUNC(movenpc) return -1; if (script_hasdata(st,5)) - nd->ud.dir = script_getnum(st,5); + nd->ud.dir = script_getnum(st,5) % 8; npc_movenpc(nd, x, y); return 0; } |