Many small scripts fixes - tabs, parenthesis, typo

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -34,6 +34,7 @@ KarLaeda
 Date		Added
 ======
 11/04
+	* Many small fixes - tabs, parenthesis [KarLaeda]
 	* Fixed Weight check in 1st class quests [Lupus]
 	- Added missing tabs to airship
 11/03

npc/airports/einbroch.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= Converted by Dr.Evil, 1.0b more typos and credits [Lupus]
 //= 1.1 Fixed wrong check, added extra condition [Justin84]
 //= 1.2 Removed Duplicates [Silent]
+//= 1.3 Fixed syntax errors for duplicate [KarLaeda]
 //============================================================
 
 
@@ -54,12 +55,8 @@ airport.gat,126,43,4	script	Airport Staff#01::AirportE	90,{
 		close;
 }
 
-airport.gat,143,43,4	duplicate(AirportE)	Airport Staff#02	90,{
-//	script Airport_Staff_In;
-}
-airport.gat,156,43,4	duplicate(AirportE)	Airport Staff#03	90,{
-//	script Airport_Staff_In;
-}
+airport.gat,143,43,4	duplicate(AirportE)	Airport Staff#02	90
+airport.gat,156,43,4	duplicate(AirportE)	Airport Staff#03	90
 
 airport.gat,126,51,4	script	Airport Staff#04::AirportE2	90,{
 	mes "[Airport Staff]";
@@ -91,11 +88,8 @@ airport.gat,126,51,4	script	Airport Staff#04::AirportE2	90,{
 		close;
 }
 
-airport.gat,143,51,4	duplicate(AirportE2)	Airport Staff#05	90,{
-}
-
-airport.gat,156,51,4	duplicate(AirportE2)	Airport Staff#06	90,{
-}
+airport.gat,143,51,4	duplicate(AirportE2)	Airport Staff#05	90
+airport.gat,156,51,4	duplicate(AirportE2)	Airport Staff#06	90
 
 einbroch.gat,94,267,4	script	Airship Staff	91,{
 	mes "[Airship Staff]";

npc/airports/lighthalzen.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Cloned from einbroch.txt [Justin84]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.2 Fixed syntax errors for duplicate [KarLaeda]
 //============================================================
 
 
@@ -53,12 +54,8 @@ lhz_airport.gat,126,43,4	script	Airport Staff#1::AirportL	90,{
 		close;
 }
 
-lhz_airport.gat,143,43,4	duplicate(AirportL)	Airport Staff#2	90,{
-// script Airport_Staff_In;
-}
-lhz_airport.gat,156,43,4	duplicate(AirportL)	Airport Staff#3	90,{
-// script Airport_Staff_In;
-}
+lhz_airport.gat,143,43,4	duplicate(AirportL)	Airport Staff#2	90
+lhz_airport.gat,156,43,4	duplicate(AirportL)	Airport Staff#3	90
 
 lhz_airport.gat,126,51,4	script	Airport Staff#4::AirportL2	90,{
 	mes "[Airport Staff]";
@@ -90,8 +87,5 @@ lhz_airport.gat,126,51,4	script	Airport Staff#4::AirportL2	90,{
 		close;
 }
 
-lhz_airport.gat,143,51,4	duplicate(AirportL2)	Airport Staff#5	90,{
-}
-
-lhz_airport.gat,156,51,4	duplicate(AirportL2)	Airport Staff#6	90,{
-}
+lhz_airport.gat,143,51,4	duplicate(AirportL2)	Airport Staff#5	90
+lhz_airport.gat,156,51,4	duplicate(AirportL2)	Airport Staff#6	90

npc/airports/yuno.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Cloned from Einbroch [Justin84]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.2 Fixed syntax errors for duplicate [KarLaeda]
 //============================================================
 
 
@@ -53,12 +54,8 @@ y_airport.gat,126,43,4	script	Airport Staff#001::AirportY	90,{
 		close;
 }
 
