From 2c8e25d9b2efd1d8f051db3bd1c7676a044994f1 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 12 Feb 2013 00:24:41 -0800 Subject: o11c's review of inspector --- world/map/npc/009-1/jack.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'world/map/npc/009-1') diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index 4ccc5d82..9e1ebbe1 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -144,12 +144,13 @@ L_Shield_state_1: if (@inspector == 1) menu "No thanks.", L_Close, - "Yes, please!", -, + "Yes, please!", L_Yes, "Actually, I'd like to know if you've seen any strange happenings in town.", L_NohMask_Answer; - if (@inspector != 1) - menu - "No thanks.", L_Close, - "Yes, please!", -; + menu + "No thanks.", L_Close, + "Yes, please!", L_Yes; + +L_Yes: mes "[Jack Lumber]"; mes "\"All I need is " + @RAWLOGS_AMOUNT + " raw logs. This needn't be highest-quality wood; pretty much any log you can find should work. Oh, and I'll also need " + @SHIELD_COST + " GP for other materials.\""; next; @@ -211,12 +212,15 @@ L_TooMany: L_Shield_state_3: mes "[Jack Lumber]"; mes "\"I hope that my shield will serve you well!\""; + if (@inspector != 1) + goto L_Close; next; - if (@inspector == 1) - menu - "Me too.", L_Close, - "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer; + menu + "Me too.", L_Close, + "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer; +// This is an ugly violation of the scripting standards, +// but it's somewhat complicated to fix. S_NohMask_Ask: next; menu -- cgit v1.2.3-70-g09d2