summaryrefslogtreecommitdiff
path: root/world/map/npc/easter
diff options
context:
space:
mode:
authorVincent Petithory <vincent.petithory@gmail.com>2012-12-01 00:23:58 +0100
committerVincent Petithory <vincent.petithory@gmail.com>2012-12-01 00:23:58 +0100
commitd328d77f6601645e15890a4e48431bec44c0716a (patch)
tree67387a7063f5142960fed13423a3751d688ba794 /world/map/npc/easter
parenta6aa02bb42c8742222e21e3e8901e126a99e99d8 (diff)
downloadserverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.gz
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.bz2
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.xz
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.zip
Update easter 2010 scripts / magic / warps for the map changes of 028-1.
Diffstat (limited to 'world/map/npc/easter')
-rw-r--r--world/map/npc/easter/2010/Blocker.txt2
-rw-r--r--world/map/npc/easter/2010/Doctor.txt2
-rw-r--r--world/map/npc/easter/2010/Doctor2.txt2
-rw-r--r--world/map/npc/easter/2010/Doctor3.txt2
-rw-r--r--world/map/npc/easter/2010/Doctor4.txt2
-rw-r--r--world/map/npc/easter/2010/helper.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/world/map/npc/easter/2010/Blocker.txt b/world/map/npc/easter/2010/Blocker.txt
index 64502411..491180a7 100644
--- a/world/map/npc/easter/2010/Blocker.txt
+++ b/world/map/npc/easter/2010/Blocker.txt
@@ -1,4 +1,4 @@
-028-1.gat,114,121,0 script #28Barrier#_M 127,1,1{
+028-1.gat,120,124,0 script #28Barrier#_M 127,1,1{
end;
OnTouch:
if (($Easter_2010_Npc_State2 >> E10_BARRIER_SHIFT) & E10_BARRIER_MASK == E10_BARRIER_ACTIVE) goto L_block;
diff --git a/world/map/npc/easter/2010/Doctor.txt b/world/map/npc/easter/2010/Doctor.txt
index 78097fd6..c6d20bfa 100644
--- a/world/map/npc/easter/2010/Doctor.txt
+++ b/world/map/npc/easter/2010/Doctor.txt
@@ -1,6 +1,6 @@
// Doctor 1, at the big tree.
-028-1.gat,21,105,0 script Doctor#who1 184,{
+028-1.gat,27,108,0 script Doctor#who1 184,{
// States here
callsub S_Helped_Count;
if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
diff --git a/world/map/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt
index 02a2e7f7..c98f71c2 100644
--- a/world/map/npc/easter/2010/Doctor2.txt
+++ b/world/map/npc/easter/2010/Doctor2.txt
@@ -1,6 +1,6 @@
// Doctor 2, at the island.
-028-1.gat,83,34,0 script Doctor#who2 184,{
+028-1.gat,89,37,0 script Doctor#who2 184,{
// States here
callsub S_Helped_Count;
if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
diff --git a/world/map/npc/easter/2010/Doctor3.txt b/world/map/npc/easter/2010/Doctor3.txt
index e0ee86bd..7d8bfa8c 100644
--- a/world/map/npc/easter/2010/Doctor3.txt
+++ b/world/map/npc/easter/2010/Doctor3.txt
@@ -1,6 +1,6 @@
// Doctor 3, at the stones.
-028-1.gat,65,95,0 script Doctor#who3 184,{
+028-1.gat,71,98,0 script Doctor#who3 184,{
// States here
callsub S_Helped_Count;
if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
diff --git a/world/map/npc/easter/2010/Doctor4.txt b/world/map/npc/easter/2010/Doctor4.txt
index fde80fca..3cb761e0 100644
--- a/world/map/npc/easter/2010/Doctor4.txt
+++ b/world/map/npc/easter/2010/Doctor4.txt
@@ -1,6 +1,6 @@
// Doctor 4, at the fruit trees.
-028-1.gat,116,69,0 script Doctor#who4 184,{
+028-1.gat,122,72,0 script Doctor#who4 184,{
// States here
callsub S_Helped_Count;
if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
diff --git a/world/map/npc/easter/2010/helper.txt b/world/map/npc/easter/2010/helper.txt
index 2dfccae1..aaa9b42e 100644
--- a/world/map/npc/easter/2010/helper.txt
+++ b/world/map/npc/easter/2010/helper.txt
@@ -1,4 +1,4 @@
-028-1.gat,130,47,0 script Control#Helper 127,{
+028-1.gat,136,50,0 script Control#Helper 127,{
close;
OnBarrierEnable: