Make maps, and ask Dan to handle 002-3 pious too

12 files changed, 16 insertions, 7 deletions

diff --git a/maps/re/002-1.mcache b/maps/re/002-1.mcache
index df341041d..ef0be6c57 100644
--- a/maps/re/002-1.mcache
+++ b/maps/re/002-1.mcache
diff --git a/maps/re/002-2.mcache b/maps/re/002-2.mcache
index b4ee24d34..646a8e063 100644
--- a/maps/re/002-2.mcache
+++ b/maps/re/002-2.mcache
diff --git a/maps/re/002-3.mcache b/maps/re/002-3.mcache
index df2f1da9a..f9a23ef23 100644
--- a/maps/re/002-3.mcache
+++ b/maps/re/002-3.mcache
diff --git a/maps/re/003-1-2.mcache b/maps/re/003-1-2.mcache
index 5777b8f3d..9513d47af 100644
--- a/maps/re/003-1-2.mcache
+++ b/maps/re/003-1-2.mcache
diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache
index 7bef28d7b..1ec4f2cb0 100644
--- a/maps/re/003-1.mcache
+++ b/maps/re/003-1.mcache
diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache
index 82e37be9a..3c5ef6e56 100644
--- a/maps/re/009-1.mcache
+++ b/maps/re/009-1.mcache
diff --git a/npc/001-4/_mobs.txt b/npc/001-4/_mobs.txt
index ec47ae609..ca67ad42e 100644
--- a/npc/001-4/_mobs.txt
+++ b/npc/001-4/_mobs.txt
@@ -4,4 +4,4 @@
 001-4,224,238,23,23	monster	Clover Field	1028,1,60000,120000
 001-4,226,77,23,23	monster	Clover Field	1028,1,60000,120000
 001-4,74,77,23,23	monster	Clover Field	1028,1,60000,120000
-001-4,149,149,130,129	monster	Bhop Fluffy	1049,120,60000,120000
+001-4,149,149,130,129	monster	Bhop Fluffy	1049,180,60000,120000
diff --git a/npc/002-1/dan.txt b/npc/002-1/dan.txt
index 80f137064..4b778e077 100644
--- a/npc/002-1/dan.txt
+++ b/npc/002-1/dan.txt
@@ -89,30 +89,36 @@ OnInit:
 
 OnRespawnPiou1:
     if (getq(ShipQuests_Dan) == 1) DanCheck();
-    sleep 60000;
+    sleep 59000;
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou1");
     end;
 OnRespawnPiou2:
     if (getq(ShipQuests_Dan) == 1) DanCheck();
-    sleep 60000;
+    sleep 61000;
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou2");
     end;
 OnRespawnPiou3:
     if (getq(ShipQuests_Dan) == 1) DanCheck();
-    sleep 60000;
+    sleep 59500;
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou3");
     end;
 OnRespawnPiou4:
     if (getq(ShipQuests_Dan) == 1) DanCheck();
-    sleep 60000;
+    sleep 61500;
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou4");
     end;
+OnRespawnPiou5:
+    if (getq(ShipQuests_Dan) == 1) DanCheck();
+    sleep 60000;
+    areamonster(instance_mapname("002-3"), 31, 26, 40, 31, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou4");
+    end;
 
 OnInstanceInit:
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou1");
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou2");
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou3");
     areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou4");
+    areamonster(instance_mapname("002-3"), 31, 26, 40, 31, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou5");
     end;
 
 }
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 813d0c15e..0fae87c7e 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -1,5 +1,6 @@
 // Map 002-3: First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-3/_mobs.txt",
 "npc/002-3/billybons.txt",
 "npc/002-3/doors.txt",
 "npc/002-3/juliet.txt",
diff --git a/npc/002-3/_mobs.txt b/npc/002-3/_mobs.txt
new file mode 100644
index 000000000..38af6847b
--- /dev/null
+++ b/npc/002-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-3: First Deck mobs
+002-3,35,28,4,2	monster	Piou	1002,1,30000,20000
diff --git a/npc/003-1/_mobs.txt b/npc/003-1/_mobs.txt
index b61e9e510..7f8c94fae 100644
--- a/npc/003-1/_mobs.txt
+++ b/npc/003-1/_mobs.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 003-1: Tulimshar mobs
-003-1,84,106,33,48	monster	Maggot	1030,45,35000,450000
+003-1,84,106,33,48	monster	Maggot	1030,38,35000,450000
 003-1,81,103,2,3	monster	croc	1006,1,35000,150000
 003-1,67,27,3,4	monster	Four Leaf	1028,1,30000,20000
 003-1,72,70,7,4	monster	Piou	1002,2,30000,20000
diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt
index e883b1f66..d8897b37d 100644
--- a/npc/004-1/_import.txt
+++ b/npc/004-1/_import.txt
@@ -3,4 +3,3 @@
 "npc/004-1/_mobs.txt",
 "npc/004-1/_warps.txt",
 "npc/004-1/elanore.txt",
-