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

Conflicts:
	world/map/db/mob_db.txt

5 files changed, 191 insertions, 0 deletions

diff --git a/world/map/npc/002-5/_import.txt b/world/map/npc/002-5/_import.txt
new file mode 100644
index 00000000..e12c5372
--- /dev/null
+++ b/world/map/npc/002-5/_import.txt
@@ -0,0 +1,7 @@
+// Map 002-5: Deep Desert Mines
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-5.gat
+npc: npc/002-5/_mobs.txt
+npc: npc/002-5/_warps.txt
+npc: npc/002-5/chest.txt
+npc: npc/002-5/sema.txt
diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt
new file mode 100644
index 00000000..9d14c217
--- /dev/null
+++ b/world/map/npc/002-5/_mobs.txt
@@ -0,0 +1,51 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Deep Desert Mines mobs
+
+002-5.gat,37,89,12,7|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108
+002-5.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-5::On1056
+002-5.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-5::On1057
+002-5.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-5::On1060
+002-5.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-5::On1007
+002-5.gat,91,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-5::On1060
+002-5.gat,94,72,2,4|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,90,61,6,2|monster|YellowSlime|1007,1,100000,30000,Mob002-5::On1007
+002-5.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,93,38,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-5::On1007
+002-5.gat,62,62,5,43|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108
+
+
+002-5.gat,0,0,0|script|Mob002-5|-1,
+{
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
+
+On1057:
+    set @mobID, 1057;
+    callfunc "MobPoints";
+    end;
+
+On1060:
+    set @mobID, 1060;
+    callfunc "MobPoints";
+    end;
+
+On1108:
+    set @mobID, 1108;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/002-5/_warps.txt b/world/map/npc/002-5/_warps.txt
new file mode 100644
index 00000000..a7f33af9
--- /dev/null
+++ b/world/map/npc/002-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Deep Desert Mines warps
+
+002-5.gat,34,98|warp|To Second Level|-1,-1,002-4.gat,68,99
diff --git a/world/map/npc/002-5/chest.txt b/world/map/npc/002-5/chest.txt
new file mode 100644
index 00000000..f3818bf6
--- /dev/null
+++ b/world/map/npc/002-5/chest.txt
@@ -0,0 +1,51 @@
+// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
+
+002-5.gat,93,37,0|script|Supply Chest|378,
+{
+    // This NPC previously used the variable TMW_Quest
+    callfunc "ClearVarTMW_Quest";
+
+    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
+
+    if (@state >= 26) goto L_Finished;
+
+    mes "Hrmm... A supply chest.";
+    mes "Do you want to try to open it?";
+    next;
+    menu
+        "Yes.", L_Yes,
+        "No.", L_Close;
+
+L_Yes:
+    if (countitem("TreasureKey") < 3)
+        goto L_Not_Enough;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("TreasureKey") > 3)
+        goto L_TooMany;
+    mes "You opened the chest and found a short bow!";
+    delitem "TreasureKey", 3;
+    getitem "ShortBow", 1;
+    set @state, 26;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_Not_Enough:
+    mes "It seems that you do not have the right key for this chest yet...";
+    goto L_Close;
+
+L_Finished:
+    mes "You have already opened this chest.";
+    goto L_Close;
+
+L_TooMany:
+    mes "You do not have enough room to loot this chest. Maybe you should try again later.";
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    close;
+
+S_Update_Var:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
+    return;
+}
diff --git a/world/map/npc/002-5/sema.txt b/world/map/npc/002-5/sema.txt
new file mode 100644
index 00000000..3462c5ca
--- /dev/null
+++ b/world/map/npc/002-5/sema.txt
@@ -0,0 +1,78 @@
+// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
+
+002-5.gat,43,91,6|script|Sema|340,
+{
+    // This NPC previously used the variable TMW_Quest
+    callfunc "ClearVarTMW_Quest";
+
+    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
+
+    if (@state >= 28) goto L_Sema_Done;
+    if (@state == 27) goto L_Sema_Happy;
+    if (@state == 26) goto L_Sema_GCM;
+
+    mes "[Sema the Miner]";
+    mes "\"Hello adventurer.  I do not know exactly where, but somewhere in this cave there is a supply chest.  And wouldn't you know it!  The archants have eaten all the spare keys for the chest.  Go and do what you must do.\"";
+    goto L_Close;
+
+L_Sema_GCM:
+    mes "[Sema the Miner]";
+    mes "\"I saw a giant cave maggot eat one of the other miners and it might eat me!  Can you kill it?\"";
+    menu
+        "Yes.", L_Sema_Yes,
+        "No.", L_Sema_No;
+
+L_Sema_No:
+    mes "[Sema the Miner]";
+    mes "\"Ahh!  I am very scared now!\"";
+    goto L_Close;
+
+L_Sema_Yes:
+    set @state, 27;
+    callsub S_Update_Var;
+    monster "002-5.gat", 70, 90, "", 1059, 1;
+    mes "[Sema the Miner]";
+    mes "\"Good luck.  To prove you killed it, please bring the Iten it swallowed when it ate the miner.  Be careful, there could be more than one.\"";
+    goto L_Close;
+
+L_Sema_Happy:
+    if (countitem("Iten") < 1)
+        goto L_Sema_Not_Happy;
+    getinventorylist;
+    if (@inventorylist_count - (countitem("Iten") == 1) > 99)
+        goto L_Sema_TooMany;
+    delitem "Iten", 1;
+    getitem "DesertShirt", 1;
+    set @state, 28;
+    callsub S_Update_Var;
+    set BOSS_POINTS, BOSS_POINTS + 10;
+    message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
+    mes "[Sema the Miner]";
+    mes "\"You killed it!  What a relief!  I wish I had more to give, but please accept this Desert Shirt as reward.\"";
+    goto L_Close;
+
+L_Sema_TooMany:
+    mes "[Sema the Miner]";
+    mes "\"You have too many items for me to give you a reward.  Please drop or sell something so I can give it to you.  Oh and yes, you can also store items at the nearest bank.\"";
+    goto L_Close;
+
+L_Sema_Not_Happy:
+    set @state, 26;
+    callsub S_Update_Var;
+    itemheal -Hp, 0;
+    mes "A stone falls on your head.";
+    goto L_Close;
+
+L_Sema_Done:
+    mes "[Sema the Miner]";
+    mes "\"You made this cave safer, you are kind beyond belief.  Others may need you.  Happy adventuring.\"";
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    close;
+
+S_Update_Var:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
+    return;
+}