Tab conversion and formatting project.

npc/functions and npc/items complete.

1 files changed, 77 insertions, 36 deletions

diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index fe72eb72..2a5aadd4 100644
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -19,9 +19,12 @@ L_Level:
     mes "Which level do you want to be? (min: 1 - max: 255)";
     next;
     input @lvl;
-    if (@lvl > 255) goto L_Leveltoohigh;
-    if (@lvl < 1) goto L_Leveltoolow;
-    if (Baselevel == @lvl) goto L_Samelvl;
+    if (@lvl > 255)
+        goto L_Leveltoohigh;
+    if (@lvl < 1)
+        goto L_Leveltoolow;
+    if (Baselevel == @lvl)
+        goto L_Samelvl;
     set BaseLevel, @lvl;
     resetstatus;
     message strcharinfo(0), "New level: " + Baselevel;
@@ -63,11 +66,14 @@ L_Unfocus:
     cleararray @skilllist_name$[0], "", 8;
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
-    if (getskilllv(SKILL_POOL) == 0) setskill SKILL_POOL, 1;
+    if (getskilllv(SKILL_POOL) == 0)
+        setskill SKILL_POOL, 1;
     getactivatedpoolskilllist;
-    if (@skilllist_count == 0) goto L_Focus;
+    if (@skilllist_count == 0)
+        goto L_Focus;
     getactivatedpoolskilllist;
-    if (@skilllist_count != 0) goto L_Askunfocus;
+    if (@skilllist_count != 0)
+        goto L_Askunfocus;
     mes "You aren't focused on a skill at the moment";
     goto L_Skills;
 
@@ -84,7 +90,8 @@ L_Focus:
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
     getunactivatedpoolskilllist;
-    if (@skilllist_count == 0) goto L_Noskills;
+    if (@skilllist_count == 0)
+        goto L_Noskills;
     set @skilllist_id[@skilllist_count], 0;
     set @skilllist_name$[@skilllist_count], "Back to skills menu";
     mes "You don't have any skill focused right now. Which one do you want to focus?";
@@ -110,8 +117,10 @@ L_Seeskills:
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
     getactivatedpoolskilllist;
-    if (@skilllist_count == 0) goto L_Focusmessage;
-    if (@skilllist_count != 0) mes "You are focused on " + @skilllist_name$[@skilllist_count-1] + " skill.";
+    if (@skilllist_count == 0)
+        goto L_Focusmessage;
+    if (@skilllist_count != 0)
+        mes "You are focused on " + @skilllist_name$[@skilllist_count-1] + " skill.";
 
 L_Skillsoverview:
     mes "You level in mallards eye skill is " + @mallard;
@@ -148,42 +157,48 @@ L_Badskilllvl:
 L_Changemallard:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_MALLARDS_EYE, @lvl;
     goto L_Skills;
 
 L_Changebrawling:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_BRAWLING, @lvl;
     goto L_Skills;
 
 L_Changespeed:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_SPEED, @lvl;
     goto L_Skills;
 
 L_Changepoison:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_RESIST_POISON, @lvl;
     goto L_Skills;
 
 L_Changeastralsoul:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_ASTRAL_SOUL, @lvl;
     goto L_Skills;
 
 L_Changeraging:
     mes "Enter the lvl you want to be in this skill(min: 1 - max: 9):";
     input @lvl;
-    if (@lvl < 1 || @lvl > 9) goto L_Badskilllvl;
+    if (@lvl < 1 || @lvl > 9)
+        goto L_Badskilllvl;
     setskill SKILL_WARRIOR_RAGING, @lvl;
     goto L_Skills;
 
@@ -225,7 +240,7 @@ L_Magic:
 
 L_Nomagicskills:
     mes "You can't have magic experience, since you have no magic skills.";
-   goto L_Magic;
+    goto L_Magic;
 
 L_GetAllMagic:
     setskill SKILL_MAGIC, 2;
@@ -254,13 +269,26 @@ L_Wrongexp:
 
 L_Magicexp:
     mes "Your current magic experience is " + @mexp;
