Skip to content

Commit c3b021f

Browse files
HelianthellaHelianthella
committed
convert scripts to use getguildinfo()
1 parent 50ec75b commit c3b021f

39 files changed

+121
-121
lines changed

‎npc/custom/etc/quest_warper.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ L_GStorage:
495495
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5);
496496
next;
497497
mes "[Warpra]";
498-
mes "Close this window and I will open the ^5533FF" + getguildname(@GID) + "^000000 storage.";
498+
mes "Close this window and I will open the ^5533FF" + getguildinfo(GUILDINFO_NAME, @GID) + "^000000 storage.";
499499
close2;
500500
guildopenstorage;
501501
end;

‎npc/custom/itembind.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
2525
}
2626
mes "What kind of bind?";
2727
.@boundtype = 1 << (select("Account", "Guild", "Character")-1);
28-
if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) {
28+
if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) {
2929
mes "In order for me to bind an item to a guild you must be the master of one.";
3030
close;
3131
}
@@ -88,7 +88,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
8888
next;
8989
for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) {
9090
if(@inventorylist_id[.@item] == @bound_items[.@i] &&
91-
(!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))
91+
(!getcharid(CHAR_ID_GUILD) || getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))
9292
) {
9393
mes "I will only unbind guild bound items that the guild master requests.";
9494
close;

‎npc/custom/woe_controller.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ OnMinute00:
149149

150150
function Disp_Owner {
151151
set .@o, getcastledata(getarg(0),1);
152-
if (.@o) announce "The ["+getcastlename(getarg(0))+"] castle "+((getarg(1))?"has been conquered":"is currently held")+" by the ["+getguildname(.@o)+"] guild.",bc_all|bc_woe;
152+
if (.@o) announce "The ["+getcastlename(getarg(0))+"] castle "+((getarg(1))?"has been conquered":"is currently held")+" by the ["+getguildinfo(GUILDINFO_NAME, .@o)+"] guild.",bc_all|bc_woe;
153153
else announce "The ["+getcastlename(getarg(0))+"] castle is currently unoccupied.",bc_all|bc_woe;
154154
return;
155155
}
@@ -275,7 +275,7 @@ while(1) {
275275
mes "> ^FF0000"+.Regions$[.@i]+"^000000";
276276
for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) {
277277
set .@t, getcastledata(.Castles$[.@j],1);
278-
mes " ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildname(.@t):"^777777unoccupied")+"^000000";
278+
mes " ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildinfo(GUILDINFO_NAME, .@t):"^777777unoccupied")+"^000000";
279279
}
280280
if (.@i < 5) mes " ";
281281
}

