diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
| commit | e5ac95f237d5c96c39e3b5573d198138f855e30d (patch) | |
| tree | 09f6b19c3b119d563e3207c2901ce2cc506ee1bb /npc/009-1_Hurnscald | |
| parent | 2a73e3544d6ac4d4f000c621753d70e8695e203c (diff) | |
| parent | b073a508fb4c61ed3cb4f4cc62fc3d892480a6b8 (diff) | |
| download | serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.gz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.bz2 serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.xz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.zip | |
Merge commit 'mainline/master'
Conflicts:
data/021-2.wlk
data/023-1.wlk
Diffstat (limited to 'npc/009-1_Hurnscald')
| -rw-r--r-- | npc/009-1_Hurnscald/jack.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt index eaf9788d..de78e37a 100644 --- a/npc/009-1_Hurnscald/jack.txt +++ b/npc/009-1_Hurnscald/jack.txt @@ -35,8 +35,8 @@ 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.\""; - next; if (Inspector == 1) callsub S_NohMask_Ask; + next; if (@Q_Forestbow < 1) close; menu @@ -240,6 +240,7 @@ L_Shield_state_3: close; S_NohMask_Ask: + next; menu "I'll keep that in mind.", -, "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer; |