Tab conversion and script formatting project.

Final commit, maps 024-1 through 042-2 complete.

1 files changed, 89 insertions, 43 deletions

diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 03aa8a76..5498aaf2 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -13,18 +13,24 @@
     mes "\"Very well, for a fee of 20,000 GP, I will awaken that power.\"";
     menu "No, what a ripoff!", L_Exit,
          "Fine, here you go.", -;
-    if ($@FIGHT_CAVE_STATUS == 1) goto L_AlreadyStarted;
-    if (zeny >= 20000 + 3000) goto L_CallPlayers;
+    if ($@FIGHT_CAVE_STATUS == 1)
+        goto L_AlreadyStarted;
+    if (zeny >= 20000 + 3000)
+        goto L_CallPlayers;
 
 L_Paying:
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) goto L_NotEnoughPlayers;
-    if (zeny < 20000) goto L_NotEnough;
+    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+        goto L_NotEnoughPlayers;
+    if (zeny < 20000)
+        goto L_NotEnough;
 // Do not charge the money if the fight or the announces were already started by someone else
-    if ($@FIGHT_CAVE_STATUS != 0) close;
+    if ($@FIGHT_CAVE_STATUS != 0)
+        close;
     set zeny, zeny - 20000;
 
 L_StartFight:
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) goto L_NotEnoughPlayers;
+    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+        goto L_NotEnoughPlayers;
     npctalk "Let the battle begin!";
     set $@FIGHT_CAVE_STATUS, 1;
     set $@FIGHT_CAVE_LEVEL, 1;
@@ -35,29 +41,36 @@ L_StartFight:
 L_CallPlayers:
     mes "[Parua]";
     mes "\"Good... Your money will be very useful. I can awaken this power right now, if you want, or, for an additional fee of 3,000 GP, I can help you gather some of your friends to help you in this battle. What will it be?\"";
-    menu "We are OK. Just do it!", L_Paying,
-         "I will accept your help.", -;
-
+    menu
+        "We are OK. Just do it!", L_Paying,
+        "I will accept your help.", -;
     mes "[Parua]";
     mes "\"OK, I can make up to 3 announcements to the people of this world, letting them know that you are about to challenge the powers that sleep in this cave! If you want the fight to start in 5 minutes, I will make one announcement, if it is 15 minutes, I will make 2 announcements, and if it is to start in 30 minutes, it will be 3 announcements.\"";
     next;
     mes "\"But be careful! If there aren't at least five people here at the time of the fight, your money will be lost.\"";
     next;
     mes "\"So, when should it start?\"";
-    menu "In 5 minutes.", -,
-         "In 15 minutes.", -,
-         "In 30 minutes.", -,
-         "I don't want to wait. Let's start it now!", L_Paying;
+    menu
+        "In 5 minutes.", -,
+        "In 15 minutes.", -,
+        "In 30 minutes.", -,
+        "I don't want to wait. Let's start it now!", L_Paying;
 // Do not charge the money if the fight or the announces were already started by someone else
-    if ($@FIGHT_CAVE_STATUS != 0) close;
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) goto L_NotEnoughPlayers;
-    if (zeny < 20000 + 3000) goto L_NotEnough_Announce;
+    if ($@FIGHT_CAVE_STATUS != 0)
+        close;
+    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+        goto L_NotEnoughPlayers;
+    if (zeny < 20000 + 3000)
+        goto L_NotEnough_Announce;
     set zeny, zeny - (20000 + 3000);
     set $@SPONSOR$, strcharinfo(0);
     set $@FIGHT_CAVE_STATUS, $@FIGHT_CAVE_STATUS + (@menu + 2);
-    if ($@FIGHT_CAVE_STATUS == 3) set $@ANNOUNCE_TIME, gettimetick(2) + 300;
-    if ($@FIGHT_CAVE_STATUS == 4) set $@ANNOUNCE_TIME, gettimetick(2) + 900;
-    if ($@FIGHT_CAVE_STATUS >= 5) set $@ANNOUNCE_TIME, gettimetick(2) + 1800;
+    if ($@FIGHT_CAVE_STATUS == 3)
+        set $@ANNOUNCE_TIME, gettimetick(2) + 300;
+    if ($@FIGHT_CAVE_STATUS == 4)
+        set $@ANNOUNCE_TIME, gettimetick(2) + 900;
+    if ($@FIGHT_CAVE_STATUS >= 5)
+        set $@ANNOUNCE_TIME, gettimetick(2) + 1800;
     startnpctimer;
     close;
 
