summaryrefslogtreecommitdiff
path: root/npc/guild
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild')
-rw-r--r--npc/guild/aldeg/aldeg_kafras.txt25
-rw-r--r--npc/guild/gefg/gefg_kafras.txt27
-rw-r--r--npc/guild/gldfunc_ev_agit.txt7
-rw-r--r--npc/guild/gldfunc_kafra.txt10
-rw-r--r--npc/guild/gldfunc_manager.txt27
-rw-r--r--npc/guild/payg/payg_kafras.txt25
-rw-r--r--npc/guild/prtg/prtg_kafras.txt27
7 files changed, 78 insertions, 70 deletions
diff --git a/npc/guild/aldeg/aldeg_kafras.txt b/npc/guild/aldeg/aldeg_kafras.txt
index 80c429a02..d14fa17f7 100644
--- a/npc/guild/aldeg/aldeg_kafras.txt
+++ b/npc/guild/aldeg/aldeg_kafras.txt
@@ -4,58 +4,59 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
-//= Provides Kafra services for guild members of Al De Baran Castles.
+//= Provides Kafra Staffs for guild members of Al De Baran Castles.
//= Used in conjuction with function F_Kafra.
//===== Additional Comments: =================================
//= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
//============================================================
// Castle 1 ===============================================
-aldeg_cas01,218,170,0 script Kafra Service#A01 117,{
+aldeg_cas01,218,170,0 script Kafra Staff#A01 117,{
callfunc "F_GKafra", "aldeg_cas01", "Al De Baran";
end;
OnRecvCastleA01:
- if (GetCastleData("aldeg_cas01",9) < 1) disablenpc "Kafra Service#A01";
+ if (GetCastleData("aldeg_cas01",9) < 1) disablenpc "Kafra Staff#A01";
end;
}
// Castle 2 ===============================================
-aldeg_cas02,84,74,0 script Kafra Service#A02 117,{
+aldeg_cas02,84,74,0 script Kafra Staff#A02 117,{
callfunc "F_GKafra", "aldeg_cas02", "Al De Baran";
end;
OnRecvCastleA02:
- if (GetCastleData("aldeg_cas02",9) < 1) disablenpc "Kafra Service#A02";
+ if (GetCastleData("aldeg_cas02",9) < 1) disablenpc "Kafra Staff#A02";
end;
}
// Castle 3 ===============================================
-aldeg_cas03,118,76,0 script Kafra Service#A03 117,{
+aldeg_cas03,118,76,0 script Kafra Staff#A03 117,{
callfunc "F_GKafra", "aldeg_cas03", "Al De Baran";
end;
OnRecvCastleA03:
- if (GetCastleData("aldeg_cas03",9) < 1) disablenpc "Kafra Service#A03";
+ if (GetCastleData("aldeg_cas03",9) < 1) disablenpc "Kafra Staff#A03";
end;
}
// Castle 4 ===============================================
-aldeg_cas04,45,88,0 script Kafra Service#A04 117,{
+aldeg_cas04,45,88,0 script Kafra Staff#A04 117,{
callfunc "F_GKafra", "aldeg_cas04", "Al De Baran";
end;
OnRecvCastleA04:
- if (GetCastleData("aldeg_cas04",9) < 1) disablenpc "Kafra Service#A04";
+ if (GetCastleData("aldeg_cas04",9) < 1) disablenpc "Kafra Staff#A04";
end;
}
// Castle 5 ===============================================
-aldeg_cas05,31,190,0 script Kafra Service#A05 117,{
+aldeg_cas05,31,190,0 script Kafra Staff#A05 117,{
callfunc "F_GKafra", "aldeg_cas05", "Al De Baran";
end;
OnRecvCastleA05:
- if (GetCastleData("aldeg_cas05",9) < 1) disablenpc "Kafra Service#A05";
+ if (GetCastleData("aldeg_cas05",9) < 1) disablenpc "Kafra Staff#A05";
end;
}
diff --git a/npc/guild/gefg/gefg_kafras.txt b/npc/guild/gefg/gefg_kafras.txt
index bd5eed509..6c14ac7f9 100644
--- a/npc/guild/gefg/gefg_kafras.txt
+++ b/npc/guild/gefg/gefg_kafras.txt
@@ -4,63 +4,64 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
-//= Provides Kafra services for guild members of Geffen Castles.
+//= Provides Kafra Staffs for guild members of Geffen Castles.
//= Used in conjuction with function F_Kafra.
//===== Additional Comments: =================================
//= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
+//= Corrected hte location of Castle 1's kafra.
//============================================================
// Castle 1 ===============================================
-//gefg_cas01,96,173,0 script Kafra Service#G01 117,{
-gefg_cas01,35,37,0 script Kafra Service#G01 117,{
+gefg_cas01,83,47,0 script Kafra Staff#G01 117,{
callfunc "F_GKafra", "gefg_cas01", "Geffen";
end;
OnRecvCastleG01:
- if (GetCastleData("gefg_cas01",9) < 1) disablenpc "Kafra Service#G01";
+ if (GetCastleData("gefg_cas01",9) < 1) disablenpc "Kafra Staff#G01";
end;
}
// Castle 2 ===============================================
-gefg_cas02,23,66,3 script Kafra Service#G02 117,{
+gefg_cas02,23,66,3 script Kafra Staff#G02 117,{
callfunc "F_GKafra", "gefg_cas02", "Geffen";
end;
OnRecvCastleG02:
- if (GetCastleData("gefg_cas02",9) < 1) disablenpc "Kafra Service#G02";
+ if (GetCastleData("gefg_cas02",9) < 1) disablenpc "Kafra Staff#G02";
end;
}
// Castle 3 ===============================================
-gefg_cas03,116,89,5 script Kafra Service#G03 117,{
+gefg_cas03,116,89,5 script Kafra Staff#G03 117,{
callfunc "F_GKafra", "gefg_cas03", "Geffen";
end;
OnRecvCastleG03:
- if (GetCastleData("gefg_cas03",9) < 1) disablenpc "Kafra Service#G03";
+ if (GetCastleData("gefg_cas03",9) < 1) disablenpc "Kafra Staff#G03";
end;
}
// Castle 4 ===============================================
-gefg_cas04,59,70,3 script Kafra Service#G04 117,{
+gefg_cas04,59,70,3 script Kafra Staff#G04 117,{
callfunc "F_GKafra", "gefg_cas04", "Geffen";
end;
OnRecvCastleG04:
- if (GetCastleData("gefg_cas04",9) < 1) disablenpc "Kafra Service#G04";
+ if (GetCastleData("gefg_cas04",9) < 1) disablenpc "Kafra Staff#G04";
end;
}
// Castle 5 ===============================================
-gefg_cas05,61,52,5 script Kafra Service#G05 117,{
+gefg_cas05,61,52,5 script Kafra Staff#G05 117,{
callfunc "F_GKafra", "gefg_cas05", "Geffen";
end;
OnRecvCastleG05:
- if (GetCastleData("gefg_cas05",9) < 1) disablenpc "Kafra Service#G05";
+ if (GetCastleData("gefg_cas05",9) < 1) disablenpc "Kafra Staff#G05";
end;
}
diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index 0f49643e2..e92ff25e0 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -27,6 +27,7 @@
//= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
//= 1.3a fixed Defence / Economy underflow [Lupus] thanks2 kyoki
//= 1.4 updated a couple mapannounces in OnAgitBreak. [L0ne_W0lf]
+//= 1.5 Changed hte names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
//============================================================
@@ -118,7 +119,7 @@ function script F_GuildBreak {
killmonsterall getarg(0);
Announce "Guild Base [" + GetCastleName(getarg(0)) + "] has been abandoned.",0;
- disablenpc "Kafra Service#"+getarg(1);
+ disablenpc "Kafra Staff#"+getarg(1);
SetCastleData getarg(0),0,0;
return;
@@ -143,7 +144,7 @@ function script F_AgitBreak {
Announce "The [" + GetCastleName(getarg(0)) + "] castle has been conquered by the [" + GetGuildName(@GID) + "] guild.",bc_map;
GetCastleData getarg(0),0,"::OnRecvCastle"+getarg(1);
- disablenpc "Kafra Service#"+getarg(1);
+ disablenpc "Kafra Staff#"+getarg(1);
set @i, 3;
L_Loop:
diff --git a/npc/guild/gldfunc_kafra.txt b/npc/guild/gldfunc_kafra.txt
index bb967cb58..2c18d85c5 100644
--- a/npc/guild/gldfunc_kafra.txt
+++ b/npc/guild/gldfunc_kafra.txt
@@ -18,6 +18,8 @@
//===== Additional Comments: =================================
//= v1.2: All Guild kafra scripts use this function. [kobra_k88]
//= 1.2a Added extra check for Contract with Kafra Guild Skill [Lupus]
+//= 1.2 Kafra's not charge for use of Cart Rentals [L0ne_W0lf]
+//= Updated dialog and names.
//============================================================
function script F_GKafra {
@@ -26,13 +28,13 @@ function script F_GKafra {
if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
mes "[Kafra Service]";
- mes "I am here to serve only ^5533FF" + GetGuildName(@GID) + "^000000 members. Please use different Kafra Service. Thank you.";
+ mes "I am contracted to provide service only for the ^ff0000" + GetGuildName(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
cutin "",255;
close;
L_StartG:
- set @wrpP[0], 0;
+ set @wrpP[0], 200;
set @wrpD$[0], getarg(1);
- setarray @wrpC$[0], @wrpD$[0], "Cancel", "", "", "","";
- callfunc "F_Kafra",2,0,0;
+ setarray @wrpC$[0], @wrpD$[0]+" ^880000"+@wrpP[0]+"^000000 z", "Cancel", "", "", "","";
+ callfunc "F_Kafra",2,0,0,0,800;
end;
}
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 4c65bd543..fb1c7fe63 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= jAthena - kalen (1.0) & eAthena Team
//===== Current Version: =====================================
-//= 1.6b
+//= 1.7
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -30,6 +30,7 @@
//= 1.6 According to recent info u can re-install Guardians during WoE [Lupus]
//= 1.6a Fix for guild manager recognizing [KarLaeda]
//= 1.6b Fixed the chance for double invest, now 50% instead of 49% [Lupus]
+//= 1.7 Changed hte names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
//============================================================
@@ -58,11 +59,11 @@ function script F_GldManager {
//Novice Castles. (we don't need ELSE here. Menu has direct labels)
if(getarg(1) == "nguild_prt" || getarg(1) == "nguild_alde" || getarg(1) == "nguild_gef" || getarg(1) == "nguild_pay" )
- menu "Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
+ menu "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
//Common WoE Castles
menu "Guild Base Briefing",M_Base, "Commerce Investment",M_Comrc, "Defence Investment",M_Def, "Guardian Installation",M_Guard,
- "Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
+ "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
//========================
M_Base:
@@ -325,7 +326,7 @@ function script F_GldManager {
mes "[ "+getarg(0)+" ]";
if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
if (getgdskilllv(@GID,10001) == 0){
- mes "Master, you don't have a contract with the Kafra Service Company.";
+ mes "Master, you don't have a contract with the Kafra Staff Company.";
mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
return 0;
}
@@ -341,18 +342,18 @@ function script F_GldManager {
return 0;
}
set Zeny,Zeny-10000;
- enablenpc "Kafra Service#"+getarg(4);
+ enablenpc "Kafra Staff#"+getarg(4);
SetCastleData getarg(1),9,1;
- mes "You have created a contract with the Kafra Service Company.";
+ mes "You have created a contract with the Kafra Staff Company.";
next;
cutin "kafra_01",2;
- mes "[ Kafra Service ]";
+ mes "[ Kafra Staff ]";
mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you.";
next;
cutin "kafra_01",255;
mes "[ "+getarg(0)+" ]";
//mes "Your employment contract lasts ^5533FF1 month^000000. After this term is over you will have to create a new contract.";
- mes "I think the Kafra Service will benefit our guild members.";
+ mes "I think the Kafra Staff will benefit our guild members.";
return 0;
sM_KafEnd:
@@ -366,28 +367,28 @@ function script F_GldManager {
menu "Dismissal",-,"Cancel",sM_KafEnd2;
cutin "kafra_01",2;
- mes "[ Kafra Service ]";
+ mes "[ Kafra Staff ]";
mes "Have I done anything wrong? If I did, will you please forgive me?";
next;
menu "Dismiss",-,"Cancel",ssM_KafEnd2;
- mes "[ Kafra Service ]";
+ mes "[ Kafra Staff ]";
mes "It's unfortunate that I won't be able to serve your guild anymore....";
next;
- disablenpc "Kafra Service#"+getarg(4);
+ disablenpc "Kafra Staff#"+getarg(4);
SetCastleData getarg(1),9,0;
cutin "kafra_01",255;
mes "[ "+getarg(0)+" ]";
mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!";
return 0;
ssM_KafEnd2:
- mes "[ Kafra Service ]";
+ mes "[ Kafra Staff ]";
mes "Thank you master, I'll do my best! ^^.";
cutin "kafra_01",255;
return 0;
sM_KafEnd2:
mes "[ "+getarg(0)+" ]";
- mes "Master, I think you should keep the current Kafra Service because she is already trying her best to serve us";
+ mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
return 0;
//=========================
diff --git a/npc/guild/payg/payg_kafras.txt b/npc/guild/payg/payg_kafras.txt
index 992668fdc..92cd0a86b 100644
--- a/npc/guild/payg/payg_kafras.txt
+++ b/npc/guild/payg/payg_kafras.txt
@@ -4,62 +4,63 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//== Current Version: ========================================
-//= 1.2
+//= 1.3
//== Compatible With: ========================================
//= eAthena 0.1+; RO Episode 4+
//== Description: ============================================
-//= Provides Kafra services for guild members of Payon Castles.
+//= Provides Kafra Staffs for guild members of Payon Castles.
//= Used in conjuction with function F_Kafra.
//== Additional Comments: ==================================
//= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
//============================================================
// Castle 1 =============
-payg_cas01,128,58,3 script Kafra Service#Py01 117,{
+payg_cas01,128,58,3 script Kafra Staff#Py01 117,{
callfunc "F_GKafra", "payg_cas01", "Payon";
end;
OnRecvCastlePy01:
- if (GetCastleData("payg_cas01",9) < 1) disablenpc "Kafra Service#Py01";
+ if (GetCastleData("payg_cas01",9) < 1) disablenpc "Kafra Staff#Py01";
end;
}
// Castle 2 =============
-payg_cas02,22,275,5 script Kafra Service#Py02 117,{
+payg_cas02,22,275,5 script Kafra Staff#Py02 117,{
callfunc "F_GKafra", "payg_cas02", "Payon";
end;
OnRecvCastlePy02:
- if (GetCastleData("payg_cas02",9) < 1) disablenpc "Kafra Service#Py02";
+ if (GetCastleData("payg_cas02",9) < 1) disablenpc "Kafra Staff#Py02";
end;
}
// Castle 3 =============
-payg_cas03,9,263,5 script Kafra Service#Py03 117,{
+payg_cas03,9,263,5 script Kafra Staff#Py03 117,{
callfunc "F_GKafra", "payg_cas03", "Payon";
end;
OnRecvCastlePy03:
- if (GetCastleData("payg_cas03",9) < 1) disablenpc "Kafra Service#Py03";
+ if (GetCastleData("payg_cas03",9) < 1) disablenpc "Kafra Staff#Py03";
end;
}
// Castle 4 =============
-payg_cas04,40,235,1 script Kafra Service#Py04 117,{
+payg_cas04,40,235,1 script Kafra Staff#Py04 117,{
callfunc "F_GKafra", "payg_cas04", "Payon";
end;
OnRecvCastlePy04:
- if (GetCastleData("payg_cas04",9) < 1) disablenpc "Kafra Service#Py04";
+ if (GetCastleData("payg_cas04",9) < 1) disablenpc "Kafra Staff#Py04";
end;
}
// Castle 5 =============
-payg_cas05,276,227,1 script Kafra Service#Py05 117,{
+payg_cas05,276,227,1 script Kafra Staff#Py05 117,{
callfunc "F_GKafra", "payg_cas05", "Payon";
end;
OnRecvCastlePy05:
- if (GetCastleData("payg_cas05",9) < 1) disablenpc "Kafra Service#Py05";
+ if (GetCastleData("payg_cas05",9) < 1) disablenpc "Kafra Staff#Py05";
end;
}
diff --git a/npc/guild/prtg/prtg_kafras.txt b/npc/guild/prtg/prtg_kafras.txt
index b4b81d5d4..10e93dcad 100644
--- a/npc/guild/prtg/prtg_kafras.txt
+++ b/npc/guild/prtg/prtg_kafras.txt
@@ -4,63 +4,64 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//=== Current Version: ===================
-//= 1.2
+//= 1.3
//=== Compatible With: ===================
//= eAthena 0.1+; RO Episode 4+
//=== Description: =====================
-//= Provides Kafra services for guild members of Prontera Castles.
+//= Provides Kafra Staffs for guild members of Prontera Castles.
//= Used in conjuction with function F_Kafra.
//=== Additional Comments: =================
//= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
//==============================
// Castle 1 ========================
-prtg_cas01,96,173,0 script Kafra Service#Pt01 117,{
+prtg_cas01,96,173,0 script Kafra Staff#Pt01 117,{
callfunc "F_GKafra", "prtg_cas01", "Prontera";
end;
OnRecvCastlePt01:
- if (GetCastleData("prtg_cas01",9) < 1) disablenpc "Kafra Service#Pt01";
+ if (GetCastleData("prtg_cas01",9) < 1) disablenpc "Kafra Staff#Pt01";
end;
}
// Castle 2 ========================
-prtg_cas02,71,36,4 script Kafra Service#Pt02 117,{
+prtg_cas02,71,36,4 script Kafra Staff#Pt02 117,{
callfunc "F_GKafra", "prtg_cas02", "Prontera";
end;
OnRecvCastlePt02:
- if (GetCastleData("prtg_cas02",9) < 1) disablenpc "Kafra Service#Pt02";
+ if (GetCastleData("prtg_cas02",9) < 1) disablenpc "Kafra Staff#Pt02";
end;
}
// Castle 3 ========================
-//prtg_cas03,181,215,4 script Kafra Service#Pt03 117,{
-prtg_cas03,39,99,4 script Kafra Service#Pt03 117,{
+//prtg_cas03,181,215,4 script Kafra Staff#Pt03 117,{
+prtg_cas03,39,99,4 script Kafra Staff#Pt03 117,{
callfunc "F_GKafra", "prtg_cas03", "Prontera";
end;
OnRecvCastlePt03:
- if (GetCastleData("prtg_cas03",9) < 1) disablenpc "Kafra Service#Pt03";
+ if (GetCastleData("prtg_cas03",9) < 1) disablenpc "Kafra Staff#Pt03";
end;
}
// Castle 4 ========================
-prtg_cas04,258,247,4 script Kafra Service#Pt04 117,{
+prtg_cas04,258,247,4 script Kafra Staff#Pt04 117,{
callfunc "F_GKafra", "prtg_cas04", "Prontera";
end;
OnRecvCastlePt04:
- if (GetCastleData("prtg_cas04",9) < 1) disablenpc "Kafra Service#Pt04";
+ if (GetCastleData("prtg_cas04",9) < 1) disablenpc "Kafra Staff#Pt04";
end;
}
// Castle 5 ========================
-prtg_cas05,52,41,4 script Kafra Service#Pt05 117,{
+prtg_cas05,52,41,4 script Kafra Staff#Pt05 117,{
callfunc "F_GKafra", "prtg_cas05", "Prontera";
end;
OnRecvCastlePt05:
- if (GetCastleData("prtg_cas05",9) < 1) disablenpc "Kafra Service#Pt05";
+ if (GetCastleData("prtg_cas05",9) < 1) disablenpc "Kafra Staff#Pt05";
end;
}