fix to 012-4 removing "terranite island" and map changes from converter

012-4.tmx removed terranite island where monsters were spawning and couldn't
be killed.  Ran the java converter afterwards and recieved a number of changes
Those changes added to this patch for review.
Amendment: marked out ("//") golbenez and alacrius inside their scripts.
This is to be done instead of marking out inside _import.txt.

11 files changed, 24 insertions, 8 deletions

diff --git a/data/012-4.wlk b/data/012-4.wlk
index 31fcf7de..103cfb91 100644
--- a/data/012-4.wlk
+++ b/data/012-4.wlk
diff --git a/data/033-1.wlk b/data/033-1.wlk
new file mode 100644
index 00000000..f859638c
--- /dev/null
+++ b/data/033-1.wlk
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 5bfc5617..5e28d9bc 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -3,4 +3,4 @@ npc: npc/019-1_Snow_field/_mobs.txt
 npc: npc/019-1_Snow_field/_warps.txt
 npc: npc/019-1_Snow_field/monsters.txt
 npc: npc/019-1_Snow_field/santa_helper.txt
-npc: npc/019-1_Snow_field/snowman.txt
\ No newline at end of file
+npc: npc/019-1_Snow_field/snowman.txt
diff --git a/npc/027-1_Graveyard/_import.txt b/npc/027-1_Graveyard/_import.txt
index 130fd751..4c8b65ab 100644
--- a/npc/027-1_Graveyard/_import.txt
+++ b/npc/027-1_Graveyard/_import.txt
@@ -1,5 +1,5 @@
 map: 027-1.gat
 npc: npc/027-1_Graveyard/_mobs.txt
 npc: npc/027-1_Graveyard/_warps.txt
-//npc: npc/027-1_Graveyard/golbenez.txt
+npc: npc/027-1_Graveyard/golbenez.txt
 npc: npc/027-1_Graveyard/graves.txt
diff --git a/npc/027-1_Graveyard/golbenez.txt b/npc/027-1_Graveyard/golbenez.txt
index f9a4e99f..516040ae 100644
--- a/npc/027-1_Graveyard/golbenez.txt
+++ b/npc/027-1_Graveyard/golbenez.txt
@@ -1,4 +1,4 @@
-027-1.gat,68,89,0	script	#Golbenez#_M	204,{
+//027-1.gat,68,89,0	script	#Golbenez#_M	204,{
 
 	set @fee, 666;
 
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
index 4dbb7fcb..7e19c61f 100644
--- a/npc/027-2_Caretakers_House/_import.txt
+++ b/npc/027-2_Caretakers_House/_import.txt
@@ -2,18 +2,18 @@ map: 027-2.gat
 npc: npc/027-2_Caretakers_House/_mobs.txt
 npc: npc/027-2_Caretakers_House/_warps.txt
 npc: npc/027-2_Caretakers_House/alacrius.txt
-//npc: npc/027-2_Caretakers_House/alacrius2.txt
+npc: npc/027-2_Caretakers_House/alacrius2.txt
 npc: npc/027-2_Caretakers_House/caretaker.txt
 npc: npc/027-2_Caretakers_House/cerhan.txt
-npc: npc/027-2_Caretakers_House/evil_guard.txt
+npc: npc/027-2_Caretakers_House/crying_child.txt
 npc: npc/027-2_Caretakers_House/diary.txt
 npc: npc/027-2_Caretakers_House/door.txt
+npc: npc/027-2_Caretakers_House/evil_guard.txt
 npc: npc/027-2_Caretakers_House/golbenez.txt
 npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
 npc: npc/027-2_Caretakers_House/headless_man.txt
 npc: npc/027-2_Caretakers_House/husband.txt
 npc: npc/027-2_Caretakers_House/innkeeper.txt
-npc: npc/027-2_Caretakers_House/crying_child.txt
 npc: npc/027-2_Caretakers_House/lover.txt
 npc: npc/027-2_Caretakers_House/testnpcs.txt
 npc: npc/027-2_Caretakers_House/werewolf.txt
diff --git a/npc/027-2_Caretakers_House/alacrius2.txt b/npc/027-2_Caretakers_House/alacrius2.txt
index bd2c90a3..aa5eda08 100755
--- a/npc/027-2_Caretakers_House/alacrius2.txt
+++ b/npc/027-2_Caretakers_House/alacrius2.txt
@@ -1,6 +1,6 @@
 // Starts the reaper quest

 

-027-2.gat,107,29,0	script	Alacrius	313,{

+//027-2.gat,107,29,0	script	Alacrius	313,{

 	if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy;

 

 

diff --git a/npc/033-1_Snow_field/_import.txt b/npc/033-1_Snow_field/_import.txt
new file mode 100644
index 00000000..ceb8aa1f
--- /dev/null
+++ b/npc/033-1_Snow_field/_import.txt
@@ -0,0 +1,3 @@
+map: 033-1.gat
+npc: npc/033-1_Snow_field/_mobs.txt
+npc: npc/033-1_Snow_field/_warps.txt
diff --git a/npc/033-1_Snow_field/_mobs.txt b/npc/033-1_Snow_field/_mobs.txt
new file mode 100644
index 00000000..b7b0ed59
--- /dev/null
+++ b/npc/033-1_Snow_field/_mobs.txt
@@ -0,0 +1,7 @@
+// 033-1 Snow field mobs
+
+
+
+033-1.gat,0,0,0	script	Mob033-1	-1,{
+	end;
+}
diff --git a/npc/033-1_Snow_field/_warps.txt b/npc/033-1_Snow_field/_warps.txt
new file mode 100644
index 00000000..ba32b3d3
--- /dev/null
+++ b/npc/033-1_Snow_field/_warps.txt
@@ -0,0 +1,6 @@
+// 033-1 Snow field warps
+
+033-1.gat,168,21	warp	ToVillage	2,-1,020-1.gat,70,126
+033-1.gat,159,102	warp	toRomanticPlace	2,-1,030-1.gat,60,29
+033-1.gat,194,40	warp	toCave	-1,-1,019-3.gat,98,27
+033-1.gat,136,75	warp	toCave2	-1,-1,019-3.gat,40,97
diff --git a/npc/_import.txt b/npc/_import.txt
index 94929c05..217f6b81 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -69,5 +69,5 @@ import: npc/031-2_Angelas_House/_import.txt
 import: npc/031-3_Cave/_import.txt
 import: npc/032-1_Outback/_import.txt
 import: npc/032-3_Cave/_import.txt
+import: npc/033-1_Snow_field/_import.txt
 import: npc/botcheck/_import.txt
-import: npc/debugroom_Woodland_mining_camp/_import.txt