summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-01-07 21:25:14 -0600
committerWushin <pasekei@gmail.com>2015-01-07 21:25:14 -0600
commitb734af239e8ff1e7ea746ea327fb84c62be09b7e (patch)
treecbc5f399ccf8dd226056887a70b9a313f88bee6e /world/map/npc/annuals
parent2c09797ebd2c03b2cbe9a458f8ea8d1fbd04ccff (diff)
parent61c88ec162713b980f30e6e5111c1cfbd9f23d3a (diff)
downloadserverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.gz
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.bz2
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.xz
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.zip
Merge pull request #223 from wushin/moving-tutorial
Move Tutorial to Hurnscald
Diffstat (limited to 'world/map/npc/annuals')
-rw-r--r--world/map/npc/annuals/halloween/config.txt2
-rw-r--r--world/map/npc/annuals/halloween/debug.txt39
-rw-r--r--world/map/npc/annuals/tree_beard.txt8
3 files changed, 5 insertions, 44 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 20fba752..8e9169e8 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -244,7 +244,7 @@ L_Main:
set $@n, $@n + 1;
- set $@halloween_npc_tathin, $@n;
+ set $@halloween_npc_yanis, $@n;
set $@halloween_npc_names$[$@n], "[Tathin]";
set $@halloween_greetings$[$@n], "\"I am employed by the Tonori Government, make sure you abide the regulations we wrote down for Trick-or-Treaters this year...\"";
set $@halloween_trick_notscary$[$@n], "Of course I will... not!";
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 64da1d38..38bed87f 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -139,42 +139,3 @@ L_Close:
set @halloween_npc_id, 0;
close;
}
-009-1.gat,51,38,0|script|HalloweenDebug#1|409
-{
- callfunc "HalloweenDebug";
- goto L_End;
-
-OnInit:
- if(!debug)
- disablenpc "HalloweenDebug#1";
- goto L_End;
-
-L_End:
- end;
-}
-001-1.gat,38,26,0|script|HalloweenDebug#2|409
-{
- callfunc "HalloweenDebug";
- goto L_End;
-
-OnInit:
- if(!debug)
- disablenpc "HalloweenDebug#2";
- goto L_End;
-
-L_End:
- end;
-}
-026-1.gat,23,37,0|script|HalloweenDebug#3|409
-{
- callfunc "HalloweenDebug";
- goto L_End;
-
-OnInit:
- if(!debug)
- disablenpc "HalloweenDebug#3";
- goto L_End;
-
-L_End:
- end;
-}
diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt
index 27cf930e..dc49e865 100644
--- a/world/map/npc/annuals/tree_beard.txt
+++ b/world/map/npc/annuals/tree_beard.txt
@@ -45,25 +45,25 @@
close;
}
-001-1.gat,41,45,0|script|#GhostTreeThree|133
+001-1.gat,58,75,0|script|#GhostTreeThree|133
{
callfunc "HalloweenTree";
close;
}
-001-1.gat,41,45,0|script|#PalmTree|384
+001-1.gat,58,75,0|script|#PalmTree|384
{
end;
}
-001-1.gat,41,46,0|script|Present#3|386
+001-1.gat,58,76,0|script|Present#3|386
{
callfunc "XmasStates";
callfunc "XmasMainItemReward";
close;
}
-001-1.gat,41,45,0|script|#XmasPalmTree|383
+001-1.gat,58,75,0|script|#XmasPalmTree|383
{
end;
}