diff options
| author | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
|---|---|---|
| committer | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
| commit | ed8cac19500c515cae40c1fd4b2d87abd96ae3ba (patch) | |
| tree | 3136c4b4bac4db3a432384390efcc22f88ff2790 /npc/006-1_Desert_mountains | |
| parent | 21156bed9c3d6eb3cf66a1e1557f4fc8c87a4194 (diff) | |
| parent | 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b (diff) | |
| download | serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.gz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.bz2 serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.xz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.zip | |
merging updates from previous test repo ta-testing.
Diffstat (limited to 'npc/006-1_Desert_mountains')
| -rw-r--r-- | npc/006-1_Desert_mountains/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/006-1_Desert_mountains/pachua.txt | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt index 823e937e..32d267e7 100644 --- a/npc/006-1_Desert_mountains/_warps.txt +++ b/npc/006-1_Desert_mountains/_warps.txt @@ -32,3 +32,4 @@ 006-1.gat,38,121 warp ToCave -1,-1,006-3.gat,38,122 006-1.gat,74,90 warp ToCave -1,-1,006-3.gat,74,91 006-1.gat,51,90 warp ToCave -1,-1,006-3.gat,51,91 +006-1.gat,30,123 warp ToCave -1,-1,032-3.gat,128,31 diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index f4d2a653..b59de60d 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -4,10 +4,12 @@ set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK; + if (QUEST_MIRIAM_start != 0) goto L_smoke; + mes "[Chief Pachua]"; mes "\"How!\""; next; - + if (getequipid(equip_head) == 643 || getequipid(equip_head) == 644) goto L_WearingCowboy; if (getequipid(equip_legs) == 642) goto L_WearingChaps; @@ -195,4 +197,10 @@ L_TooMany: mes "[Chief Pachua]"; mes "\"You don't have room for a leather patch. Come back later.\""; close; + +L_smoke: + message strcharinfo(0), "Parua quickly inhales from his pipe and releases a ring of smoke towards the sky!"; + set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start; + set QUEST_MIRIAM_start, 0; + end; } |