diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/009-1/jack.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/009-1/jack.txt')
| -rw-r--r-- | world/map/npc/009-1/jack.txt | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index 6d7bf498..cbdb0558 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -219,11 +219,11 @@ 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) + goto L_Made_Shield; menu - "Me too.", L_Close, + "Me too.", L_Made_Shield, "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, @@ -240,6 +240,32 @@ L_NohMask_Answer: mes "\"Sorry, no.\""; goto L_Close; +L_Made_Shield: + next; + mes "[Jack Lumber]"; + mes "\"Speaking of that shield...\""; + mes "\"It has put me behind on all these new Nivalis orders, now that the ship is running there.\""; + next; + mes "\"Care to help out? I'll pay you for your time.\""; + +L_Daily: + set @dq_level, 30; + set @dq_cost, 25; + set @dq_count, 30; + set @dq_name$, "RawLog"; + set @dq_friendly_name$, "raw logs"; + set @dq_money, 4000; + set @dq_exp, 4000; + + callfunc "DailyQuest"; + + next; + + mes "[Jack Lumber]"; + mes "\"Check back with me tomorrow to see if I need any help with that shipment.\""; + + goto L_Close; + L_Close: set @inspector, 0; close; |