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

Conflicts:
	world/map/db/mob_db.txt

10 files changed, 20 insertions, 95 deletions

diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index f1ebfb77..2738eb37 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -4,9 +4,6 @@ map: 002-1.gat
 npc: npc/002-1/_mobs.txt
 npc: npc/002-1/_warps.txt
 npc: npc/002-1/lieutenant_dausen.txt
-npc: npc/002-1/merchant.txt
 npc: npc/002-1/nickos.txt
 npc: npc/002-1/nomads.txt
-npc: npc/002-1/rogue.txt
-npc: npc/002-1/sandstorm_mine_barrier.txt
 npc: npc/002-1/stewen.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index feea41c1..3579851b 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -2,22 +2,23 @@
 // Sandstorm Desert mobs
 
 002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000,500,Mob002-1::On1002
-002-1.gat,96,98,19,13|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
+002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
 002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,19,94,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
+002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,61,74,41,43|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
+002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
 002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,27,82,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000,1800000,Mob002-1::On1009
 
 
-002-1.gat,0,0,0|script|Mob002-1|-1,{
+002-1.gat,0,0,0|script|Mob002-1|-1,
+{
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index e238d32f..b86304b9 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -2,6 +2,9 @@
 // Sandstorm Desert warps
 
 002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
-002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
 002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
 002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
+002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
+002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33
+002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29
+002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index 47fb0c57..d5e1ab9e 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -1,8 +1,8 @@
 // Lieutenant in charge of monitoring the monster threat surrounding the city.
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,54,27,0|script|Lieutenant Dausen|122,{
-
+002-1.gat,54,27,0|script|Lieutenant Dausen|122,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
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/nickos.txt b/world/map/npc/002-1/nickos.txt
index 67ac2d63..f9365d02 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -1,8 +1,8 @@
 // Sandstorm mine guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,28,94,0|script|Nickos|123,{
-
+002-1.gat,28,94,0|script|Nickos|123,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 805b8fef..2d93ffe4 100644
--- a/world/map/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
@@ -1,13 +1,15 @@
 //
 
-002-1.gat,15,67,0|script|Samuel|132,{
+002-1.gat,15,67,0|script|Samuel|132,
+{
     mes "[Samuel the Nomad]";
     mes "\"This is really a nice place.\"";
     mes "Don't you think so?\"";
     close;
 }
 
-002-1.gat,18,68,0|script|Elijah|128,{
+002-1.gat,18,68,0|script|Elijah|128,
+{
     mes "[Elijah the Nomad]";
     mes "\"If I only had a tent...\"";
     close;
diff --git a/world/map/npc/002-1/rogue.txt b/world/map/npc/002-1/rogue.txt
deleted file mode 100644
index 7358230c..00000000
--- a/world/map/npc/002-1/rogue.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-
-002-1.gat,22,21,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;
-}
diff --git a/world/map/npc/002-1/sandstorm_mine_barrier.txt b/world/map/npc/002-1/sandstorm_mine_barrier.txt
deleted file mode 100644
index 49c9b733..00000000
--- a/world/map/npc/002-1/sandstorm_mine_barrier.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-//Sandstorm mine barrier
-
-002-1.gat,20,94,0|script|#Sandstorm_Mine_Barrier|45,0,0,{
-
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
-    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
-    if (@state >= 8) goto L_Sandstorm_Barrier_Open;
-
-    message strcharinfo(0), "Some force seems to block your entrance.";
-    goto L_End;
-
-L_Sandstorm_Barrier_Open:
-    warp "002-3.gat",37,31;
-    goto L_End;
-
-L_End:
-    set @state, 0;
-    end;
-}
diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 0aa04b34..602e55fb 100644
--- a/world/map/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
@@ -1,8 +1,8 @@
 // East sandstorm guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,106,76,0|script|Stewen|123,{
-
+002-1.gat,106,76,0|script|Stewen|123,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";