Kafras

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

npc/Changelog.txt

@@ -24,8 +24,9 @@ Nexon
 	* Adding in the new Abyss/Thanatos/Lighthalzen NPC's and optimizing them.
 Evera
 	* Everything.
-	* Dungeon Teleport System
-	* Gathering iRO information and comparing them to eA scripts.
+	* Dungeon Teleport System NPCs
+	* iRO information gathering.
+	* Kafra maintainment.
 
 Musashiden
 	*Scripting iRO latest towns (warps, NPCs, ect.)
@@ -36,6 +37,7 @@ Musashiden
 Date		Added
 ======
 06/06
+	* Fixed missing function problems for Kafra, also now using cleararray instead of assigning blank variables to every other array [Evera]
 	* Implemented the Shinokas quest, thanks to Dj-Yhn for scripting it. [MasterOfMuppets]
 	* Added Rachel interior warps thanks to Celestria [Playtester]
 06/05

npc/kafras/kafras_alb.txt

@@ -52,15 +52,13 @@ alberta.gat,113,60,5	script	Kafra	112,{
 
 // Function: Sets variables for Ablerta Kafras -------------------------------
 function	script	F_KafSetAlb	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpP[0], 1200, 1800, 1800;
 	setarray @wrpD$[0], "Payon", "Morroc", "Prontera";
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], "Cancel";
-	set @wrpC$[4], "";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	setarray @viewpX[0], 28, 113, 0, 0;
 	setarray @viewpY[0], 229, 60, 0, 0;
 	return;

npc/kafras/kafras_alde.txt

@@ -35,6 +35,7 @@ aldeba_in.gat,96,181,4	script	Kafra Leilah	113,{
 // South --------------------------------------------------
 aldebaran.gat,143,119,4	script	Kafra	113,{
 	cutin "kafra_05",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpP[0], 1200, 1200, 1800, 1700;
 	setarray @wrpD$[0], "Geffen", "Yuno" , "Izlude", "Coal Mine(Dead Pit)";
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
@@ -42,8 +43,6 @@ aldebaran.gat,143,119,4	script	Kafra	113,{
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	callfunc "F_Kafra",0,0,1;
 
 	M_Save:

npc/kafras/kafras_com.txt

@@ -26,15 +26,13 @@
 // In Town ==============================================>\\
 comodo.gat,200,148,4	script	Kafra	721,{
 	cutin "kafra_07",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "Umbala";
 	setarray @wrpP[0], 1800, 1200, 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], "Cancel";
-	set @wrpC$[4], "";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	callfunc "F_Kafra",0,0,1;
 
 	M_Save:
@@ -45,15 +43,12 @@ comodo.gat,200,148,4	script	Kafra	721,{
 // Comodo Pharos Lighthouse (Beacon Island) ===================>\\
 cmd_fild07.gat,135,134,4	script	Kafra	721,{
 	cutin "kafra_07",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo", "Morroc";
 	setarray @wrpP[0], 1200, 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], "Cancel";
-	set @wrpC$[3], "";
-	set @wrpC$[4], "";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	callfunc "F_Kafra",0,0,1;
 
 	M_Save:

npc/kafras/kafras_dungeons.txt

@@ -76,8 +76,7 @@ prt_fild05.gat,290,224,1	script	Kafra	114,{
 //<=========================== Coal Mine (Dead Pitt) =======================>\\
 mjolnir_02.gat,83,361,4	script	Kafra	114,{
 	cutin "kafra_04",2;
-	callfunc "F_KafSetOrcCoal";
-	callfunc "F_Kafra",0,0,1;
+	callfunc "F_Kafra",0,6,1;
 
 	M_Save:
 		savepoint "mjolnir_02.gat",98,352;
@@ -99,7 +98,6 @@ moc_ruins.gat,61,156,5	script	Kafra	114,{
 //<================================ Orc Dungeon ============================>\\
 gef_fild10.gat,73,340,4	script	Kafra	115,{
 	cutin "kafra_03",2;
-	callfunc "F_KafSetOrcCoal";
 	callfunc "F_Kafra",0,6,1;
 
 	M_Save:

npc/kafras/kafras_gef.txt

@@ -86,7 +86,7 @@ geffen.gat,37,116,6	script	Kafra	117,{
 
 // Function: Sets variables for Geffen Kafras -------------------
 function	script	F_KafSetGef	{
-
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(Dead Pit)";
 	setarray @wrpP[0], 1200, 1200, 1200, 1700;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
@@ -94,8 +94,6 @@ function	script	F_KafSetGef	{
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	setarray @viewpX[0], 120, 203, 116, 37;
 	setarray @viewpY[0], 62, 123, 202, 116;
 	return;

npc/kafras/kafras_izl.txt

@@ -24,6 +24,7 @@
 
 izlude.gat,134,87,3	script	Kafra	117,{
 	cutin "kafra_01",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
 	setarray @wrpP[0], 1200, 1200, 1200, 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
@@ -31,8 +32,6 @@ izlude.gat,134,87,3	script	Kafra	117,{
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	callfunc "F_Kafra",0,0,1;
 
 	M_Save:

npc/kafras/kafras_mor.txt

@@ -85,6 +85,7 @@ morocc.gat,292,211,4	script	Kafra	112,{
 
 // Function: Sets variables for Morroc Kafras --------------------------------
 function	script	F_KafSetMoc	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Lighthouse";
 	setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
@@ -93,7 +94,6 @@ function	script	F_KafSetMoc	{
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], @wrpD$[4]+" -> "+@wrpP[4];
 	set @wrpC$[5], "Cancel";
-	set @wrpC$[6], "";
 	setarray @viewpX[0], 156, 163, 28, 292;
 	setarray @viewpY[0], 97, 260, 167, 211;
 	return;

npc/kafras/kafras_new.txt

@@ -135,6 +135,7 @@ louyang.gat,210,104,5	script	Kafra	117,{
 // Umbala Kafra ------------------------------------------------------------
 umbala.gat,128,133,4	script	Kafra	115,{
 	cutin "kafra_03",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo";
 	setarray @wrpP[0], 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];

npc/kafras/kafras_pay.txt

@@ -59,14 +59,12 @@ pay_arche.gat,55,123,8	script	Kafra	115,{
 
 // Function: Sets variables for Payon Kafras ---------------------------------
 function	script	F_KafSetPay	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Alberta", "Prontera", "Morroc";
 	setarray @wrpP[0], 1200, 1200, 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], "Cancel";
-	set @wrpC$[4], "";
-	set @wrpC$[5], "";
-	set @wrpC$[6], "";
 	return;
 }

npc/kafras/kafras_pron.txt

@@ -100,6 +100,7 @@ M_Save:
 
 // Function: Sets variables for Prontera Kafras ----------------------------
 function	script	F_KafSetPront	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
 	setarray @wrpP[0], 600, 1200, 1200, 1200, 1200, 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];

npc/kafras/kafras_yun.txt

@@ -57,6 +57,7 @@ yuno.gat,278,221,6	script	Kafra	117,{
 
 // Function: Sets variables for Yuno Kafras ------------
 function	script	F_KafSetYun	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Aldebaran";
 	setarray @wrpP[0], 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];