Run 'make maps' for pentagram maps.

22 files changed, 203 insertions, 0 deletions

diff --git a/client-data b/client-data
-Subproject 1a0c6caf0087ac99f0251eb0b14a53416b9375e
+Subproject 40fe957c3ebc42d83ed6f6b77f9719303d2a81a
diff --git a/world/map/data/018-1.wlk b/world/map/data/018-1.wlk
index b2d479ac..05b6b198 100644
--- a/world/map/data/018-1.wlk
+++ b/world/map/data/018-1.wlk
diff --git a/world/map/data/018-3.wlk b/world/map/data/018-3.wlk
index 81ad43d1..5071bdfd 100644
--- a/world/map/data/018-3.wlk
+++ b/world/map/data/018-3.wlk
diff --git a/world/map/data/048-1.wlk b/world/map/data/048-1.wlk
index 142aceff..fa270ad2 100644
--- a/world/map/data/048-1.wlk
+++ b/world/map/data/048-1.wlk
diff --git a/world/map/data/055-1.wlk b/world/map/data/055-1.wlk
new file mode 100644
index 00000000..5c4ace3f
--- /dev/null
+++ b/world/map/data/055-1.wlk
diff --git a/world/map/data/055-3.wlk b/world/map/data/055-3.wlk
new file mode 100644
index 00000000..6c8c1fa0
--- /dev/null
+++ b/world/map/data/055-3.wlk
diff --git a/world/map/data/056-1.wlk b/world/map/data/056-1.wlk
new file mode 100644
index 00000000..9ccf9311
--- /dev/null
+++ b/world/map/data/056-1.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index d6ea6918..2c6e2f2f 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -93,4 +93,7 @@
 047-1.gat#047-1.wlk#
 048-1.gat#048-1.wlk#
 048-2.gat#048-2.wlk#
+055-1.gat#055-1.wlk#
+055-3.gat#055-3.wlk#
+056-1.gat#056-1.wlk#
 botcheck.gat#botcheck.wlk#
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index 0fe0a18a..1d057212 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -5,3 +5,4 @@
 013-1.gat,20,76|warp|To Woodland Hills|-1,2,012-1.gat,149,60
 013-1.gat,46,20|warp|To Woodland Hills|2,-1,017-1.gat,46,104
 013-1.gat,42,90|warp|To Magic House|-1,-1,013-2.gat,63,41
+013-1.gat,136,52|warp|To Woodland Hills|-1,2,055-1.gat,25,52
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index d0ce12a7..8bcb722d 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -6,3 +6,4 @@
 017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,51,48
 017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,83,33
 017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,72,67
+017-1.gat,135,56|warp|to Woods|-1,1,056-1.gat,24,29
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index c6de8d75..67e45f36 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -17,3 +17,4 @@
 018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28
 018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18
 018-1.gat,64,70|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21
+018-1.gat,78,34|warp|To Northern Mine|-1,-1,018-3.gat,107,147
diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index 851be1d3..8ac68827 100644
--- a/world/map/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
@@ -22,3 +22,4 @@
 018-3.gat,174,85|warp|To Woodland Hills Cave|-1,-1,013-3.gat,62,99
 018-3.gat,102,69|warp|To Woodland Hills Cave|-1,-1,013-3.gat,68,96
 018-3.gat,179,181|warp|To Hurnscald Cave|-1,-1,009-3.gat,157,31
