summaryrefslogtreecommitdiff
path: root/world/map/npc/006-1
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-04-11 14:32:22 -0500
committerwushin <pasekei@gmail.com>2014-04-15 20:26:28 -0500
commit47f790759ea3ea56d31e000bc3f3b7f142ee802d (patch)
tree369dc32bddb447076c5cf9298f6624366aa03ce2 /world/map/npc/006-1
parent6e9543af67c5e027269bfc32e9c6f36111f3832a (diff)
downloadserverdata-47f790759ea3ea56d31e000bc3f3b7f142ee802d.tar.gz
serverdata-47f790759ea3ea56d31e000bc3f3b7f142ee802d.tar.bz2
serverdata-47f790759ea3ea56d31e000bc3f3b7f142ee802d.tar.xz
serverdata-47f790759ea3ea56d31e000bc3f3b7f142ee802d.zip
Npcs remaining script fixes
Npcs changed for travel Npcs changed for new maps Npcs changed for basic crypts
Diffstat (limited to 'world/map/npc/006-1')
-rw-r--r--world/map/npc/006-1/mika.txt2
-rw-r--r--world/map/npc/006-1/pachua.txt15
2 files changed, 7 insertions, 10 deletions
diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt
index 2b5c7401..d7ba11bc 100644
--- a/world/map/npc/006-1/mika.txt
+++ b/world/map/npc/006-1/mika.txt
@@ -1,4 +1,4 @@
-006-1.gat,39,27,0|script|Mika|114,
+006-1.gat,39,22,0|script|Mika|114,
{
mes "[Mika]";
mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index 9ed34c06..43681d84 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -1,14 +1,11 @@
-006-1.gat,23,100,0|script|Pachua|143,
+006-1.gat,24,113,0|script|Pachua|143,
{
- set @LEATHER_PATCH_PRICE, 300;
-// @wants_leather_patch is used as boolean
- set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
-
- if ((gettime(5) >= $@xmas2011_start_day) && (gettime(5) < $@xmas2011_reward_start_day) && (gettime(6) == 12) && (gettime(7) == $@xmas2011_year))
- set @wants_leather_patch, @wants_leather_patch | (xmas11 & $@xmas11_talkedToChief);
+ setarray $@npc_loc, 24, 113, 4;
+ callfunc "PCtoNPCRange";
+ if (@npc_check)
+ goto L_Close;
- set $@xmas2011_start_day, 10;
- set $@xmas2011_reward_start_day, 25;
+ set @LEATHER_PATCH_PRICE, 300;
if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
if (QUEST_MIRIAM_start != 0) goto L_smoke;