Merge pull request #1 from Earisu/master

updating, with earisu's

3 files changed, 46 insertions, 46 deletions

diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt
new file mode 100644
index 000000000..eb4cd30d3
--- /dev/null
+++ b/npc/re/kafras/kafras.txt
@@ -0,0 +1,46 @@
+//===== rAthena Script ======================================= 
+//= Kafras (Cities/Dungeons/Fields)
+//===== By: ================================================== 
+//= Joseph
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: =========================================
+//= Argument settings for callfunc "F_Kafra":
+//=  arg(0): 0 - Default Kafra message
+//=          1 - Niflhiem Kafra message
+//=          2 - Guild Kafra message
+//=  arg(1): 1 - Disable teleport menu 
+//=  arg(2): 1 - Disable info menu
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
+//===== Additional Comments: ================================= 
+//= 0.x Previous Authors: 
+//=     - L0ne_W0lf, Daegaladh
+//= 1.0 Merged and cleaned up Kafras. [Euphy]
+//= 1.1 Added Dewata Kafra. [Lemongrass]
+//============================================================ 
+
+// Brasilis
+//============================================================
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,3,0,80,700;
+	savepoint "brasilis",195,259;
+	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
+}
+
+// Dewata
+//============================================================
+dewata,202,184,6	script	Kafra Employee::kaf_dewata	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,10,1,40,700;
+	savepoint "dewata",206,174;
+	callfunc "F_KafEnd",0,1,"on Dewata Island";
+}
+
+
+// Izlude
+//============================================================
+izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117
diff --git a/npc/re/kafras/kafras_brasilis.txt b/npc/re/kafras/kafras_brasilis.txt
deleted file mode 100644
index b495c1ec8..000000000
--- a/npc/re/kafras/kafras_brasilis.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Brasilis Kafra
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    When set to 2 the Guild Kafra message is displayed. 
-//=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
-//=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
-//=  arg(3): Cost of Storage service
-//=  arg(4): Cost of Rent a Pushcart service
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//= 1.1 Updated save point coordinates.
-//= 1.2 Removed custom text. [Daegaladh]
-//============================================================ 
-
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
-	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,3,0,80,700;
-
-	M_Save:
-		savepoint "brasilis",195,259;
-		callfunc "F_KafEnd",0,1,"in the city of Brasilis";
-}
diff --git a/npc/re/kafras/kafras_izl.txt b/npc/re/kafras/kafras_izl.txt
deleted file mode 100644
index 96bf3e2ef..000000000
--- a/npc/re/kafras/kafras_izl.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-//===== rAthena Script ======================================= 
-//= New Izlude Kafras
-//===== By: ================================================== 
-//= Daegaladh
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Izlude Kafras with renewal coordinates.
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//============================================================ 
-
-izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117