summaryrefslogtreecommitdiff
path: root/npc/kafras
diff options
context:
space:
mode:
Diffstat (limited to 'npc/kafras')
-rw-r--r--npc/kafras/cool_event_corp.txt12
-rw-r--r--npc/kafras/dts_warper.txt44
-rw-r--r--npc/kafras/functions_kafras.txt46
-rw-r--r--npc/kafras/kafras.txt18
4 files changed, 60 insertions, 60 deletions
diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt
index 2a892fb07..249d1ab71 100644
--- a/npc/kafras/cool_event_corp.txt
+++ b/npc/kafras/cool_event_corp.txt
@@ -9,12 +9,12 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
-//= Copyright (C) Haru
-//= Copyright (C) L0ne_W0lf
-//= Copyright (C) Playtester
-//= Copyright (C) Lupus
-//= Copyright (C) Gepard
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Haru
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Playtester
+//= Copyright (C) Lupus
+//= Copyright (C) Gepard
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index a482652ed..c8b4083da 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -9,12 +9,12 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
-//= Copyright (C) Euphy
-//= Copyright (C) L0ne_W0lf
-//= Copyright (C) Lupus
-//= Copyright (C) Silent
-//= Copyright (C) Evera
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Lupus
+//= Copyright (C) Silent
+//= Copyright (C) Evera
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -1209,8 +1209,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 1000.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 1000)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 1000) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1223,8 +1223,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 1000.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 1000)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 1000) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1237,8 +1237,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 1000.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 1000)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 1000) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1251,8 +1251,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 3.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 3)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 3) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1265,8 +1265,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 1000.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 1000)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 1000) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1279,8 +1279,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 2.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 2)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 2) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1293,8 +1293,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 2.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 2)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 2) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
@@ -1307,8 +1307,8 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
mes "[Christy's Maid]";
mes "Please enter a number among 0 and 10000.";
next;
- input .@input;
- if ((.@input < 0) || (.@input > 10000)) {
+ input(.@input);
+ if (.@input < 0 || .@input > 10000) {
mes "[Christy's Maid]";
mes "The value is incorrect.";
close;
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 90334cc6e..ecbdc1f45 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -9,26 +9,26 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
-//= Copyright (C) Dastgir
-//= Copyright (C) Haru
-//= Copyright (C) rAthena Dev Team
-//= Copyright (C) Euphy
-//= Copyright (C) Joseph
-//= Copyright (C) eAthena Dev Team
-//= Copyright (C) Daegaladh
-//= Copyright (C) brianluau
-//= Copyright (C) Kisuka
-//= Copyright (C) Evera
-//= Copyright (C) erKURITA
-//= Copyright (C) Silentdragon
-//= Copyright (C) Nexon
-//= Copyright (C) L0ne_W0lf
-//= Copyright (C) kobra_k88
-//= Copyright (C) Lupu
-//= Copyright (C) Syrus22
-//= Copyright (C) Darkchild
-//= Copyright (C) Darlskies
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
+//= Copyright (C) Haru
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Joseph
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) Daegaladh
+//= Copyright (C) brianluau
+//= Copyright (C) Kisuka
+//= Copyright (C) Evera
+//= Copyright (C) erKURITA
+//= Copyright (C) Silentdragon
+//= Copyright (C) Nexon
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) kobra_k88
+//= Copyright (C) Lupu
+//= Copyright (C) Syrus22
+//= Copyright (C) Darkchild
+//= Copyright (C) Darlskies
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ function script F_Kafra {
// Guild Castle Kafra message
@GID = getcharid(CHAR_ID_GUILD);
mes "[Kafra Employee]";
- mes "Welcome. ^ff0000" + getguildname(@GID) + "^000000 Member.";
+ mes "Welcome. ^ff0000" + getguildinfo(GUILDINFO_NAME, @GID) + "^000000 Member.";
mes "The Kafra Coporation will stay with you wherever you go.";
break;
case 3:
@@ -490,7 +490,7 @@ function script F_CheckKafCode {
return;
mes "Enter your storage password:";
@code_ = 0;
- input @code_;
+ input(@code_, 0);
if (@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
close2;
@@ -601,7 +601,7 @@ function script F_EntKafCode {
@kafcode_try = 0;
logmes "Hack: Tried to fit storage password.";
}
- if (input(@code_) == 1) {
+ if (input(@code_, 0) == 1) {
mes "You can't use such big password.";
return 0;
}
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index 29b1b02da..b91d2d989 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -9,15 +9,15 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
-//= Copyright (C) Lemongrass
-//= Copyright (C) Euphy
-//= Copyright (C) Joseph
-//= Copyright (C) Lupus
-//= Copyright (C) Evera
-//= Copyright (C) Samuray22
-//= Copyright (C) kobra_k88
-//= Copyright (C) L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Lemongrass
+//= Copyright (C) Euphy
+//= Copyright (C) Joseph
+//= Copyright (C) Lupus
+//= Copyright (C) Evera
+//= Copyright (C) Samuray22
+//= Copyright (C) kobra_k88
+//= Copyright (C) L0ne_W0lf
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by