Merge branch 'master' of git@gitorious.org:tmw-eathena-data/map-renaming

Conflicts:

	npc/_import.txt

9 files changed, 85 insertions, 32 deletions

diff --git a/npc/002-3_Desert_mines/monsters.txt b/npc/002-3_Desert_mines/monsters.txt
new file mode 100644
index 00000000..550b3d17
--- /dev/null
+++ b/npc/002-3_Desert_mines/monsters.txt
@@ -0,0 +1,20 @@
+// Map: new_2-1
+// This is the Desert mines south of Tulimshar -- level 1.
+//
+
+002-3.gat,0,0,0,0	monster	RedSlime	1008,30,2500,0,Mob2::OnRedSlime
+002-3.gat,0,0,0,0	monster	BlackScorpion	1009,15,2500,0,Mob2::OnBlackScorpion
+
+002-3.gat,0,0,0	script	Mob2	-1,{
+OnRedSlime:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+OnBlackScorpion:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
new file mode 100644
index 00000000..9e67c1ec
--- /dev/null
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -0,0 +1,7 @@
+//
+
+002-4.gat,32,94,6	script	Naem	109,{
+	mes "[Naem the Miner]";
+	mes "\"This place is odd.\"";
+	close;
+}
diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
index 83f4256e..e4208f4f 100644
--- a/npc/013-3_Cave/_import.txt
+++ b/npc/013-3_Cave/_import.txt
@@ -1,3 +1,7 @@
 map: 013-3.gat
+npc: npc/013-3_Cave/barrier.txt
+npc: npc/013-3_Cave/misc.txt
 npc: npc/013-3_Cave/_warps.txt
 npc: npc/013-3_Cave/_mobs.txt
+npc: npc/013-3_Cave/mask_chest.txt
+npc: npc/013-3_Cave/sword_chest.txt
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt
new file mode 100644
index 00000000..07f7a12b
--- /dev/null
+++ b/npc/013-3_Cave/barrier.txt
@@ -0,0 +1,17 @@
+//
+
+013-3.gat,71,21	script	#DemonMineBarrier1	127,1,1,{
+	if (QUEST_demon_mines >= 2) quit;
+
+	if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul;
+
+	mes "The barrier around the opening pushes you bach as you approach.";
+
+	warp "013-3.gat", 71, 38;
+	quit;
+
+L_Has_Jack_O_Soul:
+	mes "The barrier around the opening allows you passage.";
+	set QUEST_demon_mines, 2;
+	delitem 1198, 1;
+}
diff --git a/npc/013-3_Cave/bookcase.txt b/npc/013-3_Cave/bookcase.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/013-3_Cave/bookcase.txt
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
new file mode 100644
index 00000000..1fdb6559
--- /dev/null
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -0,0 +1,5 @@
+//
+
+013-3.gat,28,27	script	Chest#DemonMask	,{
+	
+}
diff --git a/npc/013-3_Cave/misc.txt b/npc/013-3_Cave/misc.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/013-3_Cave/misc.txt
diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/013-3_Cave/sword_chest.txt
diff --git a/npc/_import.txt b/npc/_import.txt
index bb22ec47..1812076a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,41 +1,41 @@
-import: npc/020-3_Ice_cave/_import.txt
-import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/012-3_Cave/_import.txt
-import: npc/010-2_Dimond's_Cove/_import.txt
-import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
-import: npc/020-2/_import.txt
-import: npc/018-3_Cave/_import.txt
-import: npc/008-1_Hurnscald_outskirts/_import.txt
-import: npc/006-3_Desert_mountain_caves/_import.txt
-import: npc/019-1_Snow_field/_import.txt
+import: npc/001-1_Tulimshar/_import.txt
+import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/020-1/_import.txt
+import: npc/002-1_Sandstorm/_import.txt
 import: npc/002-2/_import.txt
-import: npc/007-1_Woodland/_import.txt
-import: npc/013-1_Woodland_hills/_import.txt
-import: npc/016-1_Woodland/_import.txt
-import: npc/010-1_Woodland/_import.txt
-import: npc/014-1_Woodland/_import.txt
+import: npc/002-3_Desert_mines/_import.txt
+import: npc/002-4_Desert_mines/_import.txt
+import: npc/003-1_Beach/_import.txt
 import: npc/004-1_Beach/_import.txt
 import: npc/005-1_Snake_desert/_import.txt
-import: npc/002-1_Sandstorm/_import.txt
-import: npc/018-2_Woodland_minning_camp/_import.txt
-import: npc/011-4_Lake_cave/_import.txt
-import: npc/013-2_Magic_house/_import.txt
-import: npc/003-1_Beach/_import.txt
-import: npc/015-1_Woodland/_import.txt
 import: npc/005-3_Snake_pit/_import.txt
-import: npc/014-3_Cave/_import.txt
-import: npc/011-3_Hermit's_cave/_import.txt
-import: npc/017-1_Woodland_hills/_import.txt
-import: npc/001-2_Tulimshar/_import.txt
+import: npc/006-1_Desert_mountains/_import.txt
+import: npc/006-3_Desert_mountain_caves/_import.txt
+import: npc/007-1_Woodland/_import.txt
+import: npc/008-1_Hurnscald_outskirts/_import.txt
+import: npc/009-1_Hurnscald/_import.txt
 import: npc/009-2_Hurnscald/_import.txt
+import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
+import: npc/010-1_Woodland/_import.txt
+import: npc/010-2_Dimond's_Cove/_import.txt
+import: npc/011-1_Woodland/_import.txt
+import: npc/011-3_Hermit's_cave/_import.txt
+import: npc/011-4_Lake_cave/_import.txt
 import: npc/012-1_Woodland_Hills/_import.txt
-import: npc/001-1_Tulimshar/_import.txt
-import: npc/002-4_Desert_mines/_import.txt
+import: npc/012-3_Cave/_import.txt
+import: npc/013-1_Woodland_hills/_import.txt
+import: npc/013-2_Magic_house/_import.txt
 import: npc/013-3_Cave/_import.txt
-import: npc/009-1_Hurnscald/_import.txt
-import: npc/006-1_Desert_mountains/_import.txt
+import: npc/014-1_Woodland/_import.txt
+import: npc/014-3_Cave/_import.txt
+import: npc/015-1_Woodland/_import.txt
+import: npc/016-1_Woodland/_import.txt
+import: npc/017-1_Woodland_hills/_import.txt
+import: npc/018-1_Woodland_mining_camp/_import.txt
+import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-3_Cave/_import.txt
+import: npc/019-1_Snow_field/_import.txt
+import: npc/020-1/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3_Ice_cave/_import.txt
 import: npc/020-4_Ice_cave/_import.txt
-import: npc/002-3_Desert_mines/_import.txt
-import: npc/011-1_Woodland/_import.txt