-y_airport.gat,143,43,4	duplicate(AirportY)	Airport Staff#002	90,{
-// script Airport_Staff_In;
-}
-y_airport.gat,156,43,4	duplicate(AirportY)	Airport Staff#003	90,{
-// script Airport_Staff_In;
-}
+y_airport.gat,143,43,4	duplicate(AirportY)	Airport Staff#002	90
+y_airport.gat,156,43,4	duplicate(AirportY)	Airport Staff#003	90
 
 y_airport.gat,126,51,4	script	Airport Staff#004::AirportY2	90,{
 	mes "[Airport Staff]";
@@ -90,8 +87,5 @@ y_airport.gat,126,51,4	script	Airport Staff#004::AirportY2	90,{
 		close;
 }
 
-y_airport.gat,143,51,4	duplicate(AirportY2)	Airport Staff#005	90,{
-}
-
-y_airport.gat,156,51,4	duplicate(AirportY2)	Airport Staff#006	90,{
-}
+y_airport.gat,143,51,4	duplicate(AirportY2)	Airport Staff#005	90
+y_airport.gat,156,51,4	duplicate(AirportY2)	Airport Staff#006	90

npc/cities/lighthalzen.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //=  erKURITA
 //===== Current Version: ===================================== 
-//= 1.0a
+//= 1.0b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 0.9 Removed Duplicates [Toms]
 //= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]
 //= 1.0a added constants to emotions, minor optimization [Lupus]
+//= 1.0b npcid fix [KarLaeda]
 //=============================================================
 
 lighthalzen.gat,198,285,5	script	Jiwon	862,{
@@ -2016,7 +2017,7 @@ OnTouch:
 
 }
 
-lhz_in01.gat,23,137,0	duplicate(LhzTrig)	LhzHiddenTrg2	-1,1,1
+lhz_in01.gat,23,137,0	duplicate(LhzTrig)	LhzHiddenTrg2	139,1,1
 
 lhz_in01.gat,24,131,2	duplicate(LhzTrig)	Rekenber Guard#02	867
 

npc/cities/payon.txt

@@ -737,7 +737,7 @@ payon.gat,160,185,0	script	Billboard	111,{
 	close;
 }
 
-payon.gat,173,238,5 script Jade#01 754,{
+payon.gat,173,238,5	script	Jade#01	754,{
 	mes "[Jade]";
 	mes "Bring me two";
 	mes "Gemstones of the";

npc/cities/valkyrie.txt

@@ -26,8 +26,8 @@
 
 
 // -== Warp's needed! ==-