@@ -69,8 +82,10 @@ L_Enjoy:
 L_Wait:
     set @seconds, ($@ANNOUNCE_TIME - gettimetick(2));
     mes "[Parua]";
-    if (@seconds/60 == 0) mes "\"Be Patient... The fight will start in " + @seconds + " seconds.\"";
-    if (@seconds/60 > 0) mes "\"Be Patient... The fight will start in " + @seconds/60 + " minute(s).\"";
+    if (@seconds/60 == 0)
+        mes "\"Be Patient... The fight will start in " + @seconds + " seconds.\"";
+    if (@seconds/60 > 0)
+        mes "\"Be Patient... The fight will start in " + @seconds/60 + " minute(s).\"";
     goto L_Exit;
 
 L_NotEnough:
@@ -89,7 +104,8 @@ L_AlreadyStarted:
     goto L_Exit;
 
 L_NotEnoughPlayers:
-    if ($@FIGHT_CAVE_STATUS == 2) goto L_CleanUp_Announcement;
+    if ($@FIGHT_CAVE_STATUS == 2)
+        goto L_CleanUp_Announcement;
     mes "[Parua]";
     mes "\"Maybe you should bring some friends with you; this will get messy.\"";
     mes "He takes a moment to calculate. \"You'll probably need at least...five people, including yourself.\"";
@@ -102,8 +118,10 @@ L_Exit:
 // Fight logic
 OnTimer5000:
     setnpctimer 0;
-    if ($@FIGHT_CAVE_STATUS == 1) goto L_CaveLogic;
-    if ($@FIGHT_CAVE_STATUS >= 2) goto L_GlobalAnnounce;
+    if ($@FIGHT_CAVE_STATUS == 1)
+        goto L_CaveLogic;
+    if ($@FIGHT_CAVE_STATUS >= 2)
+        goto L_GlobalAnnounce;
 
 L_Return_1:
     set $@FIGHT_CAVE_PLAYER_COUNT, 0;
@@ -112,24 +130,32 @@ L_Return_1:
 
 L_CaveLogic:
     set $@FIGHT_CAVE_ROUND_PEN, $@FIGHT_CAVE_PLAYER_COUNT;
-    if ($@FIGHT_CAVE_ROUND_PEN > 60) set $@FIGHT_CAVE_ROUND_PEN, 60;
-    if ($@FIGHT_CAVE_PLAYER_COUNT <= 0) goto L_CleanUp;
+    if ($@FIGHT_CAVE_ROUND_PEN > 60)
+        set $@FIGHT_CAVE_ROUND_PEN, 60;
+    if ($@FIGHT_CAVE_PLAYER_COUNT <= 0)
+        goto L_CleanUp;
     set $@FIGHT_CAVE_ROUND_TIMER, $@FIGHT_CAVE_ROUND_TIMER + 5; // Advance 5 seconds
-    if (mobcount("029-3.gat", "Parua::onPetDeath") <= 0) goto L_NextRound;
-    if ($@FIGHT_CAVE_ROUND_TIMER + $@FIGHT_CAVE_ROUND_PEN >= 120) goto L_NextRound;
+    if (mobcount("029-3.gat", "Parua::onPetDeath") <= 0)
+        goto L_NextRound;
+    if ($@FIGHT_CAVE_ROUND_TIMER + $@FIGHT_CAVE_ROUND_PEN >= 120)
+        goto L_NextRound;
     goto L_Return_1;
 
 L_NextRound:
     set $@FIGHT_CAVE_ROUND_TIMER, 0;
 
     set $@FIGHT_CAVE_TEMP_UP, ($@FIGHT_CAVE_LEVEL / 10);
-    if ($@FIGHT_CAVE_TEMP_UP > 100) set $@FIGHT_CAVE_TEMP_UP, 100;
+    if ($@FIGHT_CAVE_TEMP_UP > 100)
+        set $@FIGHT_CAVE_TEMP_UP, 100;
 
     set $@FIGHT_CAVE_LEVEL, $@FIGHT_CAVE_LEVEL + $@FIGHT_CAVE_PLAYER_COUNT + $@FIGHT_CAVE_TEMP_UP;