-    if (@general == 0 && @life == 0 && @war == 0  && @trans == 0  && @nature == 0  && @astral == 0) goto L_Nomagicskills;
-    if (@general == 2 || @life == 2 || @war == 2  || @trans == 2  || @nature == 2  || @astral == 2) goto L_Magicexp2;
+    if (@general == 0
+        && @life == 0
+        && @war == 0
+        && @trans == 0
+        && @nature == 0
+        && @astral == 0)
+            goto L_Nomagicskills;
+    if (@general == 2
+        || @life == 2
+        || @war == 2
+        || @trans == 2
+        || @nature == 2
+        || @astral == 2)
+            goto L_Magicexp2;
 
 L_Magicexp1:
     mes "Set the desired magic experience (min: 1 - max: 100)";
     input @value;
-    if (@value < 1 || @value > 100) goto L_Wrongexp;
+    if (@value < 1 || @value > 100)
+        goto L_Wrongexp;
     set @mexp, @value;
     callsub S_Update_Mask;
     goto L_Magic;
@@ -268,7 +296,8 @@ L_Magicexp1:
 L_Magicexp2:
     mes "Set the desired magic experience (min: 100 - max: 1200)";
     input @value;
-    if (@value < 100 || @value > 1200) goto L_Wrongexp;
+    if (@value < 100 || @value > 1200)
+        goto L_Wrongexp;
     set @mexp, @value;
     callsub S_Update_Mask;
     goto L_Magic;
@@ -302,12 +331,14 @@ L_Changegeneral:
         "Get Level one", -,
         "Get Level two", L_Generallvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC, 1;
     goto L_Magic;
 
 L_Generallvl2:
     setskill SKILL_MAGIC, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     goto L_Magic;
 
@@ -317,12 +348,14 @@ L_Changelife:
         "Get Level one", -,
         "Get Level two", L_Lifelvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC_LIFE, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC_LIFE, 1;
     goto L_Magic;
 
 L_Lifelvl2:
     setskill SKILL_MAGIC_LIFE, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     goto L_Magic;
 
@@ -332,12 +365,14 @@ L_Changewar:
         "Get Level one", -,
         "Get Level two", L_Warlvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC_WAR, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC_WAR, 1;
     goto L_Magic;
 
 L_Warlvl2:
     setskill SKILL_MAGIC_WAR, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     goto L_Magic;
 
@@ -347,12 +382,14 @@ L_Changetrans:
         "Get Level one", -,
         "Get Level two", L_Translvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC_TRANSMUTE, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC_TRANSMUTE, 1;
     goto L_Magic;
 
 L_Translvl2:
     setskill SKILL_MAGIC_TRANSMUTE, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     goto L_Magic;
 
@@ -362,12 +399,14 @@ L_Changenature:
         "Get Level one", -,
         "Get Level two", L_Naturelvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC_NATURE, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC_NATURE, 1;
     goto L_Magic;
 
 L_Naturelvl2:
     setskill SKILL_MAGIC_NATURE, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     close;
 
@@ -377,12 +416,14 @@ L_Changeastral:
         "Get Level one", -,
         "Get Level two", L_Astrallvl2,
         "Back to magic menu", L_Magic;
-    if (@menu == 1) setskill SKILL_MAGIC_ASTAL, 1;
+    if (@menu == 1)
+        setskill SKILL_MAGIC_ASTAL, 1;
     goto L_Magic;
 
 L_Astrallvl2:
     setskill SKILL_MAGIC_ASTRAL, 2;
-    if (@mexp < 100) set @mexp, 100;
+    if (@mexp < 100)
+        set @mexp, 100;
     callsub S_Update_Mask;
     goto L_Magic;
 
@@ -391,8 +432,8 @@ L_Status:
     goto L_Begin;
 
 S_Update_Mask:
-        set MAGIC_EXPERIENCE,
-            (MAGIC_EXPERIENCE & ~(@debug_mask))
-                | (@mexp << @debug_shift);
-        return;
+    set MAGIC_EXPERIENCE,
+        (MAGIC_EXPERIENCE & ~(@debug_mask))
+            | (@mexp << @debug_shift);
+    return;
 }