fix a few mapping issues in celestia's house

17 files changed, 172 insertions, 23 deletions

diff --git a/client-data b/client-data
-Subproject 1fc90078c1593255a422c255a7914da7692c66c
+Subproject da61a45e3da185ce8e026e1c1ef2421e614add8
diff --git a/tools b/tools
-Subproject e6fb3a07714dec721d0216982fcc1ccef68af2c
+Subproject 6d424594e01d129f3c219190310a9535032ab59
diff --git a/world/map/data/009-8.wlk b/world/map/data/009-8.wlk
index 838fcfe2..ad21748d 100644
--- a/world/map/data/009-8.wlk
+++ b/world/map/data/009-8.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index cc601fc9..108c7753 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -105,6 +105,7 @@
 055-3#055-3.wlk#
 056-2#056-2.wlk#
 057-1#057-1.wlk#
+069-2#069-2.wlk#
 070-1#070-1.wlk#
 070-3#070-3.wlk#
 botcheck#botcheck.wlk#
diff --git a/world/map/npc/003-1/_import.txt b/world/map/npc/003-1/_import.txt
index 555646be..d1e00223 100644
--- a/world/map/npc/003-1/_import.txt
+++ b/world/map/npc/003-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-1: Tulimshar
+// Map 003-1: 2006 Tulimshar
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 003-1
 npc: npc/003-1/_mobs.txt
diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index 4526c2e1..ebd36458 100644
--- a/world/map/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Tulimshar mobs
+// 2006 Tulimshar mobs
 
diff --git a/world/map/npc/003-1/_nodes.txt b/world/map/npc/003-1/_nodes.txt
index 1e27ac84..e0c675b7 100644
--- a/world/map/npc/003-1/_nodes.txt
+++ b/world/map/npc/003-1/_nodes.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Tulimshar nodes
+// 2006 Tulimshar nodes
 
 // (no nodes)
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
index 63913b5b..369badcd 100644
--- a/world/map/npc/003-1/_warps.txt
+++ b/world/map/npc/003-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Tulimshar warps
+// 2006 Tulimshar warps
 
diff --git a/world/map/npc/009-8/_warps.txt b/world/map/npc/009-8/_warps.txt
index ff75c4ab..e3e8d45c 100644
--- a/world/map/npc/009-8/_warps.txt
+++ b/world/map/npc/009-8/_warps.txt
@@ -1,5 +1,16 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Chez Celestia warps
 
-009-8,26,22|warp|-1,-1,009-1,74,50
-009-8,22,34|warp|-1,-1,009-1,72,54
+009-8,26,122|warp|-1,-1,009-1,74,50
+009-8,22,134|warp|-1,-1,009-1,72,54
+009-8,56,55|warp|0,-1,069-2,44,127
+009-8,53,40|warp|-1,-1,069-2,97,127
+009-8,58,40|warp|-1,-1,069-2,116,127
+009-8,79,99|warp|-1,-1,069-2,117,61
+009-8,87,78|warp|-1,-1,069-2,86,61
+009-8,87,56|warp|-1,-1,069-2,55,61
+009-8,79,39|warp|-1,-1,069-2,24,61
+009-8,33,39|warp|-1,-1,069-2,117,30
+009-8,24,56|warp|-1,-1,069-2,86,30
+009-8,24,78|warp|-1,-1,069-2,55,30
+009-8,32,98|warp|-1,-1,069-2,24,30
diff --git a/world/map/npc/009-8/celestia.txt b/world/map/npc/009-8/celestia.txt
index 9aa5ef3a..67aa9366 100644
--- a/world/map/npc/009-8/celestia.txt
+++ b/world/map/npc/009-8/celestia.txt
@@ -16,7 +16,7 @@
 // 205  killed 200 yetis
 // 206  got reward
 
