diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/009-1/jack.txt | |
parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/009-1/jack.txt')
-rw-r--r-- | world/map/npc/009-1/jack.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index 65968d5e..6d7bf498 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -14,7 +14,8 @@ //################################################################################# // Lumberjack -009-1.gat,40,45,0|script|Jack|141,{ +009-1.gat,40,45,0|script|Jack|141, +{ callfunc "ClearVariables"; set @RAWLOGS_AMOUNT, 40; @@ -39,8 +40,11 @@ mes "[Jack Lumber]"; mes "\"Hello there, my name is Jack Lumber, the enemy of all trees. If you need some firewood just let me know.\""; - if (@inspector == 1) - callsub S_NohMask_Ask; + if (@inspector != 1) + goto L_NotInspector; + callsub S_NohMask_Ask; + +L_NotInspector: next; if (@Q_Forestbow < 1) goto L_Close; @@ -96,8 +100,9 @@ L_Bow_state_2: if (@Q_Forestbow > 3) goto L_Bow_state_4; mes "\"Good luck hunting those tree monsters - you will need it.\""; - if (@inspector == 1) - callsub S_NohMask_Ask; + if (@inspector != 1) + goto L_Close; + callsub S_NohMask_Ask; goto L_Close; L_Bow_state_4: |