summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/kafras/kafras_brasilis.txt31
-rw-r--r--npc/re/kafras/kafras_izl.txt15
-rw-r--r--npc/re/scripts_athena.conf3
3 files changed, 1 insertions, 48 deletions
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
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index f65d08561..0f7502717 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -43,8 +43,7 @@ npc: npc/re/guides/guides_umbala.txt
npc: npc/re/guides/guides_veins.txt
// ---------------- Kafras & Cool Event Corp. -------------------
-npc: npc/re/kafras/kafras_izl.txt
-npc: npc/re/kafras/kafras_brasilis.txt
+npc: npc/re/kafras/kafras.txt
// -------------------------- Merchant --------------------------
npc: npc/re/merchants/3rd_trader.txt