From faa029b879249d548da05577ee9461b85b286f08 Mon Sep 17 00:00:00 2001 From: evera Date: Tue, 6 Jun 2006 23:59:16 +0000 Subject: Kafras git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7020 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/kafras/kafras_alb.txt | 4 +--- npc/kafras/kafras_alde.txt | 3 +-- npc/kafras/kafras_com.txt | 9 ++------- npc/kafras/kafras_dungeons.txt | 4 +--- npc/kafras/kafras_gef.txt | 4 +--- npc/kafras/kafras_izl.txt | 3 +-- npc/kafras/kafras_mor.txt | 2 +- npc/kafras/kafras_new.txt | 1 + npc/kafras/kafras_pay.txt | 4 +--- npc/kafras/kafras_pron.txt | 1 + npc/kafras/kafras_yun.txt | 1 + 11 files changed, 12 insertions(+), 24 deletions(-) (limited to 'npc/kafras') diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt index 29645bbc1..35c360808 100644 --- a/npc/kafras/kafras_alb.txt +++ b/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; diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt index 2cb3bbeaf..8c057f72f 100644 --- a/npc/kafras/kafras_alde.txt +++ b/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: diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt index d0d69b0a2..66761cd57 100644 --- a/npc/kafras/kafras_com.txt +++ b/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: diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt index 5d93ae0c4..94d0caf2b 100644 --- a/npc/kafras/kafras_dungeons.txt +++ b/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: diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt index b774de7b0..885d76a30 100644 --- a/npc/kafras/kafras_gef.txt +++ b/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; diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt index aac1476ed..f6b00c67d 100644 --- a/npc/kafras/kafras_izl.txt +++ b/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: diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt index b690b2606..a487f84b3 100644 --- a/npc/kafras/kafras_mor.txt +++ b/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; diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt index f2f654e6a..c57deb180 100644 --- a/npc/kafras/kafras_new.txt +++ b/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]; diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt index 64125c54c..7526cb3f1 100644 --- a/npc/kafras/kafras_pay.txt +++ b/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; } diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt index 03f6672c4..b3803c97f 100644 --- a/npc/kafras/kafras_pron.txt +++ b/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]; diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt index c5c68dc49..03e2a8de7 100644 --- a/npc/kafras/kafras_yun.txt +++ b/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]; -- cgit v1.2.3-70-g09d2