Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

4 files changed, 78 insertions, 0 deletions

diff --git a/npc/003-4/_import.txt b/npc/003-4/_import.txt
new file mode 100644
index 00000000..19764510
--- /dev/null
+++ b/npc/003-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 003-4: Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-4/_mobs.txt",
+"npc/003-4/_warps.txt",
+"npc/003-4/ashley.txt",
diff --git a/npc/003-4/_mobs.txt b/npc/003-4/_mobs.txt
new file mode 100644
index 00000000..60145412
--- /dev/null
+++ b/npc/003-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-4: Beach mobs
+003-4,158,68,14,48	monster	Giant Maggot	1006,10,100000,30000
+003-4,0,0,0,0	monster	Sea Slime	1033,15,100000,30000
+003-4,120,31,11,11	monster	Sea Slime	1033,5,100000,30000
+003-4,119,68,52,50	monster	Green Slime	1005,35,100000,30000
+003-4,134,69,38,35	monster	Red Scorpion	1004,20,100000,30000
+003-4,35,25,5,1	monster	Mountain Snake	1026,1,700000,600000
diff --git a/npc/003-4/_warps.txt b/npc/003-4/_warps.txt
new file mode 100644
index 00000000..46e27355
--- /dev/null
+++ b/npc/003-4/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-4: Beach warps
+003-4,172,77,0	warp	#003-4_172_77	0,4,002-1,32,66
+003-4,141,19,0	warp	#003-4_141_19	2,0,004-1,37,110
+003-4,114,117,0	warp	#003-4_114_117	3,0,043-1,44,20
diff --git a/npc/003-4/ashley.txt b/npc/003-4/ashley.txt
new file mode 100644
index 00000000..9be78493
--- /dev/null
+++ b/npc/003-4/ashley.txt
@@ -0,0 +1,60 @@
+003-4,35,25,0	script	Ashley	NPC139,{
+    mes "[Ashley]";
+    mes "\"Ah, hello. Your smell is different, you seem to have come from a different time.";
+    mes "Perhaps you have the rare item I'm looking for?\"";
+    menu
+        "Sure!",L_Next,
+        "Sorry, I'm busy.",L_close;
+
+L_Next:
+    mes "She smiles mischievously.";
+    mes "[Ashley]";
+    mes "\"Oho, I need an item which doesn't exists at this time... It is called Mylarin Dust.\"";
+    next;
+    mes "[Ashley]";
+    mes "Grinning intensifies";
+    mes "\"I'll even give you an old weapon as a reward.\"";
+    next;
+    mes "[Ashley]";
+    mes "\"So, do you have it?\"";
+    menu
+        "Yeah, here is it.",L_Next1,
+        "Not yet.",L_close;
+
+L_Next1:
+    if (countitem("MylarinDust") < 1)
+        goto L_NoMylarin;
+
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_FullInv;
+
+    delitem "MylarinDust", 1;
+    getexp 2000, 0;
+    getitem "SandCutter", 1;
+    mes "[Ashley]";
+    mes "Grinning widely";
+    mes "\"Thanks, mortal. This will help me a bit...\"";
+    next;
+    mes "[Ashley]";
+    mes "\"And if you have more Mylarin Dust with you, I will not hesitate to give you another old weapon as a reward.\"";
+    goto L_close;
+
+L_NoMylarin:
+    mes "[Ashley]";
+    mes "She fakes smiles at you";
+    mes "\"Oh, did you said you wanted me to play with you?\"";
+    next;
+    mes "[Ashley]";
+    mes "\"While I would love to play... I still have to put a prank on Cupid, so you'll have to wait your turn.\"";
+    goto L_close;
+
+L_FullInv:
+    mes "[Ashley]";
+    mes "\"You're carrying so many things that I feel the urge of stomping you.\"";
+    goto L_close;
+
+L_close:
+    @inventorylist_count = 0;
+    close;
+}