+018-3.gat,107,146|warp|To Woodland Mining Camp|-1,-1,018-1.gat,78,33
diff --git a/world/map/npc/055-1/_import.txt b/world/map/npc/055-1/_import.txt
new file mode 100644
index 00000000..1fc666e6
--- /dev/null
+++ b/world/map/npc/055-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 055-1: Woodland Hills
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 055-1.gat
+npc: npc/055-1/_mobs.txt
+npc: npc/055-1/_warps.txt
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
new file mode 100644
index 00000000..b0320021
--- /dev/null
+++ b/world/map/npc/055-1/_mobs.txt
@@ -0,0 +1,85 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woodland Hills mobs
+
+055-1.gat,68,72,22,19|monster|Spawn Butterfly|1055,16,10000,85000,Mob055-1::On1055
+055-1.gat,87,29,55,14|monster|Spawn Silk Worm|1035,15,10000,85000,Mob055-1::On1035
+055-1.gat,79,30,84,17|monster|Spawn Silk Worm|1038,10,10000,45000,Mob055-1::On1038
+055-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,12,10000,85000,Mob055-1::On1028
+055-1.gat,91,49,6,4|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,103,54,5,3|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,64,75,27,16|monster|Spawn Clover Patch|1037,1,10000,120000,Mob055-1::On1037
+055-1.gat,80,34,82,25|monster|Spawn snail|1041,3,10000,85000,Mob055-1::On1041
+055-1.gat,70,72,17,24|monster|Spawn Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,81,32,81,22|monster|Spawn Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,0,0,0,0|monster|Spawn Mauve Plant|1029,7,10000,55000,Mob055-1::On1029
+055-1.gat,0,0,0,0|monster|Spawn Cobalt Plant|1030,3,10000,60000,Mob055-1::On1030
+055-1.gat,0,0,0,0|monster|Spawn Gamboge Plant|1031,2,10000,60000,Mob055-1::On1031
+055-1.gat,116,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,97,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,64,73,23,17|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,0,0,0,0|monster|Spawn Spikey Mushroom|1019,5,10000,60000,Mob055-1::On1019
+
+
+055-1.gat,0,0,0|script|Mob055-1|-1,{
+On1014:
+    set @mobID, 1014;
+    callfunc "MobPoints";
+    end;
+
+On1019:
+    set @mobID, 1019;
+    callfunc "MobPoints";
+    end;
+
+On1028:
+    set @mobID, 1028;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1030:
+    set @mobID, 1030;
+    callfunc "MobPoints";
+    end;
+
+On1031:
+    set @mobID, 1031;
+    callfunc "MobPoints";
+    end;
+
+On1032:
+    set @mobID, 1032;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
+On1037:
+    set @mobID, 1037;
+    callfunc "MobPoints";
+    end;
+
+On1038:
+    set @mobID, 1038;
+    callfunc "MobPoints";
+    end;
+
+On1041:
+    set @mobID, 1041;
+    callfunc "MobPoints";
+    end;
+
+On1055:
+    set @mobID, 1055;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
new file mode 100644
index 00000000..d12f3bd4
--- /dev/null
+++ b/world/map/npc/055-1/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woodland Hills warps
+
+055-1.gat,100,82|warp|To Cave|-1,-1,055-3.gat,30,27
+055-1.gat,100,89|warp|To Cave|-1,-1,055-3.gat,50,41
+055-1.gat,24,52|warp|To Woodland Hills|-1,3,013-1.gat,135,51
+055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39
+055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70
+055-1.gat,75,20|warp|To Woods|0,-1,056-1.gat,74,75
diff --git a/world/map/npc/055-3/_import.txt b/world/map/npc/055-3/_import.txt
new file mode 100644
index 00000000..52181f7e
--- /dev/null
+++ b/world/map/npc/055-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 055-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 055-3.gat
+npc: npc/055-3/_mobs.txt
+npc: npc/055-3/_warps.txt
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
new file mode 100644
index 00000000..9499d05a
--- /dev/null
+++ b/world/map/npc/055-3/_mobs.txt
@@ -0,0 +1,44 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave mobs
+
+055-3.gat,45,44,20,14|monster|Spawn Red Slime|1008,13,10000,60000,Mob055-3::On1008
+055-3.gat,0,0,1,1|monster|Spawn Bats|1017,20,10000,45000,Mob055-3::On1017
+055-3.gat,53,75,28,40|monster|Spawn Yellow Slime|1007,13,10000,60000,Mob055-3::On1007
+055-3.gat,0,0,1,1|monster|Spawn Black Scorpion|1009,10,10000,35000,Mob055-3::On1009
+055-3.gat,0,0,1,1|monster|Spawn Spider|1012,10,10000,35000,Mob055-3::On1012
+055-3.gat,0,0,1,1|monster|Spawn Snake|1010,3,10000,20000,Mob055-3::On1010
+
+
+055-3.gat,0,0,0|script|Mob055-3|-1,{
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1008:
+    set @mobID, 1008;
+    callfunc "MobPoints";
+    end;
+
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
+On1010:
+    set @mobID, 1010;
+    callfunc "MobPoints";
+    end;
+
+On1012:
+    set @mobID, 1012;
+    callfunc "MobPoints";
+    end;
+
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/055-3/_warps.txt b/world/map/npc/055-3/_warps.txt
new file mode 100644
index 00000000..cc320f4e
--- /dev/null
+++ b/world/map/npc/055-3/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave warps
+
+055-3.gat,77,40|warp|To Woodland Hills|0,-1,055-1.gat,137,97
+055-3.gat,30,26|warp|To Woodland Hills|-1,-1,055-1.gat,100,81
+055-3.gat,50,42|warp|To Outside|-1,-1,055-1.gat,100,90
+055-3.gat,96,71|warp|To Woodland Hills|0,-1,055-1.gat,60,94
+055-3.gat,58,96|warp|To Cave|0,-1,055-3.gat,98,115
+055-3.gat,98,114|warp|To Cave|-1,-1,055-3.gat,57,94
diff --git a/world/map/npc/056-1/_import.txt b/world/map/npc/056-1/_import.txt
new file mode 100644
index 00000000..8266df52
--- /dev/null
+++ b/world/map/npc/056-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 056-1: Woods
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 056-1.gat
+npc: npc/056-1/_mobs.txt
+npc: npc/056-1/_warps.txt
diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt
new file mode 100644
index 00000000..8c18e38a
--- /dev/null
+++ b/world/map/npc/056-1/_mobs.txt
@@ -0,0 +1,26 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woods mobs
+
+056-1.gat,0,0,0,0|monster|Spawn Evil Mushroom|1013,10,10000,45000,Mob056-1::On1013
+056-1.gat,0,0,0,0|monster|Spawn Log Head|1025,10,10000,45000,Mob056-1::On1025
+056-1.gat,0,0,0,0|monster|Spawn Mauve Herb|1029,2,10000,85000,Mob056-1::On1029
+
+
+056-1.gat,0,0,0|script|Mob056-1|-1,{
+On1013:
+    set @mobID, 1013;
+    callfunc "MobPoints";
+    end;
+
+On1025:
+    set @mobID, 1025;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/056-1/_warps.txt b/world/map/npc/056-1/_warps.txt
new file mode 100644
index 00000000..35cb572e
--- /dev/null
+++ b/world/map/npc/056-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woods warps
+
+056-1.gat,74,76|warp|To Woodland Hills|-1,-1,055-1.gat,74,21
+056-1.gat,23,29|warp|To Woodland Hills|-1,3,017-1.gat,134,56
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index eebe2a40..f64a79c0 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -93,4 +93,7 @@ import: npc/046-3/_import.txt
 import: npc/047-1/_import.txt
 import: npc/048-1/_import.txt
 import: npc/048-2/_import.txt
+import: npc/055-1/_import.txt
+import: npc/055-3/_import.txt
+import: npc/056-1/_import.txt
 import: npc/botcheck/_import.txt