add monsters

11 files changed, 54 insertions, 11 deletions

diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt
index 039280fe3..8b9b2b673 100644
--- a/npc/000-0-0/_import.txt
+++ b/npc/000-0-0/_import.txt
@@ -1,5 +1,5 @@
 // Map 000-0-0: Sailor's Room
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/000-0-0/mapflags.txt",
-"npc/000-0-0/q'onan.txt",
+"npc/000-0-0/qonan.txt",
 "npc/000-0-0/sailors.txt",
diff --git a/npc/000-1-1/_import.txt b/npc/000-1-1/_import.txt
new file mode 100644
index 000000000..82a91c723
--- /dev/null
+++ b/npc/000-1-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 000-1-1: Drasil Island
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/000-1-1/_mobs.txt",
+"npc/000-1-1/_warps.txt",
+"npc/000-1-1/mapflags.txt",
diff --git a/npc/000-1-1/_mobs.txt b/npc/000-1-1/_mobs.txt
new file mode 100644
index 000000000..88ed34e75
--- /dev/null
+++ b/npc/000-1-1/_mobs.txt
@@ -0,0 +1,39 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 000-1-1: Drasil Island mobs
+000-1-1,28,49,6,9	monster	Tortuga	1004,3,16000,120000
+000-1-1,58,118,34,14	monster	Tortuga	1004,4,35000,300000
+000-1-1,71,95,4,12	monster	Tortuga	1004,1,35000,300000
+000-1-1,52,92,4,17	monster	Tortuga	1004,2,35000,300000
+000-1-1,37,66,11,5	monster	Tortuga	1004,2,35000,120000
+000-1-1,42,41,9,16	monster	Tortuga	1004,2,35000,120000
+000-1-1,87,37,12,11	monster	Tortuga	1004,3,35000,120000
+000-1-1,44,75,2,1	monster	Little Blub	1007,2,25000,120000
+000-1-1,61,64,7,10	monster	Little Blub	1007,2,25000,120000
+000-1-1,62,25,10,4	monster	Little Blub	1007,2,25000,120000
+000-1-1,87,69,4,3	monster	Blub	1008,1,60000,120000
+000-1-1,85,33,2,3	monster	Little Blub	1007,1,25000,120000
+000-1-1,85,58,14,9	monster	Little Blub	1007,2,35000,120000
+000-1-1,48,61,9,6	monster	Little Blub	1007,1,35000,120000
+000-1-1,28,48,3,5	monster	Little Blub	1007,1,35000,120000
+000-1-1,35,50,0,1	monster	Plushroom Field	1011,1,35000,150000
+000-1-1,54,115,0,1	monster	Plushroom Field	1011,1,35000,150000
+000-1-1,63,80,4,2	monster	Plushroom Field	1011,1,35000,150000
+000-1-1,54,64,0,2	monster	Plushroom Field	1011,1,35000,150000
+000-1-1,78,58,4,5	monster	Plushroom Field	1011,2,35000,150000
+000-1-1,71,62,1,1	monster	Plushroom Field	1011,1,35000,150000
+000-1-1,32,116,8,9	monster	Croc	1006,2,35000,300000
+000-1-1,63,31,10,3	monster	Croc	1006,1,35000,300000
+000-1-1,76,68,1,1	monster	Croc	1006,1,35000,300000
+000-1-1,52,92,4,17	monster	Croc	1006,1,35000,300000
+000-1-1,71,77,4,4	monster	Croc	1006,1,35000,300000
+000-1-1,0,0,0,0	monster	Piou	1002,4,60000,15000
+000-1-1,78,115,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,57,104,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,39,112,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,67,93,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,53,77,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,64,63,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,31,69,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,44,44,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,70,33,0,0	monster	Crocotree	1010,1,420000,240000
+000-1-1,84,66,0,0	monster	Crocotree	1010,1,420000,240000
diff --git a/npc/000-1-1/_warps.txt b/npc/000-1-1/_warps.txt
new file mode 100644
index 000000000..e27a1d7e9
--- /dev/null
+++ b/npc/000-1-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 000-1-1: Drasil Island warps
+000-1-1,94,100,0	warp	#000-1-1_94_100	0,0,000-2-0,21,28
diff --git a/npc/000-1-1/mapflags.txt b/npc/000-1-1/mapflags.txt
new file mode 100644
index 000000000..708dd2ab8
--- /dev/null
+++ b/npc/000-1-1/mapflags.txt
@@ -0,0 +1 @@
+000-1	mapflag	town
diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt
index 795dcc45d..c0b9afb11 100644
--- a/npc/000-2-0/_import.txt
+++ b/npc/000-2-0/_import.txt
@@ -1,9 +1,8 @@
 // Map 000-2-0: First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/000-2-0/_mobs.txt",
 "npc/000-2-0/_warps.txt",
 "npc/000-2-0/billybons.txt",
 "npc/000-2-0/doors.txt",
 "npc/000-2-0/julia.txt",
 "npc/000-2-0/mapflags.txt",