-    if ($@FIGHT_CAVE_LEVEL >= 2200) goto L_CleanUp;
+    if ($@FIGHT_CAVE_LEVEL >= 2200)
+        goto L_CleanUp;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_LEVEL;
 
-    if ($@FIGHT_CAVE_LAST + 30  < $@FIGHT_CAVE_LEVEL) goto L_Announce;
+    if ($@FIGHT_CAVE_LAST + 30  < $@FIGHT_CAVE_LEVEL)
+        goto L_Announce;
+
 L_Return_2:
        mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
 
@@ -139,13 +165,26 @@ L_Return_2:
     set $@MOB_4_SUMMON, 0;
     set $@MOB_5_SUMMON, 0;
     set $@MOB_6_SUMMON, 0;
+
 L_Summon:
-    if ($@FIGHT_CAVE_POINTS >= 243 && $@MOB_1_SUMMON < 2) goto L_MOB1;
-    if ($@FIGHT_CAVE_POINTS >= 81 && $@MOB_2_SUMMON < 6) goto L_MOB2;
-    if ($@FIGHT_CAVE_POINTS >= 27 && $@MOB_3_SUMMON < 5) goto L_MOB3;
-    if ($@FIGHT_CAVE_POINTS >= 9 && $@MOB_4_SUMMON < 7) goto L_MOB4;
-    if ($@FIGHT_CAVE_POINTS >= 3 && $@MOB_5_SUMMON < 10) goto L_MOB5;
-    if ($@FIGHT_CAVE_POINTS >= 1 && $@MOB_6_SUMMON < 12) goto L_MOB6;
+    if ($@FIGHT_CAVE_POINTS >= 243
+        && $@MOB_1_SUMMON < 2)
+            goto L_MOB1;
+    if ($@FIGHT_CAVE_POINTS >= 81
+        && $@MOB_2_SUMMON < 6)
+            goto L_MOB2;
+    if ($@FIGHT_CAVE_POINTS >= 27
+        && $@MOB_3_SUMMON < 5)
+            goto L_MOB3;
+    if ($@FIGHT_CAVE_POINTS >= 9
+        && $@MOB_4_SUMMON < 7)
+            goto L_MOB4;
+    if ($@FIGHT_CAVE_POINTS >= 3
+        && $@MOB_5_SUMMON < 10)
+            goto L_MOB5;
+    if ($@FIGHT_CAVE_POINTS >= 1
+        && $@MOB_6_SUMMON < 12)
+            goto L_MOB6;
     goto L_Return_1;
 
 L_Announce:
@@ -154,20 +193,26 @@ L_Announce:
     goto L_Return_2;
 
 L_GlobalAnnounce:
-    if ($@FIGHT_CAVE_STATUS == 3) goto L_Five_Minutes;
-    if ($@FIGHT_CAVE_STATUS == 4) goto L_Fifteen_Minutes;
-    if ($@FIGHT_CAVE_STATUS >= 5) goto L_Thirty_Minutes;
-    if (gettimetick(2) >= $@ANNOUNCE_TIME) goto L_StartFight;
+    if ($@FIGHT_CAVE_STATUS == 3)
+        goto L_Five_Minutes;
+    if ($@FIGHT_CAVE_STATUS == 4)
+        goto L_Fifteen_Minutes;
+    if ($@FIGHT_CAVE_STATUS >= 5)
+        goto L_Thirty_Minutes;
+    if (gettimetick(2) >= $@ANNOUNCE_TIME)
+        goto L_StartFight;
     end;
 
 L_Five_Minutes:
-    if ($@ANNOUNCE_TIME - gettimetick(2) > 300) end;
+    if ($@ANNOUNCE_TIME - gettimetick(2) > 300)
+        end;
     announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 2;
     end;
 
 L_Fifteen_Minutes:
-    if ($@ANNOUNCE_TIME - gettimetick(2) > 900) end;
+    if ($@ANNOUNCE_TIME - gettimetick(2) > 900)
+        end;
     announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 15 minutes. Right now, there are " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 3;
     end;
@@ -225,6 +270,7 @@ onPetDeath:
 onInit:
     initnpctimer;
     stopnpctimer;
+
 L_CleanUp:
     npctalk "Game Over";
     mapannounce "029-1.gat", "Parua: The dungeon is now ready for its next victims.", 0;