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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 150 insertions, 10 deletions

diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 30d29136..75209523 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -1,218 +1,358 @@
-function|script|useWhiteWarpTowel|{
+function|script|useWhiteWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "020-1.gat",66,91; // Nivalis
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "WhiteHitchhikersTowel", 1;
     end;
 }
-function|script|useRedWarpTowel|{
+function|script|useRedWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "009-1.gat",51,40; // Hurnscald
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "RedHitchhikersTowel", 1;
     end;
 }
-function|script|useGreenWarpTowel|{
+function|script|useGreenWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "003-1.gat",35,25;
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "GreenHitchhikersTowel", 1;
     end;
 }
-function|script|useBlueWarpTowel|{
+function|script|useBlueWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "003-1.gat",35,25;
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "BlueHitchhikersTowel", 1;
     end;
 }
-function|script|useYellowWarpTowel|{
+function|script|useYellowWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "001-1.gat",40,71; // Tulimshar
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "YellowHitchhikersTowel", 1;
     end;
 }
-function|script|usePurpleWarpTowel|{
+function|script|usePurpleWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "003-1.gat",35,25;
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "PurpleHitchhikersTowel", 1;
     end;
 }
-function|script|useOrangeWarpTowel|{
+function|script|useOrangeWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "027-1.gat",70,100; // Graveyard
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "OrangeHitchhikersTowel", 1;
     end;
 }
-function|script|usePinkWarpTowel|{
+function|script|usePinkWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "012-3.gat",448,66; // Terranite Cave
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "PinkHitchhikersTowel", 1;
     end;
 }
-function|script|useTealWarpTowel|{
+function|script|useTealWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "003-1.gat",35,25;
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "TealHitchhikersTowel", 1;
     end;
 }
-function|script|useLimeWarpTowel|{
+function|script|useLimeWarpTowel|,
+{
     if (isin("botcheck.gat",25,27,51,47))
         goto L_Botcheck;
     if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100))
         goto L_Illia;
+    if (isin("029-3.gat",1,1,99,99))
+        goto L_Candor;
+    if (isin("031-4.gat",1,1,90,90))
+        goto L_Cindy;
     warp "003-1.gat",35,25;
     if (rand(15))
         goto L_Keep;
     getitem "HitchhikersTowel", 1;
     end;
 
+L_Candor:
+    message strcharinfo(0), "This area is protected by a force that doesn't tolerate the forgein powers of the towel.";
+    goto L_Keep;
+
+L_Cindy:
+    message strcharinfo(0), "Something is preventing your towel from working here.";
+    goto L_Keep;
+
 L_Illia:
     message strcharinfo(0), "The strong barrier of this island prevents you to teleport!";
     goto L_Keep;
 
 L_Botcheck:
     message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
+    goto L_Keep;
 
 L_Keep:
     getitem "LimeHitchhikersTowel", 1;