‎npc/events/gdevent_aru.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{
8585
close;
8686
}
8787
.@chk_urquest = questprogress(2143,PLAYTIME);
88-
.@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD));
88+
.@chk_yourgdname$ = getguildinfo(GUILDINFO_NAME, getcharid(CHAR_ID_GUILD));
8989
if ($@gdeventv_a1 == 0) {
9090
if ($@gdevents_a$ == "") {
9191
$@gdeventv_a1 = 1;
@@ -521,7 +521,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
521521
mes "- and come back later. -";
522522
close;
523523
}
524-
if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) {
524+
if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD))) {
525525
if ($@gdeventv_a2 == 0) {
526526
.@que_2143 = questprogress(2143,PLAYTIME);
527527
if (!.@que_2143) {

‎npc/events/gdevent_sch.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{
8585
close;
8686
}
8787
.@chk_urquest = questprogress(2143,PLAYTIME);
88-
.@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD));
88+
.@chk_yourgdname$ = getguildinfo(GUILDINFO_NAME, getcharid(CHAR_ID_GUILD));
8989
if ($@gdeventv_s1 == 0) {
9090
if ($@gdevents_s$ == "") {
9191
$@gdeventv_s1 = 1;
@@ -520,7 +520,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
520520
mes "- and come back later. -";
521521
close;
522522
}
523-
if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) {
523+
if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD))) {
524524
if ($@gdeventv_s2 == 0) {
525525
.@que_2143 = questprogress(2143,PLAYTIME);
526526
if (!.@que_2143) {

‎npc/events/god_se_festival.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{
7272
mes "This is the flower.";
7373
mes "This is just a formality, but let me check your qualifications.";
7474
next;
75-
if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
75+
if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
7676
mes "[Rmimi Ravies]";
7777
mes "Your qualification is verified as a Guild master.";
7878
next;
@@ -141,7 +141,7 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{
141141
mes "[Rmimi Ravies]";
142142
mes "Have a good time.";
143143
donpcevent "Rmimi Ravies#gq_fes01::OnStart";
144-
announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
144+
announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
145145
close;
146146
}
147147
else {
@@ -448,7 +448,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{
448448
mes "A flower!!";
449449
mes "Shall we proceed?";
450450
next;
451-
if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
451+
if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
452452
mes "[Rhehe Ravies]";
453453
mes "Eeeeh, so young and yet you're a guild master? Your guildsmen must be jealous.";
454454
next;
@@ -521,7 +521,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{
521521
mes "[Rhehe Ravies]";
522522
mes "I hope you enjoy yourself!";
523523
donpcevent "Rhehe Ravies#gq_fes03::OnStart";
524-
announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
524+
announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
525525
close;
526526
}
527527
else {

‎npc/events/nguild/nguild_ev_agit.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function script F_AgitBreak {
8080

8181
setcastledata .@map$,1, .@GID;
8282
mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;
83-
announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all;
83+
announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all;
8484
donpcevent "::OnRecvCastle"+.@castle$;
8585

8686
disablenpc "Kafra Staff#"+.@castle$;

‎npc/events/nguild/nguild_flags.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ function script F_Flags {
6868
mes "1. Following the ordinance of the";
6969
mes "Divine Rune Midgard Kingdom,";
7070
mes "we approve that this place is in";
71-
mes "the private possession of ^ff0000" + getguildname(.@GID) + "^000000 Guild.";
71+
mes "the private possession of ^ff0000" + getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Guild.";
7272
mes " ";
73-
mes "2. The guild Master of ^ff0000"+ getguildname(.@GID) + "^000000 Guild is";
74-
mes "^FF0000" + getguildmaster(.@GID) + "^000000";
73+
mes "2. The guild Master of ^ff0000"+ getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Guild is";
74+
mes "^FF0000" + getguildinfo(GUILDINFO_MASTER_NAME, .@GID) + "^000000";
7575
mes "If there is anyone who objects to this,";
7676
mes " prove your strength and honor with a steel blade in your hand.";
7777
return;

‎npc/events/nguild/nguild_kafras.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function script F_GKafra {
4141
@GID = getcastledata(getarg(0),1);
4242
if (getcharid(CHAR_ID_GUILD) != @GID || getgdskilllv(@GID,10001) < 1) {
4343
mes "[Kafra Service]";
44-
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.";
44+
mes "I am contracted to provide service only for the ^ff0000" + getguildinfo(GUILDINFO_NAME, @GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
4545
cutin "",255;
4646
close;
4747
}

‎npc/events/nguild/nguild_managers.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ function script F_GldManager {
4848
return;
4949
}
5050
if (getcharid(CHAR_ID_GUILD) != @GID){
51-
mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!";
51+
mes "I am here to follow ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000's command! Hey! Your not even a part of the guild!!";
5252
mes "Where are the guardians? Destroy these intruders!";
5353
return;
5454
}
55-
if (strcharinfo(PC_NAME) != getguildmaster(@GID)){
56-
mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only";
55+
if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, @GID)){
56+
mes "You're not ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000! I am here to follow ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000's command only";
5757
return 0;
5858
}
5959

60-
mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!";
60+
mes "Welcome Master ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000 ! I will assist you in any way I can!";
6161
next;
6262

6363
switch (select("Kafra Staff Employment / Dismissal","Enter Treasure Room","Cancel")) {

0 commit comments

Comments
 (0)