-"npc/000-2-0/note.txt",
\ No newline at end of file
+"npc/000-2-0/note.txt",
diff --git a/npc/000-2-0/_mobs.txt b/npc/000-2-0/_mobs.txt
deleted file mode 100644
index 018c21bf2..000000000
--- a/npc/000-2-0/_mobs.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 000-2-0: Second Deck mobs
-000-2-1,52,32,21,9	monster	Piou	1002,3,30000,20000
-000-2-1,52,32,21,9	monster	Maggot	1030,2,30000,20000
\ No newline at end of file
diff --git a/npc/000-2-1/_mobs.txt b/npc/000-2-1/_mobs.txt
index b02288acf..e4b38bfc2 100644
--- a/npc/000-2-1/_mobs.txt
+++ b/npc/000-2-1/_mobs.txt
@@ -1,4 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 000-2-1: Second Deck mobs
 000-2-1,52,32,21,9	monster	Piou	1002,3,30000,20000
-000-2-1,52,32,21,9	monster	Maggot	1030,2,30000,20000
\ No newline at end of file
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 08a4104c4..6d45ede5f 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -17,7 +17,9 @@
 "npc/001-1/fexil.txt",
 "npc/001-1/flyingpiou.txt",
 "npc/001-1/harbours.txt",
+"npc/001-1/hinnack.txt",
 "npc/001-1/juscare.txt",
+"npc/001-1/karim.txt",
 "npc/001-1/katja.txt",
 "npc/001-1/lucas.txt",
 "npc/001-1/manhole.txt",
@@ -38,5 +40,3 @@
 "npc/001-1/trees.txt",
 "npc/001-1/wateranimation.txt",
 "npc/001-1/xilaxa.txt",
-"npc/001-1/karim.txt",
-"npc/001-1/hinnack.txt",
\ No newline at end of file
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
index 38da1dae2..b7797bf04 100644
--- a/npc/008-1/_import.txt
+++ b/npc/008-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-1/_mobs.txt",
 "npc/008-1/_warps.txt",
+"npc/008-1/confused-tree.txt",
 "npc/008-1/doors.txt",
 "npc/008-1/mapflags.txt",
 "npc/008-1/wateranimation.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 0923c29a9..47c8a00cd 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -3,6 +3,7 @@
 @include "npc/000-0-0/_import.txt"
 @include "npc/000-0-1/_import.txt"
 @include "npc/000-0/_import.txt"
+@include "npc/000-1-1/_import.txt"
 @include "npc/000-1/_import.txt"
 @include "npc/000-2-0/_import.txt"
 @include "npc/000-2-1/_import.txt"
@@ -71,6 +72,5 @@
 @include "npc/008-2-7/_import.txt"
 @include "npc/008-2-8/_import.txt"
 @include "npc/008-2-9/_import.txt"
-@include "npc/029-1/_import.txt"
 @include "npc/test/_import.txt"
 @include "npc/testbg/_import.txt"