New server content to support new caves

Added mobs:Angry Fire Goblin, Angry Sea Slime, Angry Green Slime.
Moved NPCs in sandstorm around.
Malvox got a house and lives in it now on 002-2
The mines go a layer deeper so the merchant was moved into the camp along with nathan.
Naem and Sema moved down with respective maps.
Sandstorm_mine_barrier is not mining_camp_barrier

12 files changed, 20 insertions, 20 deletions

diff --git a/world/map/npc/002-1/merchant.txt b/world/map/npc/002-1/merchant.txt
deleted file mode 100644
index b1b2c3fd..00000000
--- a/world/map/npc/002-1/merchant.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-
-002-1.gat,19,99,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1
diff --git a/world/map/npc/002-1/rogue.txt b/world/map/npc/002-2/rogue.txt
index 7358230c..f8245da5 100644
--- a/world/map/npc/002-1/rogue.txt
+++ b/world/map/npc/002-2/rogue.txt
@@ -1,6 +1,6 @@
 //
 
-002-1.gat,22,21,0|script|Malivox|103,{
+002-2.gat,25,28,0|script|Malivox|103,{
 
 // if (ResetA_charstate == 1) goto L_Multiple;
 
diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt
new file mode 100644
index 00000000..3eb2f426
--- /dev/null
+++ b/world/map/npc/002-3/merchant.txt
@@ -0,0 +1,3 @@
+//
+
+002-3.gat,60,47,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1
diff --git a/world/map/npc/002-1/sandstorm_mine_barrier.txt b/world/map/npc/002-3/mining_camp_barrier.txt
index 49c9b733..84a239e8 100644
--- a/world/map/npc/002-1/sandstorm_mine_barrier.txt
+++ b/world/map/npc/002-3/mining_camp_barrier.txt
@@ -1,6 +1,6 @@
 //Sandstorm mine barrier
 
-002-1.gat,20,94,0|script|#Sandstorm_Mine_Barrier|45,0,0,{
+002-3.gat,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -13,7 +13,7 @@
     goto L_End;
 
 L_Sandstorm_Barrier_Open:
-    warp "002-3.gat",37,31;
+    warp "002-4.gat",37,31;
     goto L_End;
 
 L_End:
diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt
index b668f7b7..675f01ea 100644
--- a/world/map/npc/002-3/nathan.txt
+++ b/world/map/npc/002-3/nathan.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-3.gat,35,35,6|script|Nathan|109,{
+002-3.gat,42,45,6|script|Nathan|109,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-3/mine_triggerone.txt b/world/map/npc/002-4/mine_triggerone.txt
index 05aa1c01..df29393e 100644
--- a/world/map/npc/002-3/mine_triggerone.txt
+++ b/world/map/npc/002-4/mine_triggerone.txt
@@ -1,7 +1,7 @@
-//Sandstorm mine trigger 1 Trigger 002-3 35,43 (127)
+//Sandstorm mine trigger 1 Trigger 002-4 35,43 (127)
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-3.gat,30,47,0|script|Button|400,0,0,{
+002-4.gat,30,47,0|script|Button|400,0,0,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-3/mine_triggerthree.txt b/world/map/npc/002-4/mine_triggerthree.txt
index 0bfecd22..621da0b2 100644
--- a/world/map/npc/002-3/mine_triggerthree.txt
+++ b/world/map/npc/002-4/mine_triggerthree.txt
@@ -1,7 +1,7 @@
-//Sandstorm mine trigger 3 Trigger 002-3 98,42 (127)
+//Sandstorm mine trigger 3 Trigger 002-4 98,42 (127)
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-3.gat,91,99,0|script|Button|400,0,0,{
+002-4.gat,91,99,0|script|Button|400,0,0,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-4/mine_triggertwo.txt
index d18712ee..04e54462 100644
--- a/world/map/npc/002-3/mine_triggertwo.txt
+++ b/world/map/npc/002-4/mine_triggertwo.txt
@@ -3,7 +3,7 @@
 // - nibble 4 and 5 of QUEST_SouthTulimshar
 // - in FLAGS, FLAG_OPENED_UNDERGROUND
 
-002-3.gat,100,37,0|script|Button|400,0,0,{
+002-4.gat,100,37,0|script|Button|400,0,0,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-3/naem.txt b/world/map/npc/002-4/naem.txt
index bfcde613..95735b58 100644
--- a/world/map/npc/002-3/naem.txt
+++ b/world/map/npc/002-4/naem.txt
@@ -2,7 +2,7 @@
 // - nibble 4 and 5 of QUEST_SouthTulimshar
 // - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND
 
-002-3.gat,85,97,6|script|Naem|109,{
+002-4.gat,91,96,6|script|Naem|109,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-3/underground_palace_barrier.txt b/world/map/npc/002-4/underground_palace_barrier.txt
index a56fe801..2e0dc60d 100644
--- a/world/map/npc/002-3/underground_palace_barrier.txt
+++ b/world/map/npc/002-4/underground_palace_barrier.txt
@@ -1,6 +1,6 @@
 //underground palace barrier
 
-002-3.gat,68,98,0|script|#UGP_Barrier|45,0,0,{
+002-4.gat,68,98,0|script|#UGP_Barrier|45,0,0,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -13,7 +13,7 @@
     goto L_End;
 
 L_Underground_Palace_Barrier_Open:
-    warp "002-4.gat",34,98;
+    warp "002-5.gat",37,96;
     goto L_End;
 
 L_End:
diff --git a/world/map/npc/002-4/chest.txt b/world/map/npc/002-5/chest.txt
index 61b59109..50e3eed0 100644
--- a/world/map/npc/002-4/chest.txt
+++ b/world/map/npc/002-5/chest.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-4.gat,93,37,0|script|Treasure|111,{
+002-5.gat,93,37,0|script|Supply Chest|377,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -9,7 +9,7 @@
 
     if (@state >= 26) goto L_Finished;
 
-    mes "There is a chest here.";
+    mes "Hrmm... A supply chest.";
     mes "Do you want to try to open it?";
     next;
     menu
diff --git a/world/map/npc/002-4/miners.txt b/world/map/npc/002-5/sema.txt
index 3fa17e35..b1b2cbe7 100644
--- a/world/map/npc/002-4/miners.txt
+++ b/world/map/npc/002-5/sema.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-4.gat,32,94,6|script|Sema|340,{
+002-5.gat,43,91,6|script|Sema|340,{
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -12,7 +12,7 @@
     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 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.\"";
+    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:
@@ -30,7 +30,7 @@ L_Sema_No:
 L_Sema_Yes:
     set @state, 27;
     callsub S_Update_Var;
-    monster "002-4.gat", 70, 90, "", 1059, 1;
+    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;