-009-8,31,23,0|script|Celestia|144
+009-8,31,123,0|script|Celestia|144
 {
     callfunc "CelestiaState";
     if (getequipid(equip_head) == 4027) // check if yeti mask (4027) is equipped
@@ -294,13 +294,144 @@ function|script|CelestiaState
 
 009-1,74,50,0|script|Celestia Door|32767,0,0
 {
-    warp "009-8", 26, 23;
+    warp "009-8", 26, 123;
     callfunc "CelestiaState";
     end;
 }
 009-1,72,54,0|script|Celestia BackDoor|32767,0,0
 {
-    warp "009-8", 23, 34;
+    warp "009-8", 23, 134;
     callfunc "CelestiaState";
     end;
 }
+009-8,83,125,0|script|#cont-warp7|32767,0,0
+{
+    warp "009-8", 39, 126;
+    end;
+}
+009-8,40,125,0|script|Celestia Basement|32767,0,0
+{
+    if (countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)||
+        strcharinfo(1) == "Celestia's Tea Party")
+        warp "009-8", 82, 126;
+    if (strcharinfo(1) != "Celestia's Tea Party")
+        sendcollision "009-8", 1, 62, 105, 77, 123;
+    end;
+
+OnPCLoginEvent:
+    if (strcharinfo(1) != "Celestia's Tea Party" && getmap() == "009-8")
+        sendcollision "009-8", 1, 62, 105, 77, 123;
+    end;
+}
+009-8,68,123,0|script|Celestia Interceptor|32767,1,0
+{
+    if (strcharinfo(1) != "Celestia's Tea Party")
+        goto L_Stomp;
+    mapmask 1 | 8;
+    end;
+
+L_Stomp:
+    set Hp, 0;
+    end;
+}
+
+009-8,69,112,0|script|Celestia Mask1|32767,0,0
+{
+    set @cel_dir, 0;
+    end;
+}
+
+009-8,69,113,0|script|Celestia Mask0|32767,0,0
+{
+    if (@cel_dir == 1)
+        mapmask 1 | 4;
+    else
+        mapmask 1 | 8;
+    end;
+
+OnPCLoginEvent:
+    if (getmap() != "009-8" || strcharinfo(1) != "Celestia's Tea Party")
+        end;
+
+    if (POS_Y >= 123)
+        mapmask 1 | 2 | 8;
+    elif (POS_Y >= 113)
+        mapmask 1 | 8;
+    else
+        mapmask 1 | 4;
+    end;
+}
+
+009-8,69,114,0|script|Celestia Mask2|32767,0,0
+{
+    set @cel_dir, 1;
+    end;
+}
+
+// re-apply masks on exit:
+069-2,97,127,0|script|Celestia Mask3|32767,1,0
+{
+    warp "009-8", 53, 41;
+    mapmask 1 | 4;
+    end;
+}
+069-2,116,127,0|script|Celestia Mask4|32767,1,0
+{
+    warp "009-8", 58, 41;
+    mapmask 1 | 4;
+    end;
+}
+069-2,44,127,0|script|Celestia Mask5|32767,2,0
+{
+    warp "009-8", 56, 56;
+    mapmask 1 | 4;
+    end;
+}
+069-2,117,62,0|script|Celestia Mask6|32767,0,0
+{
+    warp "009-8", 79, 100;
+    mapmask 1 | 4;
+    end;
+}
+069-2,86,62,0|script|Celestia Mask7|32767,0,0
+{
+    warp "009-8", 87, 79;
+    mapmask 1 | 4;
+    end;
+}
+069-2,55,62,0|script|Celestia Mask8|32767,0,0
+{
+    warp "009-8", 87, 57;
+    mapmask 1 | 4;
+    end;
+}
+069-2,24,62,0|script|Celestia Mask9|32767,0,0
+{
+    warp "009-8", 79, 40;
+    mapmask 1 | 4;
+    end;
+}
+069-2,117,31,0|script|Celestia Mask10|32767,0,0
+{
+    warp "009-8", 33, 40;
+    mapmask 1 | 4;
+    end;
+}
+069-2,86,31,0|script|Celestia Mask11|32767,0,0
+{
+    warp "009-8", 24, 57;
+    mapmask 1 | 4;
+    end;
+}
+069-2,55,31,0|script|Celestia Mask12|32767,0,0
+{
+    warp "009-8", 24, 79;
+    mapmask 1 | 4;
+    end;
+}
+069-2,24,31,0|script|Celestia Mask13|32767,0,0
+{
+    warp "009-8", 32, 99;
+    mapmask 1 | 4;
+    end;
+}
diff --git a/world/map/npc/009-8/mapflags.txt b/world/map/npc/009-8/mapflags.txt
index 2883b7a4..2c82cbfc 100644
--- a/world/map/npc/009-8/mapflags.txt
+++ b/world/map/npc/009-8/mapflags.txt
@@ -1,2 +1,3 @@
 009-8|mapflag|town
 009-8|mapflag|resave|009-2,149,43
+009-8|mapflag|mask|11
diff --git a/world/map/npc/016-2/contributor.txt b/world/map/npc/016-2/contributor.txt
index 7cb89935..af3e087e 100644
--- a/world/map/npc/016-2/contributor.txt
+++ b/world/map/npc/016-2/contributor.txt
@@ -39,17 +39,3 @@
         warp "004-5", 77, 66;
     end;
 }
-
-009-8,40,26,0|script|#cont-warp6|32767,0,0
-{
-    if (countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)||
-        strcharinfo(1) == "Celestia's Tea Party")
-        warp "009-8", 82, 26;
-    end;
-}
-
-009-8,83,25,0|script|#cont-warp7|32767,0,0
-{
-    warp "009-8", 39, 26;
-    end;
-}
diff --git a/world/map/npc/069-2/_import.txt b/world/map/npc/069-2/_import.txt
new file mode 100644
index 00000000..b612a57e
--- /dev/null
+++ b/world/map/npc/069-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 069-2: Celestia's Hideout
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 069-2
+npc: npc/069-2/_mobs.txt
+npc: npc/069-2/_nodes.txt
+npc: npc/069-2/_warps.txt
diff --git a/world/map/npc/069-2/_mobs.txt b/world/map/npc/069-2/_mobs.txt
new file mode 100644
index 00000000..f37d0ff5
--- /dev/null
+++ b/world/map/npc/069-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Celestia's Hideout mobs
+
diff --git a/world/map/npc/069-2/_nodes.txt b/world/map/npc/069-2/_nodes.txt
new file mode 100644
index 00000000..514d7f41
--- /dev/null
+++ b/world/map/npc/069-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Celestia's Hideout nodes
+
+// (no nodes)
diff --git a/world/map/npc/069-2/_warps.txt b/world/map/npc/069-2/_warps.txt
new file mode 100644
index 00000000..61131831
--- /dev/null
+++ b/world/map/npc/069-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Celestia's Hideout warps
+
+069-2,45,83|warp|2,-1,069-2,106,116
+069-2,107,117|warp|2,-1,069-2,44,84
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 82ef2723..02d14987 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -107,6 +107,7 @@ import: npc/055-1/_import.txt
 import: npc/055-3/_import.txt
 import: npc/056-2/_import.txt
 import: npc/057-1/_import.txt
+import: npc/069-2/_import.txt
 import: npc/070-1/_import.txt
 import: npc/070-3/_import.txt
 import: npc/botcheck/_import.txt