Merge commit 'map-renaming/master'

6 files changed, 86 insertions, 0 deletions

diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
new file mode 100644
index 00000000..cb715b3d
--- /dev/null
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -0,0 +1,6 @@
+map: 002-4.gat
+npc: npc/002-4_Desert_mines/_mobs.txt
+npc: npc/002-4_Desert_mines/_warps.txt
+npc: npc/002-4_Desert_mines/chest.txt
+npc: npc/002-4_Desert_mines/miners.txt
+npc: npc/002-4_Desert_mines/monsters.txt
diff --git a/npc/002-4_Desert_mines/_mobs.txt b/npc/002-4_Desert_mines/_mobs.txt
new file mode 100644
index 00000000..ff53d9c6
--- /dev/null
+++ b/npc/002-4_Desert_mines/_mobs.txt
@@ -0,0 +1,19 @@
+// 002-4 Desert mines mobs
+
+002-4.gat,0,0,0,0	monster	Spider	1012,20,0,0,Mob002-4::On1012
+002-4.gat,0,0,0,0	monster	Yellow Slime	1007,25,0,0,Mob002-4::On1007
+
+
+002-4.gat,0,0,0	script	Mob002-4	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/002-4_Desert_mines/_warps.txt b/npc/002-4_Desert_mines/_warps.txt
new file mode 100644
index 00000000..24f71a1d
--- /dev/null
+++ b/npc/002-4_Desert_mines/_warps.txt
@@ -0,0 +1,3 @@
+// 002-4 Desert mines warps
+
+002-4.gat,34,99	warp	toLevel1	-1,-1,002-3.gat,68,99
diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt
new file mode 100644
index 00000000..49014976
--- /dev/null
+++ b/npc/002-4_Desert_mines/chest.txt
@@ -0,0 +1,31 @@
+//
+
+002-4.gat,93,37,0	script	Treasure	111,{
+	if( ChestQuest && 1) goto L_Finished;
+
+	mes "[Chest]";
+	mes "Would you try to open it?";
+	next;
+	menu
+		"Yes", L_Yes,
+		"No", -;
+	close;
+
+L_Yes:
+	if(countitem(537) < 3) goto L_Not_Enough;
+	delitem 537, 3;
+	getitem 536, 1;
+	mes "[Chest]";
+	mes "You opened it and found a short sword!";
+	set ChestQuest, ChestQuest || 1;
+	close;
+
+L_Not_Enough:
+	mes "It seems that this is not the right key...";
+	close;
+
+L_Finished:
+        mes "[Chest]";
+        mes "You already opened this chest.";
+        close;
+}
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/002-4_Desert_mines/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
new file mode 100644
index 00000000..17d5cdee
--- /dev/null
+++ b/npc/002-4_Desert_mines/monsters.txt
@@ -0,0 +1,20 @@
+// Map: 002-4
+// This is the Desert Mines south of Tulimshar -- level 2.
+//
+
+002-4.gat,0,0,0,0	monster	Spider		1012,10,2500,0,Mob5::OnSpider
+002-4.gat,0,0,0,0	monster	YellowSlime	1007,25,2500,0,Mob5::OnYellowSlime
+
+002-4.gat,0,0,0	script	Mob5	-1,{
+OnSpider:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+OnYellowSlime:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}