Clean up script

11 files changed, 29 insertions, 34 deletions

diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index 7fab4bcd..6580664f 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -224,7 +224,7 @@ L_TorsoNext:
     next;
     menu
         "I'm in! What kind of test is it?",L_test,
-        "I don't think I need more speed right now",L_giveup;
+        "I don't think I need more speed right now",L_GiveUp;
 
 L_test:
     mes "[Miriam]";
@@ -262,7 +262,7 @@ L_noskill:
     mes "\"For a person like you, I could even teach a useful skill! Too bad you don't have the basic abillities to learn it...\"";
     close;
 
-L_giveup:
+L_GiveUp:
     mes "[Miriam]";
     mes "\"Oh, that is too bad... But if you change your mind, come back!\"";
     set QUEST_MIRIAM, 4;
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 5e74a481..d5da641a 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -41,7 +41,7 @@
 
     set @Q_needs_stinger, ((QUEST_Forestbow_state & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT) > 1;
 
-    if (@Q_status == @QS_KNIFE_QUEST) goto L_check;
+    if (@Q_status == @QS_KNIFE_QUEST) goto L_Check;
 
     if (@Q_status == @QS_STINGER_QUEST) goto L_stinger_check;
 
@@ -637,7 +637,7 @@ L_bone_tooweak:
     next;
     goto L_main_menu;
 
-L_check:
+L_Check:
     mes "[Kfahr the Warrior]";
     mes "Kfahr eyes you with unconcealed amusement.";
     mes "\"Welcome back!  Did you bring me the things I asked for?\"";
@@ -849,7 +849,7 @@ L_Next2:
     mes "[Kfahr the Warrior]";
     mes "\"A golden scorpion stinger?  Those are rare and valuable, I hope that you know that!\"";
     if (BaseLevel < 60)
-        goto L_too_lowlevel_for_stinger;
+        goto L_lowlvl_for_stinger;
     if (@Q_status < @QS_KNIFE_QUEST)
         goto L_golden_requires_quest;
     if (@Q_status < @QS_KNIFE_QUEST_DONE)
@@ -887,7 +887,7 @@ L_wrestle_explain:
     next;
     goto L_gs_wrestle_intro;
 
-L_too_lowlevel_for_stinger:
+L_lowlvl_for_stinger:
     mes "\"Well, I have one, but I can't just give it to anyone. Maybe if you train a little and become a worthy warrior I will consider giving it away...\"";
     next;
     goto L_main_menu;
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index 16dda84f..6304acb8 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -2,8 +2,8 @@
 {
     set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-    if @spants_state < 3 goto L_Regular;
-    if @spants_state == 3 goto L_Ask;
+    if (@spants_state < 3) goto L_Regular;
+    if (@spants_state == 3) goto L_Ask;
     if (@spants_state == 4 || @spants_state == 5 || @spants_state == 6) goto L_Ask_Again;
     goto L_Main;
 
@@ -187,7 +187,7 @@ L_Personal:
     mes "\"Ah. Here it is:\"";
     mes "\"Today you have accomplished tasks that are worth " + DailyQuestPoints + " Hours in the Northern Mines\"";
     next;
-    if BOSS_POINTS < 1000 goto L_Worm;
+    if (BOSS_POINTS < 1000) goto L_Worm;
     emotion EMOTE_DEAD;
     mes "[Crastur]";
     mes "";
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 12385c85..7f32bf60 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -232,17 +232,12 @@ L_Lvl2_must_practice:
     next;
     goto L_Farewell;
 
-L_Farewell:
-    mes "[Mystic Sword]";
-    mes "\"Farewell for now!\"";
-    close;
-
 L_L2_W12:
     mes "[Mystic Sword]";
     mes "\"Welcome back, traveler!  Hast thou returned to advance in thy quest for magic?\"";
     next;
     menu
-        "No.", L_farewell,
+        "No.", L_Farewell,
         "Yes.", L_Next2;
 
 L_Next2:
@@ -250,7 +245,7 @@ L_Next2:
     mes "\"Very well. I shall teach thee another spell, if thou provest thy progress by sacrificing another five thousand monster points.\"";
     next;
     menu
-        "No, I don't want that.", L_farewell,
+        "No, I don't want that.", L_Farewell,
         "So be it.", L_Next3;
 
 L_Next3:
@@ -285,7 +280,7 @@ L_L2_W10:
     next;
     menu
         "OK.", L_Next4,
-        "No way.", L_farewell;
+        "No way.", L_Farewell;
 
 L_Next4:
     if (countitem("IronOre") < 1)
@@ -307,14 +302,14 @@ L_Next4:
     mes "[Mystic Sword]";
     mes "\"This powder thou shalst need to cast the lightning spell. Throw it up into the air and shout '" + getspellinvocation("lightning-strike") +  "', and smite thine enemies with lightning.\"";
     next;
-    goto L_farewell;
+    goto L_Farewell;
 
 L_no_ore:
     mes "[Mystic Sword]";
     mes "\"Thou dost appear to lack ore. We cannot continue; please fare well and return swiftly!\"";
     close;
 
-L_farewell:
+L_Farewell:
     mes "[Mystic Sword]";
     mes "\"Then I bid thee farewell for now!\"";
     close;
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 618f4a8f..421a04ab 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -201,7 +201,7 @@ L_Oath:
     next;
     mes "Warric screams at your silence.";
     mes "[Waric]";
-    mes "\Say it! Say it now!\"";
+    mes "\"Say it! Say it now!\"";
     next;
     menu
         "[Say the oath]", L_Next3,
diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt
index 1d2b2165..c0adafd1 100644
--- a/world/map/npc/027-8/general_terogan.txt
+++ b/world/map/npc/027-8/general_terogan.txt
@@ -149,8 +149,8 @@ L_CryptLogic:
     if ($@CRYPT_FIGHT3_ROUND_PEN > 60)
         set $@CRYPT_FIGHT3_ROUND_PEN, 60;
     if ($@CRYPT_FIGHT3_PLAYER_COUNT <= 0) goto L_CleanUpLosers;
-    if getareausers("027-8", 20, 39, 35, 60, 1) < 1 goto L_Failure;
-    if getareausers("027-8", 43, 39, 58, 60, 1) < 1 goto L_Failure;
+    if (getareausers("027-8", 20, 39, 35, 60, 1) < 1) goto L_Failure;
+    if (getareausers("027-8", 43, 39, 58, 60, 1) < 1) goto L_Failure;
     set $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
     if (mobcount("027-8", "General Terogan#Main::OnPetDeath") < 0)
         goto L_NextWave;
@@ -226,7 +226,7 @@ OnPetDeath:
     end;
 
 L_Failure:
-    if $@CRYPT_FAIL_ANNOUNCED goto L_NextWave;
+    if ($@CRYPT_FAIL_ANNOUNCED) goto L_NextWave;
     set $@CRYPT_FAIL_ANNOUNCED, 1;
     mapannounce "027-8", "Looks like your neighbour team to is finished off, this is your death sentence!", 0;
     set $@CRYPT_FIGHT3_WAVE, 23;
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index c0eacba6..4e4a78a6 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -24,7 +24,7 @@ L_Hasan:
 L_Next:
     mes "\"Ah, Hasan. He's causing trouble again?\"";
     mes "She shakes her head.";
-    mes "\This guy has been a plague ever since he could walk. He's always causing trouble.\"";
+    mes "\"This guy has been a plague ever since he could walk. He's always causing trouble.\"";
     mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
     mes "\"He took him into the desert and then left him there!";
     mes "Hasan was only seven years old!\"";
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 0c0fef07..feea5f5f 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -138,7 +138,7 @@ L_Walk:
     mes "\"You can use the arrow keys to walk around.";
     mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
     mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
-    mes " or click on the place you want to go to.\"";
+    mes " or click on the place you want to go to.";
     mes "This only works if that place is reachable and walkable.\"";
     goto L_Close;
 
@@ -164,7 +164,7 @@ L_Items:
     next;
     mes "\"Consumable items such as Potions, can be used only once.";
     mes "After use, they will disappear from your inventory.";
-    mes "There are some rare items that can be used but don't get consumed.";
+    mes "There are some rare items that can be used but don't get consumed.\"";
     next;
     mes "\"Equipment items like Armors, Weapons, Accessories can be equipped for fashionable purposes or to raise your status.\"";
     next;
@@ -215,7 +215,7 @@ L_Next:
     mes "\"Ah, Hasan. He's causing trouble again?\"";
     mes "She shakes her head.";
     mes "[Sorfina]";
-    mes "\This guy has been a plague ever since he could walk. He's always causing trouble.\"";
+    mes "\"This guy has been a plague ever since he could walk. He's always causing trouble.\"";
     mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
     mes "\"He took him into the desert and then left him there!";
     mes "Hasan was only seven years old!\"";
diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt
index a23cacb7..818fabae 100644
--- a/world/map/npc/030-2/avalia.txt
+++ b/world/map/npc/030-2/avalia.txt
@@ -168,9 +168,9 @@ L_Reward:
     mes "[Avalia]";
     mes "\"Thanks for all the help.\"";
     mes "\"Take this as a token of my gratitude.\"";
-    if @xmas_reward2_done_state
+    if (@xmas_reward2_done_state)
         set @xmas_state, $@xmas_reward_done;
-    if @xmas_reward_start_state
+    if (@xmas_reward_start_state)
         set @xmas_state, $@xmas_reward1_done;
     callfunc "XmasSetState";
     callfunc "XmasMainXpBpReward";
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index b580476a..c31cbf04 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -175,7 +175,7 @@ L_OffSeason:
     end;
 
 L_XmasMain:
-    if !(@xmas_knows_route) goto L_SetPath;
+    if(!(@xmas_knows_route)) goto L_SetPath;
     if((@xmas_list_deliver) && !(@xmas_side)) goto L_OffSeason;
     if((@xmas_reward_done_state) && (@xmas_side)) goto L_ThankYou;
     if((@xmas_reward1_done_state) && (@xmas_side)) goto L_Thanks;
@@ -449,9 +449,9 @@ L_Quick:
 L_Reward:
     mes "[Orum's Homunculus]";
     mes "\"Revenge is a dish best served cold..\"";
-    if @xmas_reward2_done_state
+    if (@xmas_reward2_done_state)
         set @xmas_state, $@xmas_reward_done;
-    if @xmas_reward_start_state
+    if (@xmas_reward_start_state)
         set @xmas_state, $@xmas_reward1_done;
 
     callfunc "XmasSetState";
diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt
index 30fc12ce..7eae6f63 100644
--- a/world/map/npc/048-2/helperChief.txt
+++ b/world/map/npc/048-2/helperChief.txt
@@ -8,7 +8,7 @@
 {
     set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT);
 
-    if (@investigate >= 11) goto L_GoodJob;
+    if (@investigate >= 11) goto L_Goodjob;
     if (@investigate > 1) goto L_Investigate;
 
     mes "[Oskari]";
@@ -82,7 +82,7 @@ L_Continue:
     callfunc "updateBlueSageInvestigate";
     goto L_Close;
 
-L_GoodJob:
+L_Goodjob:
     mes "[Oskari]";
     mes "\"Thanks again for your investigations.\"";
     menu