summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-01 19:59:12 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-01 19:59:12 +0000
commit521b9c159e8d6eab32e467ee9a6987658d98f87d (patch)
tree168d058603b632c61bb9a481d754f449c501c268 /npc
parentbdfce85b67dd0e63f34ddf9bed05d94b79dd9d05 (diff)
downloadhercules-521b9c159e8d6eab32e467ee9a6987658d98f87d.tar.gz
hercules-521b9c159e8d6eab32e467ee9a6987658d98f87d.tar.bz2
hercules-521b9c159e8d6eab32e467ee9a6987658d98f87d.tar.xz
hercules-521b9c159e8d6eab32e467ee9a6987658d98f87d.zip
* Fixed a few errors with the kafra functions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10839 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/kafras/functions_kafras.txt12
2 files changed, 11 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7f7bab20b..8236553d9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/07/01
+ * Rev. 10839 Fixed a few errors with the kafra functions. [L0ne_W0lf]
2007/06/29
* Fixed some typos in various Rachel quests. [SinSloth]
* Fixed a minor bug in Hugel Bingo game system. [SinSloth]
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 1b6944bfd..622e1b1dc 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -5,7 +5,7 @@
//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 5.6a
+//= 5.7
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -50,6 +50,8 @@
//= 5.6 Further dialog updates, added dynamic costs for cart and storage use. [L0ne_W0lf]
//= Updated some functions to handle Guild Kafras the way they should.
//= 5.6a Corrected a few wrong name sin the teleport function. [L0ne_W0lf]
+//= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf]
+//= Thanks to Barron-Monster for pointing out the issues.
//============================================================
@@ -64,11 +66,11 @@ function script F_Kafra {
callfunc "F_ClearGarbage"; //Clear outdated, unused variables
//Display Kafra Welcome Message
- mes "[Kafra Employee]";
switch(getarg(0)){
//Default message (obsolete)
default:
case 0:
+ mes "[Kafra Employee]";
mes "Welcome to the";
mes "Kafra Corporartion.";
mes "The Kafra services";
@@ -78,6 +80,7 @@ function script F_Kafra {
//Niflheim specific message
case 1:
+ mes "[Kafra Employee]";
mes "^666666W-weeeelc-c-come";
mes "to th-the K-kaaafrrrra";
mes "C-coorpoor-r-ratioooonn...^000000";
@@ -85,12 +88,14 @@ function script F_Kafra {
//Guild Castle Kafra message
case 2:
+ mes "[Kafra Employee]";
mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
mes "The Kafra Coporation will stay with you wherever you go.";
break;
//Amatsu specific message (obsolete)
case 3:
+ mes "[Kafra Employee]";
mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
mes "In either case, why not stay awhile?";
mes "The air is eternally heavy with the";
@@ -99,6 +104,7 @@ function script F_Kafra {
//Louyang and Ayothaya specific message (obsolete)
case 4:
+ mes "[Kafra Employee]";
mes "With our many Kafra";
mes "service locations, you're never";
mes "far from home.";
@@ -520,7 +526,7 @@ function script F_KafEnd {
}
// Generic End
- else if(getarg(0)==0) {
+ else if(getarg(0)==0 || getarg(0)==5) {
mes "We, here at Kafra Corporation,";
mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
}