diff options
author | Wushin <pasekei@gmail.com> | 2015-02-19 23:12:02 -0600 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-02-19 23:12:02 -0600 |
commit | 6b75d81034f0e017f4cec776f3ab00e3e08f7ac4 (patch) | |
tree | 2819bd1a3a98a56cfa475da16be443ecaa912228 /world/map/npc/009-1 | |
parent | 8452669804fc5dfca5a9143a542c11f1e8cc475f (diff) | |
parent | f7f84b8e69075f07fae64cca3da1b1d0a6e98eef (diff) | |
download | serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.gz serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.bz2 serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.tar.xz serverdata-6b75d81034f0e017f4cec776f3ab00e3e08f7ac4.zip |
Merge pull request #281 from wushin/bug-fix
Bug fix
Diffstat (limited to 'world/map/npc/009-1')
-rw-r--r-- | world/map/npc/009-1/jack.txt | 4 | ||||
-rw-r--r-- | world/map/npc/009-1/old_man.txt | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index 206f0c3e..3446c191 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -193,7 +193,7 @@ L_Next10: if (countitem("RawLog") < @RAWLOGS_AMOUNT) goto L_Not_enough_logs; if (Zeny < @SHIELD_COST) - goto L_Not_enough_money; + goto L_not_enough_money; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; @@ -227,7 +227,7 @@ L_Not_enough_logs: mes "\"You don't have enough wood for me to craft this shield; I need a total of " + @RAWLOGS_AMOUNT + " raw logs.\""; goto L_Close; -L_Not_enough_money: +L_not_enough_money: mes "[Jack Lumber]"; mes "\"I'm afraid that you don't have enough gold. I need " + @SHIELD_COST + " GP to finish your shield.\""; goto L_Close; diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt index 5ce64ec1..ca3999ee 100644 --- a/world/map/npc/009-1/old_man.txt +++ b/world/map/npc/009-1/old_man.txt @@ -9,27 +9,27 @@ mes "[Old Man]"; mes "\"Don't let those monsters get to you.\""; next; - if (@inspector == 1) goto L_NohMask_Ask; - if (@inspector == 6) goto L_NohMask_Accuse; + if (@inspector == 1) goto L_Ask; + if (@inspector == 6) goto L_Accuse; goto L_Close; -L_NohMask_Ask: +L_Ask: menu - "Have you seen anything strange lately?", L_NohMask_Ask_Nothing, - "Do you know anything about the recent robberies?", L_NohMask_Ask_Nothing, + "Have you seen anything strange lately?", L_Ask_Nothing, + "Do you know anything about the recent robberies?", L_Ask_Nothing, "I won't, thank you.", L_Close; -L_NohMask_Ask_Nothing: +L_Ask_Nothing: mes "[Old Man]"; mes "\"I'm sorry, but I didn't see anything. You should ask my old woman.\""; goto L_Close; -L_NohMask_Accuse: +L_Accuse: menu - "The leader of the troupe said you hung around them a lot while they were in town.", L_NohMask_Accuse_Respond, + "The leader of the troupe said you hung around them a lot while they were in town.", L_Accuse_Respond, "I won't, thank you.", L_Close; -L_NohMask_Accuse_Respond: +L_Accuse_Respond: mes "[Old Man]"; mes "\"Yes, I hung around the theater a lot. I was an actor when I was younger. But I wasn't there that night. Me and the wife were at home all night.\""; set @inspector, 7; |