From d1e2f38bbfe501e1b18b7c781297215af1062f44 Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 14 Jun 2006 08:33:33 +0000
Subject: Kafra - Duplicated NPC Updates

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7151 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/kafras/kafras_alb.txt      |  4 ++--
 npc/kafras/kafras_alde.txt     |  2 +-
 npc/kafras/kafras_com.txt      |  4 ++--
 npc/kafras/kafras_dungeons.txt | 16 ++++++++--------
 npc/kafras/kafras_gef.txt      |  8 ++++----
 npc/kafras/kafras_izl.txt      |  2 +-
 npc/kafras/kafras_mor.txt      |  8 ++++----
 npc/kafras/kafras_new.txt      | 24 ++++++++++++------------
 npc/kafras/kafras_pay.txt      |  6 +++---
 npc/kafras/kafras_pron.txt     | 10 +++++-----
 npc/kafras/kafras_yun.txt      |  6 +++---
 11 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'npc')

diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt
index 35c360808..cf24ef188 100644
--- a/npc/kafras/kafras_alb.txt
+++ b/npc/kafras/kafras_alb.txt
@@ -22,7 +22,7 @@
 
 
 // NorthWest -----------------------------------------------------------------
-alberta.gat,28,229,8	script	Kafra	115,{
+alberta.gat,28,229,8	script	Kafra::kaf_alberta	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetAlb";
 	callfunc "F_Kafra",0,0,0;
@@ -39,7 +39,7 @@ alberta.gat,28,229,8	script	Kafra	115,{
 }
 
 // South ---------------------------------------------------------------------
-alberta.gat,113,60,5	script	Kafra	112,{
+alberta.gat,113,60,5	script	Kafra::kaf_alberta2	112,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSetAlb";
 	callfunc "F_Kafra",0,0,0;
diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
index 8c057f72f..48914eac3 100644
--- a/npc/kafras/kafras_alde.txt
+++ b/npc/kafras/kafras_alde.txt
@@ -33,7 +33,7 @@ aldeba_in.gat,96,181,4	script	Kafra Leilah	113,{
 }
 
 // South --------------------------------------------------
-aldebaran.gat,143,119,4	script	Kafra	113,{
+aldebaran.gat,143,119,4	script	Kafra::kaf_aldebaran	113,{
 	cutin "kafra_05",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpP[0], 1200, 1200, 1800, 1700;
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
index 66761cd57..2044a0822 100644
--- a/npc/kafras/kafras_com.txt
+++ b/npc/kafras/kafras_com.txt
@@ -24,7 +24,7 @@
 
 
 // In Town ==============================================>\\
-comodo.gat,200,148,4	script	Kafra	721,{
+comodo.gat,200,148,4	script	Kafra::kaf_comodo	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "Umbala";
@@ -41,7 +41,7 @@ comodo.gat,200,148,4	script	Kafra	721,{
 }
 
 // Comodo Pharos Lighthouse (Beacon Island) ===================>\\
-cmd_fild07.gat,135,134,4	script	Kafra	721,{
+cmd_fild07.gat,135,134,4	script	Kafra::kaf_cmd_fild07	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo", "Morroc";
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index 94d0caf2b..4933aac84 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -28,7 +28,7 @@
 
 //<============================= Ant Hell ==============================>\\
 // Mocfild04 -----------------------------------------
-moc_fild04.gat,230,329,3	script	Kafra	115,{
+moc_fild04.gat,230,329,3	script	Kafra::kaf_moc_fild04	115,{
 
 	cutin "kafra_03",2;
 	callfunc "F_Kafra",0,2,1;
@@ -39,7 +39,7 @@ moc_fild04.gat,230,329,3	script	Kafra	115,{
 }
 
 // Mocfild15 --------------------------------------------
-moc_fild15.gat,264,260,3	script	Kafra	115,{
+moc_fild15.gat,264,260,3	script	Kafra::kaf_moc_fild15	115,{
 
 	cutin "kafra_03",2;
 	callfunc "F_Kafra",0,2,1;
@@ -50,7 +50,7 @@ moc_fild15.gat,264,260,3	script	Kafra	115,{
 }
 
 //<============================= Byalan Island ============================>\\
-izlu2dun.gat,106,58,8	script	Kafra	115,{
+izlu2dun.gat,106,58,8	script	Kafra::kaf_izlu2dun	115,{
 
 	cutin "kafra_03",2;
 	if(BaseJob==Job_Novice && job_merchant_q3>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
@@ -63,7 +63,7 @@ izlu2dun.gat,106,58,8	script	Kafra	115,{
 
 
 //<============================ Culvert Sewers ============================>\\
-prt_fild05.gat,290,224,1	script	Kafra	114,{
+prt_fild05.gat,290,224,1	script	Kafra::prt_fild05	114,{
 	cutin "kafra_04",2;
 	callfunc "F_Kafra",0,2,1;
 
@@ -74,7 +74,7 @@ prt_fild05.gat,290,224,1	script	Kafra	114,{
 
 
 //<=========================== Coal Mine (Dead Pitt) =======================>\\
-mjolnir_02.gat,83,361,4	script	Kafra	114,{
+mjolnir_02.gat,83,361,4	script	Kafra::kaf_mjolnir_02	114,{
 	cutin "kafra_04",2;
 	callfunc "F_Kafra",0,6,1;
 
@@ -85,7 +85,7 @@ mjolnir_02.gat,83,361,4	script	Kafra	114,{
 
 
 //<=============================== Morroc Ruins ============================>\\
-moc_ruins.gat,61,156,5	script	Kafra	114,{
+moc_ruins.gat,61,156,5	script	Kafra::moc_ruins	114,{
 	cutin "kafra_04",2;
 	callfunc "F_Kafra",0,2,1;
 
@@ -96,7 +96,7 @@ moc_ruins.gat,61,156,5	script	Kafra	114,{
 
 
 //<================================ Orc Dungeon ============================>\\
-gef_fild10.gat,73,340,4	script	Kafra	115,{
+gef_fild10.gat,73,340,4	script	Kafra::kaf_gef_fild10	115,{
 	cutin "kafra_03",2;
 	callfunc "F_Kafra",0,6,1;
 
@@ -106,7 +106,7 @@ gef_fild10.gat,73,340,4	script	Kafra	115,{
 }
 
 //<============================== Treasure Island ==========================>\\
-alb2trea.gat,59,69,1	script	Kafra	117,{
+alb2trea.gat,59,69,1	script	Kafra::kaf_alb2trea	117,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,2,1;
 
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index 885d76a30..ebcd98f2c 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -22,7 +22,7 @@
 
 
 // South =====================================
-geffen.gat,120,62,8	script	Kafra	115,{
+geffen.gat,120,62,8	script	Kafra::kaf_geffen	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetGef";
 	callfunc "F_Kafra",0,0,0;
@@ -33,7 +33,7 @@ geffen.gat,120,62,8	script	Kafra	115,{
 }
 
 // East ==============================================
-geffen.gat,203,123,3	script	Kafra	114,{
+geffen.gat,203,123,3	script	Kafra::geffen2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetGef";
 	callfunc "F_Kafra",0,0,0;
@@ -50,7 +50,7 @@ geffen.gat,203,123,3	script	Kafra	114,{
 }
 
 // North ==============================================
-geffen.gat,116,202,3	script	Kafra	116,{
+geffen.gat,116,202,3	script	Kafra::geffen3	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetGef";
 	callfunc "F_Kafra",0,0,0;
@@ -67,7 +67,7 @@ geffen.gat,116,202,3	script	Kafra	116,{
 }
 
 // West =========================================
-geffen.gat,37,116,6	script	Kafra	117,{
+geffen.gat,37,116,6	script	Kafra::geffen4	117,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSetGef";
 	callfunc "F_Kafra",0,0,0;
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
index f6b00c67d..cbbba5b0a 100644
--- a/npc/kafras/kafras_izl.txt
+++ b/npc/kafras/kafras_izl.txt
@@ -22,7 +22,7 @@
 //=====================================================================
 
 
-izlude.gat,134,87,3	script	Kafra	117,{
+izlude.gat,134,87,3	script	Kafra::kaf_izlude	117,{
 	cutin "kafra_01",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt
index a487f84b3..708913fa3 100644
--- a/npc/kafras/kafras_mor.txt
+++ b/npc/kafras/kafras_mor.txt
@@ -22,7 +22,7 @@
 
 
 // South ================================
-morocc.gat,156,97,4	script	Kafra	115,{
+morocc.gat,156,97,4	script	Kafra::kaf_morocc	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetMoc";
 	callfunc "F_Kafra",0,0,0;
@@ -33,7 +33,7 @@ morocc.gat,156,97,4	script	Kafra	115,{
 }
 
 // North =================================
-morocc.gat,162,271,4	script	Kafra	114,{
+morocc.gat,162,271,4	script	Kafra::kaf_morocc2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetMoc";
 	callfunc "F_Kafra",0,0,0;
@@ -50,7 +50,7 @@ morocc.gat,162,271,4	script	Kafra	114,{
 }
 
 // West  =================================
-morocc.gat,28,167,6	script	Kafra	116,{
+morocc.gat,28,167,6	script	Kafra::kaf_morocc3	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetMoc";
 	callfunc "F_Kafra",0,0,0;
@@ -67,7 +67,7 @@ morocc.gat,28,167,6	script	Kafra	116,{
 }
 
 // East =================================
-morocc.gat,292,211,4	script	Kafra	112,{
+morocc.gat,292,211,4	script	Kafra::kaf_morocc4	112,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSetMoc";
 	callfunc "F_Kafra",0,0,0;
diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
index 9d4d695c7..34350df9f 100644
--- a/npc/kafras/kafras_new.txt
+++ b/npc/kafras/kafras_new.txt
@@ -30,7 +30,7 @@
 //==========================================================================
 
 // Amatsu ------------------------------------------------------------------
-amatsu.gat,102,149,4	script	Kafra	116,{
+amatsu.gat,102,149,4	script	Kafra::kaf_amatsu	116,{
 	cutin "kafra_02",2;
 	callfunc "F_Kafra",3,3,1;
 
@@ -40,7 +40,7 @@ amatsu.gat,102,149,4	script	Kafra	116,{
 }
 
 // Ayothaya ----------------------------------------------------------------
-ayothaya.gat,212,169,5	script	Kafra	116,{
+ayothaya.gat,212,169,5	script	Kafra::kaf_ayothaya	116,{
 	cutin "kafra_02",2;
 	callfunc "F_Kafra",4,3,1;
 
@@ -51,7 +51,7 @@ ayothaya.gat,212,169,5	script	Kafra	116,{
 
 // Einbech -----------------------------------------------------------------
 
-einbech.gat,181,131,5	script	Kafra	860,{
+einbech.gat,181,131,5	script	Kafra::kaf_einbech	860,{
 	cutin "kafra_08",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -61,7 +61,7 @@ einbech.gat,181,131,5	script	Kafra	860,{
 }
 
 // Einbroch (North-East) ---------------------------------------------------
-einbroch.gat,242,205,4	script	Kafra	115,{
+einbroch.gat,242,205,4	script	Kafra::kaf_einbroch	115,{
 	cutin "kafra_03",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -71,7 +71,7 @@ einbroch.gat,242,205,4	script	Kafra	115,{
 }
 
 // Einbroch (East) ---------------------------------------------------------
-einbroch.gat,59,203,4	script	Kafra	117,{
+einbroch.gat,59,203,4	script	Kafra::kaf_einbroch2	117,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -81,7 +81,7 @@ einbroch.gat,59,203,4	script	Kafra	117,{
 }
 
 // Gonryun -----------------------------------------------------------------
-gonryun.gat,159,122,4	script	Kafra	116,{
+gonryun.gat,159,122,4	script	Kafra::kaf_gonryun	116,{
 	cutin "kafra_02",2;
 	callfunc "F_Kafra",0,3,1;
 
@@ -93,7 +93,7 @@ gonryun.gat,159,122,4	script	Kafra	116,{
 // Lighthalzen--------------------------------------------------------------
 
 //Outside the hotel
-lighthalzen.gat,164,100,3	script	Kafra	860,{
+lighthalzen.gat,164,100,3	script	Kafra::kaf_lighthalzen	860,{
 	cutin "kafra_08",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -103,7 +103,7 @@ lighthalzen.gat,164,100,3	script	Kafra	860,{
 }
 
 // Entrance
-lighthalzen.gat,191,320,4	script	Kafra	861,{
+lighthalzen.gat,191,320,4	script	Kafra::kaf_lighthalzen2	861,{
 	cutin "kafra_09",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -113,7 +113,7 @@ lighthalzen.gat,191,320,4	script	Kafra	861,{
 }
 
 //Inside the hotel
-lhz_in02.gat,237,284,4	script	Kafra	861,{
+lhz_in02.gat,237,284,4	script	Kafra::kaf_lhz_in02	861,{
 	cutin "kafra_09",2;
 	callfunc "F_Kafra",0,4,1;
 
@@ -123,7 +123,7 @@ lhz_in02.gat,237,284,4	script	Kafra	861,{
 }
 
 // Louyang -----------------------------------------------------------------
-louyang.gat,210,104,5	script	Kafra	117,{
+louyang.gat,210,104,5	script	Kafra::kaf_louyang	117,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",4,3,1;
 
@@ -133,7 +133,7 @@ louyang.gat,210,104,5	script	Kafra	117,{
 }
 
 // Umbala Kafra ------------------------------------------------------------
-umbala.gat,128,133,4	script	Kafra	115,{
+umbala.gat,128,133,4	script	Kafra::kaf_umbala	115,{
 	cutin "kafra_03",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo";
@@ -147,7 +147,7 @@ umbala.gat,128,133,4	script	Kafra	115,{
 }
 
 // Niflheim ----------------------------------------------------------------
-niflheim.gat,202,180,3	script	Kafra	791,{
+niflheim.gat,202,180,3	script	Kafra::kaf_niflheim	791,{
 	callfunc "F_Kafra",1,2,1;
 //this SAVE isn't used. Niflheim Kafra doesn't SAVE
 	M_Save:
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
index 7526cb3f1..738a41004 100644
--- a/npc/kafras/kafras_pay.txt
+++ b/npc/kafras/kafras_pay.txt
@@ -24,7 +24,7 @@
 
 
 // Main Town, South ----------------------------------------------------------
-payon.gat,181,104,4	script	Kafra	113,{
+payon.gat,181,104,4	script	Kafra::kaf_payon	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPay";
 	callfunc "F_Kafra",0,0,1;
@@ -35,7 +35,7 @@ payon.gat,181,104,4	script	Kafra	113,{
 }
 
 // Main Town, Middle North --------------------------------------------------
-payon.gat,175,226,4	script	Kafra	116,{
+payon.gat,175,226,4	script	Kafra::kaf_payon2	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetPay";
 	callfunc "F_Kafra",0,0,1;
@@ -46,7 +46,7 @@ payon.gat,175,226,4	script	Kafra	116,{
 }
 
 // Archer Village ------------------------------------------------------------
-pay_arche.gat,55,123,8	script	Kafra	115,{
+pay_arche.gat,55,123,8	script	Kafra::kaf_payon3	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetPay";
 	callfunc "F_Kafra",0,5,1;
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
index b3803c97f..4648386cc 100644
--- a/npc/kafras/kafras_pron.txt
+++ b/npc/kafras/kafras_pron.txt
@@ -26,7 +26,7 @@
 
 
 // North ==================================
-prontera.gat,152,326,4	script	Kafra	112,{
+prontera.gat,152,326,4	script	Kafra::kaf_prontera	112,{
 	cutin "kafra_06",2;
 	callfunc "F_Kafra",0,1,1;
 
@@ -36,7 +36,7 @@ M_Save:
 }
 
 // SOUTH ======================================
-prontera.gat,151,29,8	script	Kafra	116,{
+prontera.gat,151,29,8	script	Kafra::kaf_prontera2	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetPront";
 	callfunc "F_Kafra",0,0,0;
@@ -53,7 +53,7 @@ prontera.gat,151,29,8	script	Kafra	116,{
 }
 
 //WEST=========================================
-prontera.gat,29,207,6	script	Kafra	113,{
+prontera.gat,29,207,6	script	Kafra::kaf_prontera3	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPront";
 	callfunc "F_Kafra",0,0,0;
@@ -70,7 +70,7 @@ prontera.gat,29,207,6	script	Kafra	113,{
 }
 
 // East ===========================================
-prontera.gat,282,200,4	script	Kafra	115,{
+prontera.gat,282,200,4	script	Kafra::kaf_prontera4	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetPront";
 	callfunc "F_Kafra",0,0,0;
@@ -87,7 +87,7 @@ prontera.gat,282,200,4	script	Kafra	115,{
 }
 
 // Center ===========================================
-prontera.gat,146,86,6	script	Kafra	117,{
+prontera.gat,146,86,6	script	Kafra::kaf_prontera5	117,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSetPront";
 	callfunc "F_Kafra",0,0,0;
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
index 6843675c9..775d83230 100644
--- a/npc/kafras/kafras_yun.txt
+++ b/npc/kafras/kafras_yun.txt
@@ -22,7 +22,7 @@
 
 
 // Center ------------------------------------------------------------------
-yuno.gat,153,187,6	script	Kafra	114,{
+yuno.gat,153,187,6	script	Kafra::kaf_yuno	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetYun";
 	callfunc "F_Kafra",0,0,0;
@@ -33,7 +33,7 @@ yuno.gat,153,187,6	script	Kafra	114,{
 }
 
 // South East --------------------------------------------------------------
-yuno.gat,328,108,6	script	Kafra	113,{
+yuno.gat,328,108,6	script	Kafra::kaf_yuno2	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetYun";
 	callfunc "F_Kafra",0,0,0;
@@ -44,7 +44,7 @@ yuno.gat,328,108,6	script	Kafra	113,{
 }
 
 // East --------------------------------------------------------------------
-yuno.gat,278,221,6	script	Kafra	117,{
+yuno.gat,278,221,6	script	Kafra::kaf_yuno3	117,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSetYun";
 	callfunc "F_Kafra",0,0,0;
-- 
cgit v1.2.3-70-g09d2