monsters and not conditional warps for orum and waric generated with converter, conditional warps in an extra file

4 files changed, 58 insertions, 61 deletions

diff --git a/npc/009-4/_import.txt b/npc/009-4/_import.txt
index 0af62468..762f6244 100644
--- a/npc/009-4/_import.txt
+++ b/npc/009-4/_import.txt
@@ -3,5 +3,6 @@ npc: npc/009-4/_mobs.txt
 npc: npc/009-4/_warps.txt
 npc: npc/009-4/barriers.txt
 npc: npc/009-4/orum.txt
+npc: npc/009-4/orum_warps.txt
 npc: npc/009-4/torches.txt
 npc: npc/009-4/waric.txt
diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
index b4f88c00..10eb0901 100644
--- a/npc/009-4/_mobs.txt
+++ b/npc/009-4/_mobs.txt
@@ -1,28 +1,29 @@
-// 009-4 Cave mobs
-// # see detailed description at orum.txt
-// Cavern
-009-4.gat,107,88,19,28	monster	Silkworm	1035,3,20000,14000,Mob009-4::OnSilkworm
-009-4.gat,107,88,19,28	monster	Cave Snake	1021,5,20000,14000,Mob009-4::OnCaveSnake
+// 009-4 mobs
 
-009-4.gat,119,45,5,3	monster	Silkworm	1035,3,20000,14000,Mob009-4::OnSilkworm
-009-4.gat,103,28,6,4	monster	Cave Snake	1021,3,20000,14000,Mob009-4::OnCaveSnake
-009-4.gat,103,28,6,4	monster	Silkworm	1035,2,20000,14000,Mob009-4::OnSilkworm
+009-4.gat,117,97,24,15	monster	Silkworm	1035,3,20000,14000,Mob009-4::On1035
+009-4.gat,115,98,24,15	monster	Cave Snake	1021,5,20000,14000,Mob009-4::On1021
+009-4.gat,103,28,24,15	monster	Cave Snake	1021,3,20000,14000,Mob009-4::On1021
+009-4.gat,106,27,24,15	monster	Silkworm	1035,3,20000,14000,Mob009-4::On1035
+009-4.gat,119,44,12,10	monster	Silkworm	1035,3,20000,14000,Mob009-4::On1035
+009-4.gat,72,130,24,15	monster	Maggot	1002,3,20000,14000,Mob009-4::On1002
+009-4.gat,38,116,24,15	monster	Maggot	1002,3,20000,14000,Mob009-4::On1002
 
-009-4.gat,36,117,4,4	monster	Maggot	1002,3,20000,14000,Mob009-4::OnMaggot
-009-4.gat,71,130,4,4	monster	Maggot	1002,3,20000,14000,Mob009-4::OnMaggot
 
 009-4.gat,0,0,0	script	Mob009-4	-1,{
-OnCaveSnake:
-	set @mobID, 1021;
+On1002:
+	set @mobID, 1002;
 	callfunc "MobPoints";
 	break;
-OnMaggot:
-	set @mobID, 1002;
+
+On1021:
+	set @mobID, 1021;
 	callfunc "MobPoints";
 	break;
-OnSilkworm:
+
+On1035:
 	set @mobID, 1035;
 	callfunc "MobPoints";
 	break;
+
 	end;
 }
diff --git a/npc/009-4/_warps.txt b/npc/009-4/_warps.txt
index 03e70324..72fe1de5 100644
--- a/npc/009-4/_warps.txt
+++ b/npc/009-4/_warps.txt
@@ -1,46 +1,8 @@
-// 009-4 Cave Warps
-
-// Entrances
-009-4.gat,37,112	warp	to Outside	-1,-1,009-3.gat,162,114
-009-4.gat,37,123	warp	to Lair	-1,-1,009-4.gat,36,27
-
-009-4.gat,72,125	warp	to Outside	-1,-1,009-3.gat,162,114
-009-4.gat,72,136	warp	to Lair	-1,-1,009-4.gat,36,27
-
-// Caverns
-009-4.gat,103,22	warp	to Lair	-1,-1,009-4.gat,51,46
-009-4.gat,103,76	warp	to Lair	-1,-1,009-4.gat,51,46
-
-009-3.gat,162,113,0	script	#OrumQuestEnter	0,0,0,{
-	if (OrumQuest >= 12) goto L_Second_Entrance;
-	warp "009-4.gat", 37, 113;
-	close;
-
-L_Second_Entrance:
-	warp "009-4.gat", 72, 126;
-	close;
-}
-009-4.gat,36,26,0	script	#LairExit	0,0,0,{
-	if (OrumQuest >= 12) goto L_Second_Entrance;
-	warp "009-4.gat", 37, 122;
-	close;
-
-L_Second_Entrance:
-	warp "009-4.gat", 72, 135;
-	close;
-}
-
-009-4.gat,51,47,0	script	#CavernEnter	0,0,0,{
-	if (OrumQuest >= 14) goto L_Second_Cavern;
-	if (OrumQuest < 12) goto L_See_Orum;
-	warp "009-4.gat", 103, 23;
-	close;
-
-L_Second_Cavern:
-	warp "009-4.gat", 103, 77;
-	close;
-
-L_See_Orum:
-	mes "Right as you are entering you hear Orum call out for you.. Perhaps you should see what he wants first..";
-	close;
-}
+// 009-4 warps
+
+009-4.gat,37,112	warp	to 009-3	-1,-1,009-3.gat,162,114
+009-4.gat,72,136	warp	to Cavern	-1,-1,009-4.gat,36,27
+009-4.gat,37,123	warp	to Cavern	-1,-1,009-4.gat,36,27
+009-4.gat,72,125	warp	to 009-3	-1,-1,009-3.gat,162,114
+009-4.gat,103,22	warp	to Cavern	-1,-1,009-4.gat,51,46
+009-4.gat,103,76	warp	to torches	-1,-1,009-4.gat,51,46
diff --git a/npc/009-4/orum_warps.txt b/npc/009-4/orum_warps.txt
new file mode 100644
index 00000000..ebeaa857
--- /dev/null
+++ b/npc/009-4/orum_warps.txt
@@ -0,0 +1,33 @@
+009-3.gat,162,113,0	script	#OrumQuestEnter	0,0,0,{
+	if (OrumQuest >= 12) goto L_Second_Entrance;
+	warp "009-4.gat", 37, 113;
+	close;
+
+L_Second_Entrance:
+	warp "009-4.gat", 72, 126;
+	close;
+}
+009-4.gat,36,26,0	script	#LairExit	0,0,0,{
+	if (OrumQuest >= 12) goto L_Second_Entrance;
+	warp "009-4.gat", 37, 122;
+	close;
+
+L_Second_Entrance:
+	warp "009-4.gat", 72, 135;
+	close;
+}
+
+009-4.gat,51,47,0	script	#CavernEnter	0,0,0,{
+	if (OrumQuest >= 14) goto L_Second_Cavern;
+	if (OrumQuest < 12) goto L_See_Orum;
+	warp "009-4.gat", 103, 23;
+	close;
+
+L_Second_Cavern:
+	warp "009-4.gat", 103, 77;
+	close;
+
+L_See_Orum:
+	mes "Right as you are entering you hear Orum call out for you.. Perhaps you should see what he wants first..";
+	close;
+}