Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

4 files changed, 72 insertions, 0 deletions

diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
new file mode 100644
index 00000000..6108ea70
--- /dev/null
+++ b/world/map/npc/002-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 002-2: Sandstorm Desert Indoors
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-2.gat
+npc: npc/002-2/_mobs.txt
+npc: npc/002-2/_warps.txt
+npc: npc/002-2/rogue.txt
diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt
new file mode 100644
index 00000000..91350716
--- /dev/null
+++ b/world/map/npc/002-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Sandstorm Desert Indoors mobs
+
+
+
+002-2.gat,0,0,0|script|Mob002-2|-1,
+{
+    end;
+}
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
new file mode 100644
index 00000000..e370ad8f
--- /dev/null
+++ b/world/map/npc/002-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Sandstorm Desert Indoors warps
+
+002-2.gat,28,30|warp|To Sand Storm|-1,-1,002-1.gat,104,93
diff --git a/world/map/npc/002-2/rogue.txt b/world/map/npc/002-2/rogue.txt
new file mode 100644
index 00000000..39a4d8ce
--- /dev/null
+++ b/world/map/npc/002-2/rogue.txt
@@ -0,0 +1,53 @@
+//
+
+002-2.gat,25,28,0|script|Malivox|103,
+{
+// if (ResetA_charstate == 1) goto L_Multiple;
+
+// set @cost, 10000000 / ($ResetA_uses + 1);
+
+    set @cost, BaseLevel * 100;
+
+    mes "[Rogue Mage]";
+    mes "\"I have come across a spell that will";
+    mes "reset your status points.";
+    mes "Normally this spell is expensive, but";
+    mes "due to an unusual constellation of the";
+    mes "stars I can cast it very cheaply!";
+    mes "For you it will cost only "+@cost+" gp.\"";
+    next;
+    menu
+        "Reset my stats",-,
+        "Forget about it",L_Pass;
+
+    if (Zeny<@cost) goto L_NoMoney;
+
+// set $ResetA_uses, $ResetA_uses + 1;
+// set ResetA_charstate, 1;
+
+L_Reset:
+    set Zeny, Zeny-@cost;
+    resetstatus;
+
+    mes "[Rogue Mage]";
+    mes "\"There you are.";
+    mes "";
+    mes "Good as new!\"";
+    goto L_Close;
+
+L_Pass:
+    mes "[Rogue Mage]";
+    mes "\"Very well then, see you.\"";
+    goto L_Close;
+
+L_NoMoney:
+    mes "[Rogue Mage]";
+    mes "\"Oh dear, the price cannot be bargained.";
+    mes "";
+    mes "Perhaps you can borrow from a friend?\"";
+    goto L_Close;
+
+L_Close:
+    set @cost, 0;
+    close;
+}