Merge branch 'master' of git://gitorious.org/~wombat/tmw-eathena-data/cache-serverdata

Conflicts:
	npc/009-4/_mobs.txt
	npc/009-4/_warps.txt

3 files changed, 76 insertions, 6 deletions

diff --git a/npc/007-1_Woodland/voltain.txt b/npc/007-1_Woodland/voltain.txt
index 76e49f1b..1359ada8 100644
--- a/npc/007-1_Woodland/voltain.txt
+++ b/npc/007-1_Woodland/voltain.txt
@@ -157,7 +157,7 @@ mes "[Voltain]";
     if (countitem("BlackScorpionStinger") < 1) goto L_NOT_ENOUGH;
     delitem "BlackScorpionStinger", 1;
     getexp @BLACK_SC_ST_REWARD_XP, 0;
-    set $state, 0;
+    set $state, 4;
     mes "\"Great! Now I can really kill that monster!\"";
     close;
 
diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
index aa688cd9..5984a97e 100644
--- a/npc/009-4/_mobs.txt
+++ b/npc/009-4/_mobs.txt
@@ -1,7 +1,37 @@
+<<<<<<< HEAD
 // 009-4 mobs
 
 
 
 009-4.gat,0,0,0	script	Mob009-4	-1,{
+=======
+// 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.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,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;
+	callfunc "MobPoints";
+	break;
+OnMaggot:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+OnSilkworm:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
+>>>>>>> 4b3d76c606ab0edd54628342adbbb7245b21087f
 	end;
 }
diff --git a/npc/009-4/_warps.txt b/npc/009-4/_warps.txt
index 64969942..842de637 100644
--- a/npc/009-4/_warps.txt
+++ b/npc/009-4/_warps.txt
@@ -1,6 +1,46 @@
-// 009-4 warps
+// 009-4 Cave Warps
 
-009-4.gat,37,112	warp	to 025-1	-1,-1,025-1.gat,1,2
-009-4.gat,72,125	warp	to 025-1	-1,-1,025-1.gat,1,2
-009-4.gat,72,136	warp	to Cavern	-1,-1,025-1.gat,1,2
-009-4.gat,37,123	warp	to Cavern	-1,-1,025-1.gat,1,2
+// 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;
+}