From 41cf7ad917b65d4878a162f62a45b2afcd9e42b5 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:15:29 -0600
Subject: NPCs on 025-* fixed

---
 world/map/npc/025-1/barrier.txt     |  2 +-
 world/map/npc/025-1/reset.txt       |  4 ++--
 world/map/npc/025-1/rossy.txt       |  2 +-
 world/map/npc/025-3/barriers.txt    | 20 ++++++++---------
 world/map/npc/025-4/battlecaves.txt | 44 ++++++++++++++++++-------------------
 world/map/npc/025-4/clauquer.txt    |  2 +-
 world/map/npc/025-4/julia.txt       |  2 +-
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index f06ca610..8259c2ff 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1,
+025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1
 {
     if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp;
     if (Rossy_Quest <= 13) goto L_Block;
diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt
index 5084d905..c1b38021 100644
--- a/world/map/npc/025-1/reset.txt
+++ b/world/map/npc/025-1/reset.txt
@@ -1,12 +1,12 @@
 //To enable: sed 's_^// __' -i npc/025-1/reset.txt
 
-// 025-1.gat,47,84,0|script|reset|145,
+// 025-1.gat,47,84,0|script|reset|145
 // {
 //   mes "Do you want to reset Rossy Quest?";
 //   menu
 //     "Reset every variable of the quest.", -,
 //     "Set Rossy_Quest.", L_Set,
-//     "Pass cave quest.", L_Pass2,
+//     "Pass cave quest.", L_Pass2
 //     "Pass all caves except boss cave.", L_Pass,
 //     "Do not reset.", L_No;
 //   set Rossy_Quest, 0;
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index e9a58afa..412f3f48 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-1.gat,80,88,0|script|Rossy|114,
+025-1.gat,80,88,0|script|Rossy|114
 {
     set @child_number, 6;
     callfunc "XmasList";
diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 7e452316..dac14128 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -2,7 +2,7 @@
 
 // -----------------------------------Warp to Cave 1 ---------------------------------------
 
-025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1,
+025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -129,7 +129,7 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 2 ----------------------------
 
-025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1,
+025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -255,7 +255,7 @@ L_AlreadyClean:
 
 // --------------------------------- Warp to Cave 3 ----------------------------------------
 
-025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1,
+025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -381,7 +381,7 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 4 --------------------------------------
 
-025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1,
+025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -507,7 +507,7 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 5 ----------------------------------------
 
-025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1,
+025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -633,7 +633,7 @@ L_AlreadyClean:
 
 // -------------------------------- Warp to Cave 6 -----------------------------------------
 
-025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1,
+025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -759,7 +759,7 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 7 ------------------------------------------
 
-025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1,
+025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -885,7 +885,7 @@ L_AlreadyClean:
 
 // -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
 
-025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1,
+025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -1011,7 +1011,7 @@ L_AlreadyClean:
 
 // ------------------------------ Warp to Cave 9 ----------------------------------------
 
-025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1,
+025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
@@ -1137,7 +1137,7 @@ L_AlreadyClean:
 
 // ----------------------------- Warp to Boss Cave -------------------------------
 
-025-3.gat,77,170,0|script|#WarpBossCave|45,1,1,
+025-3.gat,77,170,0|script|#WarpBossCave|45,1,1
 {
     if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         end;
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 18f32602..142f1282 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -2,7 +2,7 @@
 
 // ---------------------------------    Cave 1    -----------------------------------
 
-025-4.gat,41,85,0|script|#StartCaveFight1|324,
+025-4.gat,41,85,0|script|#StartCaveFight1|324
 {
     if ($@battlecave1 == 2 && $@cave1fighter$ == strcharinfo(0))
         end;
@@ -79,7 +79,7 @@ L_no_root:
 
 // ---------------------  Cave 1 Checker  ----------------------------
 
-025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1,
+025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1
 {
     if (cavefights & BATTLE_CAVE1 || $@battlecave1 == 1)
         goto L_Done;
@@ -94,7 +94,7 @@ L_Done:
 // ---------------------------------    Cave 2   ---------------------------------------
 
 
-025-4.gat,115,77,0|script|#StartCaveFight2|324,
+025-4.gat,115,77,0|script|#StartCaveFight2|324
 {
     if ($@battlecave2 == 2 && $@cave2fighter$ == strcharinfo(0))
         end;
@@ -171,7 +171,7 @@ L_no_root:
 
 // ---------------------  Cave 2 Checker  ----------------------------
 
-025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1,
+025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1
 {
     if (cavefights & BATTLE_CAVE2 || $@battlecave2 == 1)
         goto L_Done;
@@ -184,7 +184,7 @@ L_Done:
 }
 
 // ------------------------------------    Cave 3    --------------------------------------
-025-4.gat,164,103,0|script|#StartCaveFight3|324,
+025-4.gat,164,103,0|script|#StartCaveFight3|324
 {
     if ($@battlecave3 == 2 && $@cave3fighter$ == strcharinfo(0))
         end;
@@ -262,7 +262,7 @@ L_no_root:
 
 // ---------------------  Cave 3 Checker  ----------------------------
 
-025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1,
+025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1
 {
     if (cavefights & BATTLE_CAVE3 || $@battlecave3 == 1)
         goto L_Done;
@@ -275,7 +275,7 @@ L_Done:
 }
 
 // ---------------------------    Cave 4    --------------------------------
-025-4.gat,39,143,0|script|#StartCaveFight4|324,
+025-4.gat,39,143,0|script|#StartCaveFight4|324
 {
     if ($@battlecave4 == 2 && $@cave4fighter$ == strcharinfo(0))
         end;
@@ -355,7 +355,7 @@ L_no_root:
 
 // ---------------------  Cave 4 Checker  ----------------------------
 
-025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1,
+025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1
 {
     if (cavefights & BATTLE_CAVE4 || $@battlecave4 == 1)
         goto L_Done;
@@ -369,7 +369,7 @@ L_Done:
 
 // ----------------------------    Cave 5    ------------------------------
 
-025-4.gat,109,143,0|script|#StartCaveFight5|324,
+025-4.gat,109,143,0|script|#StartCaveFight5|324
 {
     if ($@battlecave5 == 2 && $@cave5fighter$ == strcharinfo(0))
         end;
@@ -449,7 +449,7 @@ L_no_root:
 
 // ---------------------  Cave 5 Checker  ----------------------------
 
-025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1,
+025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1
 {
     if (cavefights & BATTLE_CAVE5 || $@battlecave5 == 1)
         goto L_Done;
@@ -463,7 +463,7 @@ L_Done:
 
 // --------------------------------    Cave 6    -----------------------------------------
 
-025-4.gat,162,162,0|script|#StartCaveFight6|324,
+025-4.gat,162,162,0|script|#StartCaveFight6|324
 {
     if ($@battlecave6 == 2 && $@cave6fighter$ == strcharinfo(0))
         end;
@@ -543,7 +543,7 @@ L_no_root:
 
 // ---------------------  Cave 6 Checker  ----------------------------
 
-025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1,
+025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1
 {
     if (cavefights & BATTLE_CAVE6 || $@battlecave6 == 1)
         goto L_Done;
@@ -557,7 +557,7 @@ L_Done:
 
 // --------------------------------    Cave 7    -----------------------------------
 
-025-4.gat,44,202,0|script|#StartCaveFight7|324,
+025-4.gat,44,202,0|script|#StartCaveFight7|324
 {
     if ($@battlecave7 == 2 && $@cave7fighter$ == strcharinfo(0))
         end;
@@ -639,7 +639,7 @@ L_no_root:
 
 // ---------------------  Cave 7 Checker  ----------------------------
 
-025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1,
+025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1
 {
     if (cavefights & BATTLE_CAVE7 || $@battlecave7 == 1)
         goto L_Done;
@@ -653,7 +653,7 @@ L_Done:
 
 // ---------------------------    Cave 8    -------------------------------
 
-025-4.gat,105,210,0|script|#StartCaveFight8|324,
+025-4.gat,105,210,0|script|#StartCaveFight8|324
 {
     if ($@battlecave8 == 2 && $@cave8fighter$ == strcharinfo(0))
         end;
@@ -735,7 +735,7 @@ L_no_root:
 
 // ---------------------  Cave 8 Checker  ----------------------------
 
-025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1,
+025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1
 {
     if (cavefights & BATTLE_CAVE8 || $@battlecave8 == 1)
         goto L_Done;
@@ -749,7 +749,7 @@ L_Done:
 
 // ---------------------------    Cave 9    -------------------------------
 
-025-4.gat,157,220,0|script|#StartCaveFight9|324,
+025-4.gat,157,220,0|script|#StartCaveFight9|324
 {
     if ($@battlecave9 == 2 && $@cave9fighter$ == strcharinfo(0))
         end;
@@ -831,7 +831,7 @@ L_no_root:
 
 // ---------------------  Cave 9 Checker  ----------------------------
 
-025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1,
+025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1
 {
     if (cavefights & BATTLE_CAVE9 || $@battlecave9 == 1)
         goto L_Done;
@@ -845,7 +845,7 @@ L_Done:
 
 // ---------------------  Boss Cave  ----------------------------
 
-025-4.gat,157,30,0|script|#StartBossCaveFight|325,
+025-4.gat,157,30,0|script|#StartBossCaveFight|325
 {
     if ($@battlecave10 == 2 && $@cave10fighter$ == strcharinfo(0))
         end;
@@ -949,7 +949,7 @@ L_no_root:
 
 // ---------------------  Boss Cave Checker  ----------------------------
 
-025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1,
+025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1
 {
     if (Rossy_Quest >= 17)
         goto L_Done;
@@ -976,7 +976,7 @@ L_Out:
 
 // ---------------------  Julia Cave Checker Outside  ----------------------------
 
-025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1,
+025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1
 {
     if (Rossy_Quest > 15)
         goto L_Done;
@@ -991,7 +991,7 @@ L_Done:
 
 // ---------------------  Julia Cave Checker Inside  ----------------------------
 
-025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1,
+025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1
 {
     if (Rossy_Quest >= 17)
         goto L_Done;
diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index 2415f59c..5a805f63 100644
--- a/world/map/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-4.gat,30,30,0|script|Clauquer|169,
+025-4.gat,30,30,0|script|Clauquer|169
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Rescued;
     if (Rossy_Quest == 15) goto L_Hmmm;
diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt
index 6a93285b..bed94c0c 100644
--- a/world/map/npc/025-4/julia.txt
+++ b/world/map/npc/025-4/julia.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-4.gat,89,21,0|script|Julia|114,
+025-4.gat,89,21,0|script|Julia|114
 {
     set @Reward_EXP, 5000;
 
-- 
cgit v1.2.3-70-g09d2