From 50f7cd8138cafc307b51d5c1f02c7f2893d2a0c5 Mon Sep 17 00:00:00 2001 From: gumi Date: Sun, 20 Oct 2019 13:40:25 -0400 Subject: convert scripts to use getguildinfo() --- npc/events/gdevent_aru.txt | 4 ++-- npc/events/gdevent_sch.txt | 4 ++-- npc/events/god_se_festival.txt | 8 ++++---- npc/events/nguild/nguild_ev_agit.txt | 2 +- npc/events/nguild/nguild_flags.txt | 6 +++--- npc/events/nguild/nguild_kafras.txt | 2 +- npc/events/nguild/nguild_managers.txt | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'npc/events') diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 0a3eef0b1..95174071e 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -85,7 +85,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ close; } .@chk_urquest = questprogress(2143,PLAYTIME); - .@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD)); + .@chk_yourgdname$ = getguildinfo(GUILDINFO_NAME, getcharid(CHAR_ID_GUILD)); if ($@gdeventv_a1 == 0) { if ($@gdevents_a$ == "") { $@gdeventv_a1 = 1; @@ -521,7 +521,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "- and come back later. -"; close; } - if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD))) { if ($@gdeventv_a2 == 0) { .@que_2143 = questprogress(2143,PLAYTIME); if (!.@que_2143) { diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index add37bcb9..77fd964d1 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -85,7 +85,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ close; } .@chk_urquest = questprogress(2143,PLAYTIME); - .@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD)); + .@chk_yourgdname$ = getguildinfo(GUILDINFO_NAME, getcharid(CHAR_ID_GUILD)); if ($@gdeventv_s1 == 0) { if ($@gdevents_s$ == "") { $@gdeventv_s1 = 1; @@ -520,7 +520,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "- and come back later. -"; close; } - if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD))) { if ($@gdeventv_s2 == 0) { .@que_2143 = questprogress(2143,PLAYTIME); if (!.@que_2143) { diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 7c0523cf5..11a6160fc 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -72,7 +72,7 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ mes "This is the flower."; mes "This is just a formality, but let me check your qualifications."; next; - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[Rmimi Ravies]"; mes "Your qualification is verified as a Guild master."; next; @@ -141,7 +141,7 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ mes "[Rmimi Ravies]"; mes "Have a good time."; donpcevent "Rmimi Ravies#gq_fes01::OnStart"; - announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb"; close; } else { @@ -448,7 +448,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ mes "A flower!!"; mes "Shall we proceed?"; next; - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[Rhehe Ravies]"; mes "Eeeeh, so young and yet you're a guild master? Your guildsmen must be jealous."; next; @@ -521,7 +521,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ mes "[Rhehe Ravies]"; mes "I hope you enjoy yourself!"; donpcevent "Rhehe Ravies#gq_fes03::OnStart"; - announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(PC_NAME) +"] member of ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb"; close; } else { diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index 9bb76f728..81adc89d4 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -80,7 +80,7 @@ function script F_AgitBreak { setcastledata .@map$,1, .@GID; mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF; - announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all; + announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all; donpcevent "::OnRecvCastle"+.@castle$; disablenpc "Kafra Staff#"+.@castle$; diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 999f79dca..91ca46c87 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -68,10 +68,10 @@ function script F_Flags { mes "1. Following the ordinance of the"; mes "Divine Rune Midgard Kingdom,"; mes "we approve that this place is in"; - mes "the private possession of ^ff0000" + getguildname(.@GID) + "^000000 Guild."; + mes "the private possession of ^ff0000" + getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+ getguildname(.@GID) + "^000000 Guild is"; - mes "^FF0000" + getguildmaster(.@GID) + "^000000"; + mes "2. The guild Master of ^ff0000"+ getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Guild is"; + mes "^FF0000" + getguildinfo(GUILDINFO_MASTER_NAME, .@GID) + "^000000"; mes "If there is anyone who objects to this,"; mes " prove your strength and honor with a steel blade in your hand."; return; diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 96371ec91..7dfd14036 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -41,7 +41,7 @@ function script F_GKafra { @GID = getcastledata(getarg(0),1); if (getcharid(CHAR_ID_GUILD) != @GID || getgdskilllv(@GID,10001) < 1) { mes "[Kafra Service]"; - 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."; + 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."; cutin "",255; close; } diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index a24a0cb15..93fe8b92c 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -48,16 +48,16 @@ function script F_GldManager { return; } if (getcharid(CHAR_ID_GUILD) != @GID){ - mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!"; + mes "I am here to follow ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000's command! Hey! Your not even a part of the guild!!"; mes "Where are the guardians? Destroy these intruders!"; return; } - if (strcharinfo(PC_NAME) != getguildmaster(@GID)){ - mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only"; + if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, @GID)){ + 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"; return 0; } - mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!"; + mes "Welcome Master ^5533FF" + getguildinfo(GUILDINFO_MASTER_NAME, @GID) + "^000000 ! I will assist you in any way I can!"; next; switch (select("Kafra Staff Employment / Dismissal","Enter Treasure Room","Cancel")) { -- cgit v1.2.3-70-g09d2