-valkyrie.gat,48,73,0	warp	valk01	1,1,valkyrie.gat,48,64,0
-valkyrie.gat,48,66,0	warp	valk01	1,1,valkyrie.gat,48,75,0
+valkyrie.gat,48,73,0	warp	valk01	1,1,valkyrie.gat,48,64
+valkyrie.gat,48,66,0	warp	valk01	1,1,valkyrie.gat,48,75
 
 // -== Book of Ymir (Heavens Door) ==-
 yuno_in02.gat,93,207,0	script	Book of Ymir	111,{

npc/custom/eAAC_Scripts/quest_warper.txt

@@ -4,7 +4,7 @@
 //= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
 //= Huge Rewrite by Neouni
 //===== Current Version: ==========================================
-//= 2.0b
+//= 2.0c
 //===== Compatible With: ==========================================
 //= Any eAthena Version
 //===== Description: ==============================================
@@ -70,8 +70,8 @@
 // - Limits dungeon based on Depth, access special setup menu thru GM-Menu
 // - Dungeon fees split up based on  Basic , Advanced & Overseas
 // - Old Dungeon fee system removed, all dungeon fees now set to 0
-//-2.0b
-// - Special warpname menu option name bug fixed
+//-2.0b - Special warpname menu option name bug fixed
+//-2.0c - Parenthesis fixes [KarLaeda]
 //=================================================================
 
 //========================Function=&=Script========================
@@ -145,7 +145,7 @@ next;
 	if ($QW_HF == 1) mes "Healing full = ^00FF00 On ^000000";
 //----------------Healpart
 	if ($QW_HP == 1) mes "Healing partly = ^00FF00 On ^000000";
-	if (($QW_HF == 0)&&($QW_HP == 0)) mes "Healing = ^FF0000 Off ^000000";
+	if ($QW_HF == 0 && $QW_HP == 0) mes "Healing = ^FF0000 Off ^000000";
 //----------------Storage
 	if ($QW_Stor == 1) mes "Storage = ^00FF00 On ^000000";
 	if ($QW_Stor == 0) mes "Storage = ^FF0000 Off ^000000";
@@ -263,7 +263,7 @@ Setprice:
 	if ($QW_HP_S_PRICE != 0) mes "^0000FFSP ^000000Part Healing = ^00FF00 "+$QW_HP_S_PRICE+" ^000000 a point";
 	if ($QW_HP_S_PRICE == 0) mes "^0000FFSP ^000000Part Healing = ^FF0000 Free ^000000";
 //----------------Storage
-	if (($QW_S_PRICE != 0)&&($QW_S_PRICE != 60)) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
+	if ($QW_S_PRICE != 0 && $QW_S_PRICE != 60) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
 	if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000";
 	if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
 //----------------Guild-Storage
@@ -349,7 +349,7 @@ case 8:
 
 case 9:
 	next;
-	if (($QW_S_PRICE != 0)&&($QW_S_PRICE != 60)) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
+	if ($QW_S_PRICE != 0 && $QW_S_PRICE != 60) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
 	if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000";
 	if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
 	mes "Storage cost, if set to 60 Kafra pricing will be handled";
@@ -526,16 +526,16 @@ PHeal:
 	if(getarg(1) == 1) mes ""+@SpPrice+" Zeny for "+@Sp+" skill points";
 	set @total, @HpPrice+@SpPrice;
 	mes "for a total of "+@total+" zeny";
-    	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
-    	
-    	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
+	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
+	
+	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
 	if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
 	set @healfee, @HpPrice+@SpPrice;
-	if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
-	if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP;
-	if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP;
+	if (getarg(0) == 1 && getarg(1) == 1 && Zeny<@healfee) goto Zeny_Short_Both;
+	if (getarg(0) == 1 && Zeny<@healfee) goto Zeny_short_HP;
+	if (getarg(1) == 1 && Zeny<@healfee) goto Zeny_short_SP;
 	set Zeny, Zeny-@healfee;
-	if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100;
+	if (getarg(0) == 1 && getarg(1) == 1) percentheal 100,100;
 	if (getarg(0) == 1) percentheal 100,0;
 	if (getarg(1) == 1) percentheal 0,100;
 	close;
@@ -553,37 +553,34 @@ Zeny_short_HP:
 	mes "do you want me to partly heal your HP ?";
 	if (select("Yes","No") == 2) goto L_end;
 	set @Hp, Zeny/$QW_HP_H_PRICE;
-    	set @HpPrice, @Hp*$QW_HP_H_PRICE;
-    	if (@Hp == 1) mes "your not worth the effort";
-    	if (@Hp == 1) goto L_end;
-    	set Zeny, Zeny-@HpPrice;
+	set @HpPrice, @Hp*$QW_HP_H_PRICE;
+	if (@Hp == 1) mes "your not worth the effort";
+	if (@Hp == 1) goto L_end;
+	set Zeny, Zeny-@HpPrice;
 	heal @Hp,0;
 	close;
 	end;
-    	
 	
 Zeny_short_SP:
 	mes "[Warpra]";
 	mes "do you want me to partly heal your SP ?";
 	if (select("Yes","No") == 2) goto L_end;
 	set @Sp, Zeny/$QW_HP_S_PRICE;
-    	set @SpPrice, @Sp*$QW_HP_S_PRICE;
-    	if (@Sp == 1) mes "your not worth the effort";
-    	if (@Sp == 1) goto L_end;
-    	set Zeny, Zeny-@SpPrice;
+	set @SpPrice, @Sp*$QW_HP_S_PRICE;
+	if (@Sp == 1) mes "your not worth the effort";
+	if (@Sp == 1) goto L_end;
+	set Zeny, Zeny-@SpPrice;
 	heal 0,@Sp;
 	close;
 	end;
 
-
 //=============================Storage=============================
 
 L_Storage:
 	next;
 	if(basicskillcheck(0) > 0 && getskilllv(1) < 6) goto L_StorageJBlow;
 	set @fee, $QW_S_PRICE;
-	if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30;
-	if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
+	if ($QW_S_PRICE == 60 && BaseJob == Job_Novice) set @fee, 30;
 	if(Zeny<@fee) callsub L_Short_on_zeny,2;
 	set Zeny, Zeny-@fee;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5);
