summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-04 11:22:24 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-04 11:22:24 +0000
commit36bfcb5ed854fd5aa036cf5d11cfe6418ef7c981 (patch)
tree44a21fa091393cb0aa6b2578b4c8b4e7021cf234 /npc
parent2c024d072494ad045ca4ec9875b8bd0a6e26c7bc (diff)
downloadhercules-36bfcb5ed854fd5aa036cf5d11cfe6418ef7c981.tar.gz
hercules-36bfcb5ed854fd5aa036cf5d11cfe6418ef7c981.tar.bz2
hercules-36bfcb5ed854fd5aa036cf5d11cfe6418ef7c981.tar.xz
hercules-36bfcb5ed854fd5aa036cf5d11cfe6418ef7c981.zip
Re-added Brasilis Kafra, that was removed by mistake.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16576 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/kafras/dts_warper.txt2
-rw-r--r--npc/re/kafras/kafras_brasilis.txt31
-rw-r--r--npc/re/scripts_athena.conf1
3 files changed, 33 insertions, 1 deletions
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index ad5a82ab5..96ada0887 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -1180,7 +1180,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 864,{
mes "Lady Christy!";
next;
input .@input,0,9000;
- if (input == 1854) {
+ if (.@input == 1854) {
mes "[Christy's Maid]";
mes "I am Lady Christy's Maid.";
next;
diff --git a/npc/re/kafras/kafras_brasilis.txt b/npc/re/kafras/kafras_brasilis.txt
new file mode 100644
index 000000000..45309717d
--- /dev/null
+++ b/npc/re/kafras/kafras_brasilis.txt
@@ -0,0 +1,31 @@
+//===== 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/scripts_athena.conf b/npc/re/scripts_athena.conf
index 2f4367553..f7a87b78b 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -39,6 +39,7 @@ 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
// -------------------------- Merchant --------------------------
npc: npc/re/merchants/3rd_trader.txt