Merge pull request #231 from wushin/attaching-nivalis

Attaching Nivalis to Hurnscald

3 files changed, 5 insertions, 28 deletions

diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 551c59f6..80097356 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -18,12 +18,12 @@ L_Hint:
     mes "[Orum's Homunculus]";
     mes "\"What are you doing? Come, see me in the caves below!\"";
     mes "\"I said go north till you reach the snoman. Then head into the cave to the east.\"";
-    warp "030-1",99,55;
+    warp "020-1.gat",33,94;
     close;
 
 L_Warp:
     message strcharinfo(0), "I said get out, We've no time for your kind here.";
-    warp "030-1",99,55;
+    warp "020-1.gat",33,94;
     end;
 
 L_Return:
@@ -67,7 +67,7 @@ L_Close:
 
 // Annual Xmas secret passage to a trapdoor in Santa's Inn Basement
 
-030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1
+030-3.gat,27,24,0|script|SmallCrack#XmasPassage|400,0,1
 {
     callfunc "XmasStates";
 
@@ -149,7 +149,7 @@ L_XmasMain:
         "No.", L_Close;
 
 L_Open:
-    warp "030-3.gat",100,50;
+    warp "030-3.gat",27,26;
     goto L_Close;
 
 L_NotActive:
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index 248321fb..ffde9f3d 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -171,7 +171,7 @@ L_Close:
     close;
 }
 
-030-1.gat,91,48,0|script|XmasDebug#1|105
+020-1.gat,86,76,0|script|XmasDebug#5|105
 {
     callfunc "XmasDebug";
     goto L_End;
@@ -226,17 +226,3 @@ OnInit:
 L_End:
     end;
 }
-
-020-1.gat,86,76,0|script|XmasDebug#5|105
-{
-    callfunc "XmasDebug";
-    goto L_End;
-
-OnInit:
-    if(!(debug))
-        disablenpc "XmasDebug#5";
-    goto L_End;
-
-L_End:
-    end;
-}
diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index 59f48cb7..897054c9 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -72,15 +72,6 @@ OnTally:
     end;
 }
 
-030-1.gat,0,0,0|script|XmasSpawnCounter#2|400
-{
-    end;
-
-OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
-    end;
-}
-
 030-3.gat,0,0,0|script|XmasSpawnCounter#3|400
 {
     end;