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

3 files changed, 0 insertions, 78 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-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;
-}