Tab conversion and script formatting project.

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

2 files changed, 87 insertions, 101 deletions

diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt
index 488f600a..dbc82681 100644
--- a/world/map/npc/031-2/angelaHouse.txt
+++ b/world/map/npc/031-2/angelaHouse.txt
@@ -1,113 +1,97 @@
 // author: Jenalya
-// reviewed by: 
+// reviewed by:
 // state0, 1, 2: you shouldn't be able to come here
 // state3: it's your first visit, you can choose a reward
 // state4: you can do daily quests with white and yellow presents boxes
-// 
+//
 
-031-2.gat,29,28,0	script	Angela	196, {
+031-2.gat,29,28,0|script|Angela|196,{
 
-	set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
-	set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
+    set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
+    set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
 
-	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
-   
-    if (@rescue_Cindy == 4) goto L_Hello_Again;  
-	if (@rescue_Cindy == 3) goto L_Reward;
+    set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
+
+    if (@rescue_Cindy == 4) goto L_Hello_Again;
+    if (@rescue_Cindy == 3) goto L_Reward;
+
+    mes "...";
+    close;
 
-	mes "...";
-	close;
-	
 L_Reward:
-	mes "[Angela]";
-	mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad Cindy is back home safe.\"";
-	next;
-	mes "\"As I told you, my husband is an adventurer. He is on one of his travels, so he couldn't rescue Cindy himself.\"";
-	next;
-	mes "\"I want to give you one of his treasures. Beside all the junk he brings, there are some very valuable things.\"";
-	next;
-	mes "\"This item is called the Rock Knife. When you wield it, you feel as robust as a rock.\"";
-	
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Full_Inv;
+    mes "[Angela]";
+    mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad Cindy is back home safe.\"";
+    next;
+    mes "\"As I told you, my husband is an adventurer. He is on one of his travels, so he couldn't rescue Cindy himself.\"";
+    next;
+    mes "\"I want to give you one of his treasures. Beside all the junk he brings, there are some very valuable things.\"";
+    next;
+    mes "\"This item is called the Rock Knife. When you wield it, you feel as robust as a rock.\"";
+
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
+    getitem "RockKnife", 1;
+    set @rescue_Cindy, 4;
+    callsub S_Update_Mask;
+
+    next;
+    mes "\"I hope this will be useful for you.\"";
+    next;
+    mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
+    next;
+    mes "\"Usually, Yetis are very shy - I wonder why they did that. There is something strange going on.\"";
+    next;
+    mes "\"May I ask you for help again? I'll give you a small reward for every 3 boxes of one color you bring me.\"";
+    close;
 
-	getitem "RockKnife", 1;
-	
-	set @rescue_Cindy, 4;
-	callsub S_Update_Mask;
-	
-	next;
-	mes "\"I hope this will be useful for you.\"";
-	next;
-	mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
-	next;
-	mes "\"Usually, Yetis are very shy - I wonder why they did that. There is something strange going on.\"";
-	next;
-	mes "\"May I ask you for help again? I'll give you a small reward for every 3 boxes of one color you bring me.\"";
-	close;
-	
 L_Full_Inv:
-	mes "\"Oh, it seems you carry so much stuff - I will keep it for you until you can take it.\"";
-	close;
-	
+    mes "\"Oh, it seems you carry so much stuff - I will keep it for you until you can take it.\"";
+    close;
+
 L_Hello_Again:
-	mes "[Angela]";
-	mes "\"Hello! Good to see you again. Please warm yourself.\"";
-	next;
-	menu 
-		"I just wanted to say hello.",-,
-		"I have some yellow present boxes.",L_Yellow,
-		"I have some white present boxes.",L_White;  
-	close;
-	
-L_Yellow:
-	set @dq_level, 70;
-	set @dq_cost, 32;
-	set @dq_count, 3;
-	set @dq_name$, "YellowPresentBox";
-	set @dq_friendly_name$, "yellow present box";
-	set @dq_money, 5300;
-	set @dq_exp, 1300;
+    mes "[Angela]";
+    mes "\"Hello! Good to see you again. Please warm yourself.\"";
+    next;
+    menu
+        "I just wanted to say hello.",-,
+        "I have some yellow present boxes.",L_Yellow,
+        "I have some white present boxes.",L_White;
+    close;
 
-	callfunc "DailyQuest";
-	
-	next;
-	
-	if (@dq_return ==4) mes "\"Santa will be glad to have them back.\"";
-	close;
+L_Yellow:
+    set @dq_level, 70;
+    set @dq_cost, 32;
+    set @dq_count, 3;
+    set @dq_name$, "YellowPresentBox";
+    set @dq_friendly_name$, "yellow present box";
+    set @dq_money, 5300;
+    set @dq_exp, 1300;
+
+    callfunc "DailyQuest";
+    next;
+    if (@dq_return ==4)
+        mes "\"Santa will be glad to have them back.\"";
+    close;
 
 L_White:
-	set @dq_level, 80;
-	set @dq_cost, 64;
-	set @dq_count, 3;
-	set @dq_name$, "WhitePresentBox";
-	set @dq_friendly_name$, "white present box";
-	set @dq_money, 10800;
-	set @dq_exp, 2800;
+    set @dq_level, 80;
+    set @dq_cost, 64;
+    set @dq_count, 3;
+    set @dq_name$, "WhitePresentBox";
+    set @dq_friendly_name$, "white present box";
+    set @dq_money, 10800;
+    set @dq_exp, 2800;
+
+    callfunc "DailyQuest";
+    next;
+    if (@dq_return ==4)
+        mes "\"You are a great help!\"";
+    close;
 
-	callfunc "DailyQuest";
-	
-	next;
-	
-	if (@dq_return ==4) mes "\"You are a great help!\"";
-	close;
-	
 S_Update_Mask:
-        set QUEST_Nivalis_state,
-        	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-                | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-        return;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+    set QUEST_Nivalis_state,
+        (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+            | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
+    return;
+}
\ No newline at end of file
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 79b8704c..beae6e0a 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -19,7 +19,9 @@
 L_Happy_Random:
     getinventorylist;
     set @candy, rand(50);
-    if (@inventorylist_count < 100 && @candy == 42) goto L_Candy;
+    if (@inventorylist_count < 100
+        && @candy == 42)
+            goto L_Candy;
 
     setarray @quote_Cindy$, "Thank you so much for rescuing me!",
     "My mother made really tasty cookies yesterday. But I already ate them all...",
@@ -45,8 +47,8 @@ L_Candy:
     close;
 
 S_Update_Mask:
-        set QUEST_Nivalis_state,
-            (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-                | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-        return;
+    set QUEST_Nivalis_state,
+        (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+            | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
+    return;
 }