Another one set of fixes for the scripts syntax

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9166 54d463be-8e91-2dee-dedb-b68131a5f0ec

19 files changed, 26 insertions, 26 deletions

diff --git a/npc/custom/WoE_Setter.txt b/npc/custom/WoE_Setter.txt
index 977693c0d..7a0d92971 100644
--- a/npc/custom/WoE_Setter.txt
+++ b/npc/custom/WoE_Setter.txt
@@ -146,7 +146,7 @@ L_BadNumber:
 	mes "Sorry that was an invalid number, please try again";

 	close;

 }

-- script Agit_Event2 -1,{

+-	script	Agit_Event2	-1,{

 	end;

 OnInit:

 disablenpc "Agit_Event";

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/kafras.txt b/npc/custom/eAAC_Scripts/kafraExpress/kafras.txt
index bb3fe643f..739dcc58e 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/kafras.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/kafras.txt
@@ -189,7 +189,7 @@ glast_01.gat,62,198,6	script	Kafra Express::D_GHChivalry	791,{
 }

 

 //LightHalzen Rekkenber (Sewer Entrance)

-lighthalzen.gat,311,293,17	script	Kafra Express::D_Lhz	860,{

+lighthalzen.gat,311,293,1	script	Kafra Express::D_Lhz	860,{

 	callfunc "F_KafraExpress","Kafra Express","kafra_08",1,"lighthalzen.gat",301,286;

 }

 

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
index ab6e52602..9594dae47 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
@@ -14,7 +14,7 @@
 //= See config.txt for configuration.

 //============================================================ 

 

--	script	keInit_bank	{

+-	script	keInit_bank	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadBank";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_broadcast.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_broadcast.txt
index bcbd4a13a..669942e72 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_broadcast.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_broadcast.txt
@@ -17,7 +17,7 @@
 //= Module are used.

 //============================================================ 

 

--	script	keInit_broadcast	{

+-	script	keInit_broadcast	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadBroadcast";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_dye.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_dye.txt
index 6841f240e..bcd916b21 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_dye.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_dye.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.

 //============================================================

 

--	script	keInit_dye	{

+-	script	keInit_dye	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadDye";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
index 2219d270b..0093fe2ae 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
@@ -16,7 +16,7 @@
 //= the server wide variables kej_class1 and kej_class2

 //============================================================

 

--	script	keInit_jobchange	{

+-	script	keInit_jobchange	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadJobChange";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
index 3a5add8fd..59311cca5 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
@@ -19,7 +19,7 @@
 //= kej_prev_dye (cloth dye)

 //============================================================

 

--	script	keInit_jobSwap	{

+-	script	keInit_jobSwap	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadJobSwap";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt
index 420d12b63..88c5104f0 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt
@@ -14,7 +14,7 @@
 //= See config.txt for configuration.

 //============================================================

 

--	script	keInit_refine	{

+-	script	keInit_refine	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadRefine";

 	end;

@@ -33,7 +33,7 @@ function SF_sellOres;
 			"- Refine Equipment",

 			"- Repair Equipment",

 			"- Buy Ores",

-			"- Purify Ores",

+			"- Purify Ores"

 		);

 		switch(@kmenu) {

 		case 2: //Refine

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt
index b2edbba4e..82085a03f 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.
 //============================================================ 
 
--	script	keInit_rent	{
+-	script	keInit_rent	-1,{
 OnInit:	//Load Config
 	donpcevent "keConfig::OnLoadRent";
 	end;
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt
index b8fdf9f66..43a53713f 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.
 //============================================================
 
--	script	keInit_shop	{
+-	script	keInit_shop	-1,{
 OnInit:	//Load Config
 	donpcevent "keConfig::OnLoadShop";
 	end;
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_statmarket.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_statmarket.txt
index c29c59559..b25691cb2 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_statmarket.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_statmarket.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.

 //============================================================

 

--	script	keInit_statmarket	{

+-	script	keInit_statmarket	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadStatMarket";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt
index 1b83fdd79..8ad75e7a6 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.

 //============================================================

 

--	script	keInit_stats	{

+-	script	keInit_stats	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadStats";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_uncard.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_uncard.txt
index 00132e9da..d39d5d1bc 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_uncard.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_uncard.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.

 //============================================================ 

 

--	script	keInit_uncard	{

+-	script	keInit_uncard	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadUncard";

 	end;

@@ -109,7 +109,7 @@ function SF_uncard {
 		set @failsave, select(

 			"- Cancel",

 			"- Remove cards ("+@price+"z, item gets priority)",

-			"- Remove cards ("+@price+"z, cards get priority)",

+			"- Remove cards ("+@price+"z, cards get priority)"

 		);

 	} else {

 		set @failsave, select(

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
index 805f1c795..84cbef768 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
@@ -43,7 +43,7 @@
 

 //============================================================ 

 

--	script	keInit_warpDungeon	{

+-	script	keInit_warpDungeon	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadWarpDungeon";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_pvp.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_pvp.txt
index 136b7ce1d..73f278b5d 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_pvp.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_pvp.txt
@@ -13,7 +13,7 @@
 //= See config.txt for configuration.

 //============================================================ 

 

--	script	keInit_warpPvp	{

+-	script	keInit_warpPvp	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadWarpPvp";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_town.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_town.txt
index 0198d1b34..2cef196d8 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_town.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_town.txt
@@ -35,7 +35,7 @@
 //= 0x00100000 Yuno

 //============================================================ 

 

--	script	keInit_warpTown	{

+-	script	keInit_warpTown	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadWarpTown";

 	end;

diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt
index 1657ced6e..89f536de3 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt
@@ -14,7 +14,7 @@
 //= Remove the comment on lines 52,53 and 63 to enable direct G. Dungeon warping

 //============================================================ 

 

--	script	keInit_warpWoe	{

+-	script	keInit_warpWoe	-1,{

 OnInit:	//Load Config

 	donpcevent "keConfig::OnLoadWarpWoe";

 	end;

diff --git a/npc/custom/mvm.txt b/npc/custom/mvm.txt
index 6a2ae567d..2b088de16 100644
--- a/npc/custom/mvm.txt
+++ b/npc/custom/mvm.txt
@@ -16,8 +16,9 @@
 //= Added Duel Room

 //= ---------------------------------------------------------

 //= Script is messy! Be careful!

-//= 1.1.3 Removed Duplicate Names [Silent]

 //= 1.1.2 Changed all gmcommand to atcommand as Poki#3 suggested. [Vicious]

+//= 1.1.3 Removed Duplicate Names [Silent]

+//= 1.1.4 Fixed SummonPad syntax. [KarLaeda]

 //============================================================ 

 

 // Entrance //

@@ -68,7 +69,7 @@ goto L_Menu;
 }

 

 // Monster Summon Function //

-function	script	monstersummon	-1,{

+function	script	monstersummon	{

 // 1. ---Change to Add Monsters--- //

 if (#monster == 10) summon strcharinfo(0) + "'s Poring",1002, "OnPoringKilled";

 if (#monster == 20) summon strcharinfo(0) + "'s Fabre",1007, "OnFaberKilled";

@@ -709,7 +710,7 @@ close;
 	callfunc "duelkill";

 	}

 

-function	script	duelkill	-1,{

+function	script	duelkill	{

 if (strcharinfo(0) == $@duelist1$ || strcharinfo(0) == $@duelist2$) goto L_Heal;

 end;

 	L_Heal:

@@ -720,7 +721,7 @@ end;
 	end;

 }

 	

-function	script	illegalkill	-1,{

+function	script	illegalkill	{

 announce "Illegal Kill by " + strcharinfo(0) + " Detected",1;

 percentheal -100,-100;

 end;

@@ -748,13 +749,12 @@ end;
 }

 

 // Warps players //

--	script	SummonPad	111,2,2,{

+gon_test.gat,57,86,5	script	Summon Pad 1::SummonPad	111,2,2,{

 end;

 OnTouch:

 set @marena,1;

 warp "gon_test.gat",57,99;

 }

-gon_test.gat,57,86,5	duplicate(SummonPad)	Summon Pad 1	111,2,2

 gon_test.gat,43,87,5	duplicate(SummonPad)	Summon Pad 2	111,2,2

 gon_test.gat,72,87,5	duplicate(SummonPad)	Summon Pad 3	111,2,2

 

diff --git a/npc/custom/tougijou.txt b/npc/custom/tougijou.txt
index 8c9fc8cca..df61dec88 100644
--- a/npc/custom/tougijou.txt
+++ b/npc/custom/tougijou.txt
@@ -1,4 +1,4 @@
-/===============================================================================

+//===============================================================================

 // Tougijou (Arena) EVENT

 //===============================================================================

 gonryun.gat,180,117,0	script	Son Mudo	85,{