@@ -742,7 +739,7 @@ function	script	QWS_MMarray	{
 //----------------Special-Warp
 	callfunc "QWS_TownStamps";
 	callfunc "QWS_DungeonStamps";
-	if (@Tstamp == @MaxTstamp)&&(@Dstamp == @MaxDstamp)&&($QW_SP_WarpMap$ != "") {
+	if (@Tstamp == @MaxTstamp && @Dstamp == @MaxDstamp && $QW_SP_WarpMap$ != "") {
 	set @Mmenulist$[@Mj],@pMmenuitems$[@Mi];
 	set @Mmenuref[@Mj],@Mi;
 	set @Mj,@Mj+1;
@@ -1046,10 +1043,10 @@ menu_item:
 	set @Ti,@Ti+1;
 	return;
 	}
-	if (@pTprice[@Ti] != 0)&&($QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" -> "+@pTprice[@Ti];
-	if (@pTprice[@Ti] == 0)&&($QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti];
-	if (@pTprice[@Ti] != 0)&&($QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]"+" -> "+@pTprice[@Ti];
-	if (@pTprice[@Ti] == 0)&&($QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]";
+	if (@pTprice[@Ti] != 0 && $QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" -> "+@pTprice[@Ti];
+	if (@pTprice[@Ti] == 0 && $QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti];
+	if (@pTprice[@Ti] != 0 && $QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]"+" -> "+@pTprice[@Ti];
+	if (@pTprice[@Ti] == 0 && $QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]";
 	set @Tmenuref[@Tj],@Ti;
 	set @Tj,@Tj+1;
 	set @Ti,@Ti+1;
@@ -1572,17 +1569,16 @@ function	script	QWS_DLarray	{
 	set @DWj,0; // That's the menu lines counter.
 	cleararray @DWLmenulist$[0],"",20; // Clearing the array to get rid off ghost items in menu
 	do {
-		if ($QW_DL == 0)||($QW_DDL >= @DDepth[@DWref]) {
-			
+		if ($QW_DL == 0 || $QW_DDL >= @DDepth[@DWref]) {
 			set @warpprice, (@pDprice[@DwarpMenu]+ (getd(@pDfee$[@DwarpMenu])*@DDepth[@DWref]));
 
-			if (@warpprice != 0)&&($QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" -> "+@warpprice;
-			if (@warpprice == 0)&&($QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref];
-			if (@warpprice != 0)&&($QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"] -> "+@warpprice;
-			if (@warpprice == 0)&&($QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"]";
+			if (@warpprice != 0 && $QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" -> "+@warpprice;
+			if (@warpprice == 0 && $QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref];
+			if (@warpprice != 0 && $QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"] -> "+@warpprice;
+			if (@warpprice == 0 && $QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"]";
 			set @DWLmenuref[@DWj],@DWref;
-		
-		set @DWj,@DWj+1;
+
+			set @DWj,@DWj+1;
 		}
 		set @DWref, @DWref+1;
 		set @DWi,@DWi+1;
@@ -1781,7 +1777,7 @@ function	script	QWS_Dungeon_Warpra	{
 	function QWS_D_getbin;
 	function QWS_D_setbin;
 	
-	if ((QWS_D_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
+	if (QWS_D_getbin(getarg(0)) == 0 && getarg(1) != "") {
 		mes "[Warpra]";
 		mes getarg(1)+" unlocked!";
 		QWS_D_setbin(getarg(0));
@@ -1827,7 +1823,7 @@ function	script	QWS_Town_Warpra	{
 	function QWS_T_getbin;
 	function QWS_T_setbin;
 	
-	if ((QWS_T_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
+	if (QWS_T_getbin(getarg(0)) == 0 && getarg(1) != "") {
 		mes "[Warpra]";
 		mes getarg(1)+" unlocked!";
 		QWS_T_setbin(getarg(0));

npc/events/custom/kings_items.txt

@@ -12,7 +12,7 @@
 //= 2006/09/27: 1.0 Release and fully working. [$ephiroth]
 //============================================================
 
-prt_castle.gat,80,170,4	script	King of Prontera	 108,{
+prt_castle.gat,80,170,4	script	King of Prontera	108,{
 	set @npcname$,"[King of Prontera]";
 
 	mes @npcname$;

npc/events/xmas.txt

@@ -18,7 +18,7 @@
 //= 1.2a Fixed a major problem with the monster spawns, thanks to Playtester [MasterOfMuppets]
 //= 1.2b Fixed a minor problem with the mosnter spawns, thanks to Playtester [Kayla]
 //= 1.3 Added Christmas Orc to the places where other orcs spawn [MasterOfMuppets]
-//=	Added Christmas goblins to yuno_fild09, thanks to Playtester for pointing it out
+//= Added Christmas goblins to yuno_fild09, thanks to Playtester for pointing it out
 //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
 //============================================================
 
@@ -342,14 +342,14 @@ yuno_fild08.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 yuno_fild09.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 yuno_fild11.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 yuno_fild12.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
-ama_fild01.gat,0,0,0,0  monster	Antonio 1247,1,0,0,0
+ama_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 gon_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 um_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 um_fild02.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 um_fild03.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 um_fild04.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
-nif_fild01.gat,0,0,0,0  monster	Antonio 1247,1,0,0,0
-nif_fild02.gat,0,0,0,0  monster	Antonio 1247,1,0,0,0
+nif_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
+nif_fild02.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 lou_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 hu_fild01.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0
 hu_fild04.gat,0,0,0,0	monster	Antonio	1247,1,0,0,0

npc/guides/guides_einbe.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_dib
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.4a
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -15,8 +15,9 @@
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4 Removed Duplicates [Silent]
+//= 1.4a missing tabs [KarLaeda]
 //============================================================
-einbech.gat,67,37,4 script Guide#1::Einbech_Guide 852,{
+einbech.gat,67,37,4	script	Guide#1::Einbech_Guide	852,{
 	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
 	mes "Welcome to Einbech, the Mining Town.";

npc/guild/ev_agit_event.txt

@@ -4,7 +4,7 @@
 //= kalen (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.5
+//= 1.5a
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -22,11 +22,12 @@
 //= 1.4 Fixed treasure chests spawn! We had to unroll some loops
 //= Now they appear in castles from 00:01 to 00:24. [Lupus]
 //= 1.5 Fixed WOE end messages on non-WOE days, by Avaj
+//= 1.5a missing tabs [KarLaeda]
 //============================================================
 //| To know how to set up WoE times, go to doc\woe_time_explanation.txt
 // WoE Start/Stop times
 //======================================
-- script Agit_Event -1,{
+-	script	Agit_Event	-1,{
 	end;
 
 OnClock2100:	//start time for Tues(2), Thurs(4)
@@ -59,7 +60,7 @@ L_Start:
 
 // Treasure Spawn Time
 //========================================
-- script TreasSpawn -1,{
+-	script	TreasSpawn	-1,{
 	end;
 
 OnClock0001:

npc/jobs/1-1e/gunslinger.txt

@@ -7,7 +7,7 @@
 //= DON'T REMOVE THIS! (by request of him, he provided all
 //= the info regarding the quests and shops.)
 //===== Current Version: ===================================== 
-//= 1.7a
+//= 1.7b
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //= 	optimized [Lupus]
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
 //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
+//= 1.7b Parenthesis fixes [KarLaeda]
 //============================================================ 
 
 que_ng.gat,152,167,3	script	Gunslinger Jobchanger	901,{
@@ -212,8 +213,8 @@ payon.gat,184,65,3	script	Mr. Tanieh	866,{
 				set @npcname$,"";
 				end;
 		}
-	} else if (GUNS_Q == 10003) || (GUNS_Q == 10004) {
-		if (countitem(519) >= 1) && (GUNS_Q == 10004) {
+	} else if (GUNS_Q == 10003 || GUNS_Q == 10004) {
+		if (countitem(519) >= 1 && GUNS_Q == 10004) {
 			mes @npcname$;
 			mes "THAT'S IT!! I was missing the Milk! Oh yes, thanks so much, will you give it to me?";
 			switch(select("Sure, take it:Sorry but I need it")) {
@@ -241,7 +242,7 @@ payon.gat,184,65,3	script	Mr. Tanieh	866,{
 		set @npcname$,"";
 		set GUNS_Q,10004;
 		end;
-	} else if (Class == Job_Gunslinger) || (GUNS_Q == 10005) {
+	} else if (Class == Job_Gunslinger || GUNS_Q == 10005) {
 		mes @npcname$;
 		mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients...";
 		close2;

npc/jobs/2-1/blacksmith.txt

@@ -27,7 +27,7 @@
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged Jfunc, changed job numbers to constants [Lupus]
-==============================================================
+//==============================================================
 
 
 

npc/jobs/2-1/hunter.txt

@@ -1064,7 +1064,7 @@ job_hunte.gat,76,105,1	duplicate(HntTrap)	50-1	139,0,0
 job_hunte.gat,76,104,1	duplicate(HntTrap)	50-2	139,0,0
 job_hunte.gat,78,101,1	duplicate(HntTrap)	50-3	139,0,2
 job_hunte.gat,79,101,1	duplicate(HntTrap)	50-4	139,0,2
-job_hunte.gat,76,99,1	duplicate(HntTrap)	51-1	139,10
+job_hunte.gat,76,99,1	duplicate(HntTrap)	51-1	139,1,0
 job_hunte.gat,77,98,1	duplicate(HntTrap)	51-2	139,2,0
 job_hunte.gat,74,99,1	duplicate(HntTrap)	51-3	139,0,0
 job_hunte.gat,74,98,1	duplicate(HntTrap)	51-4	139,0,0

npc/jobs/2-1/priest.txt

@@ -20,7 +20,7 @@
 //= to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Merged JFunc [Lupus]
-==========================================================
+//==========================================================
 
 
 //*********************************************************************************************************************************************************************************\\

npc/jobs/2-2/rogue.txt

@@ -967,7 +967,7 @@ in_rogue.gat,370,320,0	script	rogue04	45,1,1,{
 //================================================
 // Timer: Keeps monsters from overspawning
 //================================================
-- script RogueTest3 -1,{
+-	script	RogueTest3	-1,{
 	end;
 
 OnMinute10:

npc/jobs/2-2a/Clown.txt

@@ -16,6 +16,6 @@
 //============================================================ 
 
 // -== Clown ==-
-valkyrie.gat,53,54,4z	script	Clown	741,{
+valkyrie.gat,53,54,4	script	Clown	741,{
 	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown";
 }

npc/kafras/functions_kafras.txt

@@ -437,7 +437,7 @@ function	script	F_CheckKafCode	{
 }
 
 // Set / Change / Clear Storage Password Function ====================
-function	script	F_SetKafCode	115,{
+function	script	F_SetKafCode	{
 	mes "[Kafra]";
 	if(#kafra_code) {
 		mes "Your storage is protected with a password. What would you do now?";

npc/merchants/kunai_maker.txt

@@ -47,7 +47,7 @@ L_Bye:
 	close;
 }
 
-function	script	Kunai_Trade	-1,{
+function	script	Kunai_Trade	{
 	next;
 	mes "[Jin]";
 	if (MaxWeight*50/100 < Weight) {

npc/other/arena.txt

@@ -557,7 +557,7 @@ force_1-1.gat,25,26,0	script	arenalv3fail	-1,{
 }
 
 // Reminding the player of time constraints.
-force_1-1.gat,25,26,0	script 	tensecsleft	-1,{
+force_1-1.gat,25,26,0	script	tensecsleft	-1,{
 	announce "Ten seconds remaining!",3;
 }
 

npc/other/dts_warper.txt

@@ -903,7 +903,7 @@ function	script	F_DTS_Warp	{
 }
 
 //Elections administration NPC (hidden)
--	script DTS_Admin -1,{
+-	script	DTS_Admin	-1,{
 	OnSun0100:					//Works only at 1am on sunday
 		if($dtsday<4 || $dtsday>=100) set $dtsday,4;
 		else set $dtsday,$dtsday+1;

npc/other/pvp.txt

@@ -42,7 +42,7 @@ morocc_in.gat,144,138,4	script	PvP Narrator#4	84,{
 	end;
 }
 // Geffen --------------------------------------
-geffen_in.gat, 67,63,4	script	PvP Narrator#5	84,{
+geffen_in.gat,67,63,4	script	PvP Narrator#5	84,{
 	callfunc "F_PvPNarr", "geffen_in.gat", 64, 60;
 	end;
 }
@@ -129,7 +129,7 @@ function	script	F_PvPNarr	{
 //==========================================================================
 
 // Alberta -----------------------------------
-alberta_in.gat, 26,146,4	script	Gate Keeper#1::GateKeep	83,{
+alberta_in.gat,26,146,4	script	Gate Keeper#1::GateKeep	83,{
 	mes "[Gate Keeper]";
 	mes "Hi.  I'm glad to be of service.  I will open the PvP fight square for you!";
 	mes "If you have any questions about the PvP modes or rules, please ask the Narrator.....";
@@ -211,9 +211,9 @@ sF_Move:
 }
 
 // Geffen --------------------------------------------
-geffen_in.gat, 63,63,4	duplicate(GateKeep)	Gate Keeper#2	83
+geffen_in.gat,63,63,4	duplicate(GateKeep)	Gate Keeper#2	83
 // Morroc----------------------------------------------
-morocc_in.gat, 144,142,4	duplicate(GateKeep)	Gate Keeper#3	83
+morocc_in.gat,144,142,4	duplicate(GateKeep)	Gate Keeper#3	83
 // Payon ----------------------------------------------
 payon_in01.gat,175,106,3	duplicate(GateKeep)	Gate Keeper#4	83
 // Prontera -------------------------------------------

npc/quests/The_Sign_Quest.txt

@@ -1985,8 +1985,6 @@ OnTouch:
 
 }
 
-}
-
 aldeba_in.gat,147,104,1	script	PotionActivator	139,3,0,{
 OnTouch:
 	if(@aldesigncheck == 0)
@@ -4062,8 +4060,6 @@ L_Ever:
 	close;
 }
 
-}
-
 cmd_in01.gat,32,25,3	script	Lamadin	724,{
 
 	if(SignDance == 1)goto L_Win;

npc/quests/seals/brisingamen_seal.txt

@@ -5096,21 +5096,21 @@ mjolnir_09.gat,85,129,0	script	#brisindwarf3	111,3,3,{
 			mes "Failed.";
 			mes "Failed...";
 			close;
-		break
+		break;
 		case 2:
 			specialeffect 109;
 			mes "[Echoing Voice]";
 			mes "Failed.";
 			mes "Failed...";
 			close;
-		break
+		break;
 		case 3:
 			specialeffect 109;
 			mes "[Echoing Voice]";
 			mes "Failed.";
 			mes "Failed...";
 			close;
-		break
+		break;
 		case 4:
 			specialeffect 109;
 			mes "[Echoing Voice]";
@@ -5124,7 +5124,7 @@ mjolnir_09.gat,85,129,0	script	#brisindwarf3	111,3,3,{
 			mes "gonna drown to death!";
 			mes "Who woke me up?";
 			close;
-		break
+		break;
 	}
 }
 	else

npc/quests/seals/megingard_seal.txt

@@ -2149,7 +2149,7 @@ in_rogue.gat,243,61,0	script	Suspicious Man#God	748,{
 									mes "You are same as others! Go away from me!";
 									set god_megin_2,0;
 									close;
-								break
+								break;
 								case 3:
 									mes "[Cuaque Donon]";
 									mes "And...that night...I heard ^0000FFhe^000000 had an argue with the leader.";

npc/quests/seals/mjolnir_seal.txt

@@ -2484,7 +2484,7 @@ mjolnir_01.gat,35,136,7	script	Dwarf Blacksmith#west	826,{
 				
 				PART16:
 					set @vestripart,6;
-					if (getequipisequiped(6)) goto L_Check2-1;
+					if (getequipisequiped(6)) goto L_Check21;
 					goto M_Menu2;
 				
 				PART17: