diff options
55 files changed, 391 insertions, 149 deletions
diff --git a/doc/constants.md b/doc/constants.md index 71150da6f..5ffef5175 100644 --- a/doc/constants.md +++ b/doc/constants.md @@ -4558,6 +4558,20 @@ - `SIEGE_TYPE_SE`: 1 - `SIEGE_TYPE_TE`: 2 +### guildinfo types + +- `GUILDINFO_NAME`: 0 +- `GUILDINFO_ID`: 1 +- `GUILDINFO_LEVEL`: 2 +- `GUILDINFO_ONLINE`: 3 +- `GUILDINFO_AV_LEVEL`: 4 +- `GUILDINFO_MAX_MEMBERS`: 5 +- `GUILDINFO_EXP`: 6 +- `GUILDINFO_NEXT_EXP`: 7 +- `GUILDINFO_SKILL_POINTS`: 8 +- `GUILDINFO_MASTER_NAME`: 9 +- `GUILDINFO_MASTER_CID`: 10 + ### Renewal - `RENEWAL`: 1 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index fa35b3a7c..45636f23b 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3008,7 +3008,7 @@ For example: if (getequiprefinerycnt(EQI_HEAD_TOP) > 10) { mes("You equipped a headgear (top) with above 10 refine."); } - + For example: if (getequiprefinerycnt(EQI_ARMOR, EQI_SHOES) > 20) { mes("Total refine of Armor and Shoes exceed 20."); @@ -3155,7 +3155,7 @@ recreate these items perfectly if they are destroyed. Here's what you get: @inventorylist_expire[] - expire time (Unix time stamp). 0 means never expires. @inventorylist_bound[] - whether it is an account bounded item or not. -@inventorylist_favorite[] - whether it is favorite (inside favorite tab) or not. +@inventorylist_favorite[] - whether it is favorite (inside favorite tab) or not. @inventorylist_count - the number of items in these lists. This could be handy to save/restore a character's inventory, since no @@ -3215,7 +3215,7 @@ This function will set an item in inventory as favorite or not. If its favorite item, it will be moved to favorite tab, else move out from favorite tab. Note: Cant change favorite flag of an equipped item. -Valid Parameters: +Valid Parameters: <idx> - inventory index, refer *getinventorylist() <flag> - true/false (true = favorite item, false = otherwise) @@ -3223,11 +3223,11 @@ Valid Parameters: *autofavoriteitem(<item_id>, <flag>) -This function will auto set an item as favorite when <item_id> is obtained. +This function will auto set an item as favorite when <item_id> is obtained. If its favorite item, it will be auto moved to favorite tab, else move out from favorite tab. This setting affect not only attached player, but also everyone player globally. -Valid Parameters: +Valid Parameters: <item_id> - item ID <flag> - true/false (true = favorite item, false = otherwise) @@ -3320,7 +3320,7 @@ Valid types are: ITEMINFO_STACK_FLAG - Stack amount flag (1: inventory, 2:cart, 4:storage: 8:guildstorage) ITEMINFO_ITEM_USAGE_FLAG - Item usage flag ITEMINFO_ITEM_USAGE_OVERRIDE - Item usage override - ITEMINFO_GM_LV_TRADE_OVERRIDE - Min. GM level override trade restriction + ITEMINFO_GM_LV_TRADE_OVERRIDE - Min. GM level override trade restriction Check sample in doc/sample/getiteminfo.txt @@ -3704,8 +3704,38 @@ You need to put a 'close' after that yourself. //===================================== --------------------------------------- +*getguildinfo(<info type>{, <guild id>}) +*getguildinfo(<info type>{, "<guild name>"}) + +This command returns misc info about the guild of the attached player. If a +guild id or guild name is specified it will be used instead. If the target guild +does not exist it returns an empty string or -1 depending on whether a string +or an integer was requested. + +Valid <info type> are: + GUILDINFO_NAME - guild name + GUILDINFO_ID - guild id + GUILDINFO_LEVEL - current level + GUILDINFO_EXP - current exp + GUILDINFO_NEXT_EXP - exp required to reach the next level + GUILDINFO_SKILL_POINTS - available skill points + GUILDINFO_ONLINE - number of online members + GUILDINFO_AV_LEVEL - average member level + GUILDINFO_MAX_MEMBERS - guild capacity + GUILDINFO_MASTER_NAME - name of the guild master + GUILDINFO_MASTER_CID - char id of the guild master + +Example: + getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD, "Haru")) + +--------------------------------------- + *getguildname(<guild id>) + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + This function returns a guild's name given an ID number. If there is no such guild, "null" will be returned; @@ -3719,10 +3749,18 @@ such guild, "null" will be returned; This is used all over the WoE controlling scripts. You could also use it for a guild-based event. +This command is deprecated and it should not be used in new scripts, as it is +likely to be removed at a later time. Please use getguildinfo instead: + getguildinfo(GUILDINFO_NAME, <guild id>) + --------------------------------------- *getguildmaster(<guild id>) + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + This function return the name of the master of the guild which has the specified ID number. If there is no such guild, "null" will be returned. @@ -3746,14 +3784,26 @@ Maybe you want to make a room only guild masters can enter: mes("Sorry you don't own the guild you are in"); close(); +This command is deprecated and it should not be used in new scripts, as it is +likely to be removed at a later time. Please use getguildinfo instead: + getguildinfo(GUILDINFO_MASTER_NAME, <guild id>) + --------------------------------------- *getguildmasterid(<guild id>) + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + This function will return the character ID number of the guild master of the guild specified by the ID. 0 if the character is not a guild master of any guild. +This command is deprecated and it should not be used in new scripts, as it is +likely to be removed at a later time. Please use getguildinfo instead: + getguildinfo(GUILDINFO_MASTER_CID, <guild id>) + --------------------------------------- *getcastlename("<map name>") @@ -3956,7 +4006,7 @@ These fields are associate in 'db/(pre-)re/pet_db.conf'. Valid types are: PETINFO_ACCESSORYFLAG - return 1 if the pet currently equipping accessory, return 0 otherwise. PETINFO_EVO_EGGID - Pet Evolve EggID PETINFO_AUTOFEED - Pet AutoFeed flag. - + If the invoking player doesn't own a pet, this command will return "null" for type PETINFO_NAME, and return 0 for other types. diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index fec9c6b14..ce0897f69 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -495,7 +495,7 @@ L_GStorage: if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5); next; mes "[Warpra]"; - mes "Close this window and I will open the ^5533FF" + getguildname(@GID) + "^000000 storage."; + mes "Close this window and I will open the ^5533FF" + getguildinfo(GUILDINFO_NAME, @GID) + "^000000 storage."; close2; guildopenstorage; end; diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index 7d95afdfc..e104d89b1 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -25,7 +25,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ } mes "What kind of bind?"; .@boundtype = 1 << (select("Account", "Guild", "Character")-1); - if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) { + if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) { mes "In order for me to bind an item to a guild you must be the master of one."; close; } @@ -88,7 +88,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ next; for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) { if(@inventorylist_id[.@item] == @bound_items[.@i] && - (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME)) + (!getcharid(CHAR_ID_GUILD) || getguildinfo(GUILDINFO_MASTER_NAME, getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME)) ) { mes "I will only unbind guild bound items that the guild master requests."; close; diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index 5f619c1db..e9139c0ce 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -149,7 +149,7 @@ OnMinute00: function Disp_Owner { set .@o, getcastledata(getarg(0),1); - 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; + 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; else announce "The ["+getcastlename(getarg(0))+"] castle is currently unoccupied.",bc_all|bc_woe; return; } @@ -275,7 +275,7 @@ while(1) { mes "> ^FF0000"+.Regions$[.@i]+"^000000"; for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) { set .@t, getcastledata(.Castles$[.@j],1); - mes " ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildname(.@t):"^777777unoccupied")+"^000000"; + mes " ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildinfo(GUILDINFO_NAME, .@t):"^777777unoccupied")+"^000000"; } if (.@i < 5) mes " "; } 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")) { diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index d9253cd13..10a4ca0e0 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -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: diff --git a/npc/pre-re/quests/quests_payon.txt b/npc/pre-re/quests/quests_payon.txt new file mode 100644 index 000000000..210e5d819 --- /dev/null +++ b/npc/pre-re/quests/quests_payon.txt @@ -0,0 +1,35 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2013-2019 Hercules Dev Team +//= Copyright (C) JohnnyPlayy +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Quest NPCs located in Payon +//================= Description =========================================== +//= Quests related to Payon City. +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +payon_in01,56,12,7 duplicate(Young man#12) Young man#1 4_M_ORIENT02 diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf index d00d6ffba..18cf1c32c 100644 --- a/npc/pre-re/scripts.conf +++ b/npc/pre-re/scripts.conf @@ -110,3 +110,4 @@ "npc/pre-re/quests/quests_lighthalzen.txt", "npc/pre-re/quests/quests_nameless.txt", "npc/pre-re/quests/quests_veins.txt", +"npc/pre-re/quests/quests_payon.txt", diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index 87c72ef16..ec4b081fa 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -86,7 +86,7 @@ close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (guildrelay_q == 100) { if (guildtime > 22) { if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) { @@ -1265,7 +1265,7 @@ close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (countitem(Soul_Of_Guild) > 0) { mes "[" + .@name$ + "]"; mes "Hm. You can't just keep"; @@ -1728,7 +1728,7 @@ } } else { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[" + .@name$ + "]"; mes "Hm? What brings you"; mes "here? Feel free to take"; @@ -1769,7 +1769,7 @@ close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (countitem(Soul_Of_Confidence) > 0) { mes "[" + .@name$ + "]"; mes "Hm? What are you doing?"; @@ -2283,7 +2283,7 @@ } } else { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[" + .@name$ + "]"; mes "Hm. You're the master"; mes "of another guild, aren't"; @@ -2453,7 +2453,7 @@ close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (countitem(Soul_Of_Peace) > 0) { mes "[" + .@name$ + "]"; mes "Hm? That spirit that"; @@ -3076,7 +3076,7 @@ } } else { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[" + .@name$ + "]"; mes "You might be the master"; mes "of a guild, but you and I"; diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index bdf763bd5..c6e0b57c7 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -194,7 +194,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 .@GID = getcastledata(.@t$,1); if (getcharid(CHAR_ID_GUILD) == .@GID) { cutin "wish_maiden31",1; - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[Wish Maiden]"; mes "I am... Wish maiden."; mes "Mourning in this virtual realm, Okolnir."; @@ -258,7 +258,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 donpcevent "#okolnir_"+.@sub$+"::OnEnable"; disablenpc "Wish Maiden#gq_"+.@sub$; cutin "wish_maiden11",255; - announce "["+ strcharinfo(PC_NAME) +"], of the guild ["+ getguildname(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(PC_NAME) +"], of the guild ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb"; end; } else { @@ -2162,7 +2162,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1)); .@GID = getcastledata(.@t$,1); if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (compare(.@sub$,"aru")) { setarray .@n, 7835,1,7836,1,7837,1,7838,1,2513,1,7291,10,7293,10,7063,100,985,20; .@rwd = 2541; //Asprika @@ -2198,7 +2198,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS delitem .@n[.@i],.@n[.@i+1]; getitem .@rwd,1; getitem Valkyrie_Gift,1; - announce "["+ strcharinfo(PC_NAME) +"], of guild ["+ getguildname(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(PC_NAME) +"], of guild ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb"; close2; cutin "wish_maiden11",255; disablenpc "Wish Maiden#"+.@sub$+"_gift"; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index 282bd2eb3..4ffd5b802 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -229,7 +229,7 @@ payon_in02,25,71,4 script Boy 4_M_04,{ } //== 'Helm of Angel' and 'Deviruchi Cap' Quest ============= -payon_in01,46,21,5 script Young man#12 4_M_ORIENT02,{ +- script Young man#12 4_M_ORIENT02,{ mes "[Young man]"; mes "...What is it?"; next; diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index 3f32461fa..037c96197 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -91,7 +91,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ case 3: .@GID = getcharid(CHAR_ID_GUILD); if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){ - if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(PC_NAME) == getguildmaster(.@GID))) { + if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID))) { mes "[Dwarf Grunburti]"; mes "Hmm..."; mes "I'll need some things to make a weapon for you. What exactly were you interested in having?"; @@ -167,7 +167,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ mes "Stop bothering me and get out of here! Go play with some monsters, you simple minded fool!"; close; } - if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[Dwarf Grunburti]"; mes "I'll only present"; mes "my magnificent skills"; @@ -413,7 +413,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ close; } .@GID = getcharid(CHAR_ID_GUILD); - if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes "[Dwarf Grunburti]"; mes "How in the..."; mes "Get out of here!"; @@ -515,7 +515,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ $God2 = 0; $God3 = 0; $God4 = 0; - announce "[Brisingamen] has come into the hands of [" + strcharinfo(PC_NAME) + "], master of the [" + getguildname(.@GID) + "] guild.",bc_all; + announce "[Brisingamen] has come into the hands of [" + strcharinfo(PC_NAME) + "], master of the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all; mes "[Dwarf Grunburti]"; mes "Ah, just look at this dazzling beauty. No other piece of jewelry complemented Freya as well as Brisingamen."; close; @@ -589,7 +589,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ $God2 = 0; $God3 = 0; $God4 = 0; - announce "[Megingjard] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildname(.@GID) + "].",bc_all; + announce "[Megingjard] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildinfo(GUILDINFO_NAME, .@GID) + "].",bc_all; mes "[Dwarf Grunburti]"; mes "Here..."; mes "Be careful with how"; @@ -679,7 +679,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ $God2 = 0; $God3 = 0; $God4 = 0; - announce "[Sleipnir] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildname(.@GID) + "].",bc_all; + announce "[Sleipnir] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildinfo(GUILDINFO_NAME, .@GID) + "].",bc_all; mes "[Dwarf Grunburti]"; mes "There..."; mes "Wear these, and"; @@ -768,7 +768,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ $God2 = 0; $God3 = 0; $God4 = 0; - announce "[Mjolnir] has been bestowed to [" + strcharinfo(PC_NAME) + "], the master of the [" + getguildname(.@GID) + "] guild.",bc_all; + announce "[Mjolnir] has been bestowed to [" + strcharinfo(PC_NAME) + "], the master of the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all; mes "[Dwarf Grunburti]"; mes "It's done."; mes "Take it. How does"; diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 7c29265e0..224918a15 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -94,7 +94,7 @@ brasilis,155,165,3 script Signpost#bra1 4_BULLETIN_BOARD2,{ close; } -brasilis,195,231,3 script Signpost#bra2 4_BULLETIN_BOARD2,{ +brasilis,191,239,3 script Signpost#bra2 4_BULLETIN_BOARD2,{ mes ":: Verass Monument ::"; close; } diff --git a/npc/re/quests/quests_payon.txt b/npc/re/quests/quests_payon.txt new file mode 100644 index 000000000..70646b98c --- /dev/null +++ b/npc/re/quests/quests_payon.txt @@ -0,0 +1,35 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2013-2019 Hercules Dev Team +//= Copyright (C) JohnnyPlayy +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Quest NPCs located in Payon +//================= Description =========================================== +//= Quests related to Payon City. +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +payon_in01,46,21,4 duplicate(Young man#12) Young man#1 4_M_ORIENT02 diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index c26e907ad..765f9d5e5 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -181,5 +181,6 @@ "npc/re/quests/quests_morocc.txt", "npc/re/quests/quests_nameless.txt", "npc/re/quests/quests_veins.txt", +"npc/re/quests/quests_payon.txt", // - New Gears -------------------------------------------------- "npc/re/quests/newgears/2012_headgears.txt", diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index e42959aa7..fc258ad2e 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -908,7 +908,7 @@ OnAgitInvest: for(.@i = 1; .@i<=5; ++.@i) { .@castle_name$[.@i] = getcastlename(.@npc$+"g_cas0"+.@i); .@owner_id[.@i] = getcastledata(.@npc$+"g_cas0"+.@i,1); - .@owner_name$[.@i] = getguildname(.@owner_id[.@i]); + .@owner_name$[.@i] = getguildinfo(GUILDINFO_NAME, .@owner_id[.@i]); if (.@guild == .@owner_id[.@i]) { .@menu$ = .@menu$+.@castle_name$[.@i]+" ["+.@owner_name$[.@i]+"] Guild:"; .@castles_owned = .@castles_owned | (1<<.@i); @@ -1062,7 +1062,7 @@ OnAgitInvest: for(.@i = 1; .@i<=5; ++.@i) { .@map$ = .@npc$+"g_cas0"+.@i; .@fund[.@i] = getd("$@vfund_"+.@npc$+"0"+.@i); - mes getcastlename(.@map$)+" "+getguildname(getcastledata(.@map$,1))+" Guild: "+.@fund[.@i]; + mes getcastlename(.@map$)+" "+getguildinfo(GUILDINFO_NAME, getcastledata(.@map$,1))+" Guild: "+.@fund[.@i]; } .@fund[0] = getd("$@vfund_"+.@npc$+"_extra"); mes .@realm$+" normal: "+.@fund[0]; diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt index abae1e19b..e78e10275 100644 --- a/npc/warps/cities/lighthalzen.txt +++ b/npc/warps/cities/lighthalzen.txt @@ -120,3 +120,5 @@ lighthalzen,251,299,0 warp lhz_house3_1-1 1,1,lhz_in03,97,21 lhz_in03,93,21,0 warp lhz_house3_1-2 1,1,lighthalzen,247,299 lhz_in03,134,14,0 warp lhz_house3_2-1 1,1,lhz_in03,125,90 lhz_in03,120,90,0 warp lhz_house3_2-2 1,1,lhz_in03,130,14 +lighthalzen,340,240,0 warp lhz_pub3-1 1,1,lhz_in03,180,86 +lhz_in03,180,90,0 warp lhz_pub3-2 1,1,lighthalzen,339,245 diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index b04cc53dc..02b38fbef 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -71,10 +71,10 @@ yuno_in03,167,19,0 warp yun30 1,1,yuno,323,280 yuno_in03,167,72,0 warp yun31 1,1,yuno_in03,179,113 yuno_in03,179,109,0 warp yun32 1,1,yuno_in03,167,69 yuno_in03,186,119,0 warp yun33 1,1,yuno_in03,163,174 -yuno_in03,159,174,0 warp yun34 1,1,yuno_in03,183,119 +yuno_in03,161,174,0 warp yun34 1,1,yuno_in03,183,119 yuno_in03,186,131,0 warp yun35 1,1,yuno_in03,163,187 -yuno_in03,159,187,0 warp yun36 1,1,yuno_in03,183,131 -yuno_in03,172,118,0 warp yun37 1,1,yuno_in03,120,178 +yuno_in03,161,187,0 warp yun36 1,1,yuno_in03,183,131 +yuno_in03,173,118,0 warp yun37 1,1,yuno_in03,120,178 yuno_in03,124,178,0 warp yun38 1,1,yuno_in03,176,118 yuno_in03,111,192,0 warp yun39 1,1,yuno_in03,162,132 yuno_in03,162,129,0 warp yun40 1,1,yuno_in03,111,189 @@ -216,3 +216,6 @@ yuno_pre,81,68,0 warp yungvn09 1,1,yuno_pre,95,68 yuno_pre,18,92,0 warp yungvn10 1,1,yuno_pre,18,73 yuno,157,322,0 warp yungvn11 1,1,yuno_pre,69,13 yuno_pre,69,10,0 warp yungvn12 1,1,yuno,157,317 + +yuno,195,87,0 warp yun78 1,1,yuno_in04,186,28 +yuno_in04,192,28,0 warp yun79 1,1,yuno,198,87 diff --git a/npc/woe-fe/agit_controller.txt b/npc/woe-fe/agit_controller.txt index be7e07d14..a0e3fa290 100644 --- a/npc/woe-fe/agit_controller.txt +++ b/npc/woe-fe/agit_controller.txt @@ -82,7 +82,7 @@ S_DisplayOwners: setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05"; for (.@i = 0; .@i <= 19; ++.@i) { if (getcastledata(.@maps$[.@i],1)) - announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildname(getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; + announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildinfo(GUILDINFO_NAME, getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; else announce "The [" + getcastlename(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe; } diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index a0db6402b..05789a286 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -143,7 +143,7 @@ OnAgitBreak: if( agitcheck() ) donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena"; sleep 7000; - announce "The [" + getcastlename(strnpcinfo(NPC_NAME_HIDDEN)) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all|bc_woe; + announce "The [" + getcastlename(strnpcinfo(NPC_NAME_HIDDEN)) + "] castle has been conquered by the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all|bc_woe; end; // War of Emperium has ended. @@ -345,7 +345,7 @@ OnRecvCastle: cutin "kafra_01",2; if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[Kafra Employee]"; - mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member."; + mes "Welcome. ^ff0000" + getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Member."; mes "The Kafra Corporation will stay with you wherever you go."; next; switch (select("Use Storage", "Use Teleport Service", "Rent a Pushcart", "Cancel")) { @@ -458,7 +458,7 @@ OnRecvCastle: } } mes "[Kafra Employee]"; - mes "I am instructed to only offer my services to the ^ff0000"+getguildname(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; + mes "I am instructed to only offer my services to the ^ff0000"+getguildinfo(GUILDINFO_NAME, .@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; close2; cutin "",255; end; @@ -610,9 +610,9 @@ OnRecvCastle: mes "Brave soul... fate will guide you towards your future..."; close; } - if (getguildmaster(.@GID) != strcharinfo(PC_NAME)) { + if (getguildinfo(GUILDINFO_MASTER_NAME, .@GID) != strcharinfo(PC_NAME)) { mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; - mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildmaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; + mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildinfo(GUILDINFO_MASTER_NAME, .@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; close; } mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; diff --git a/npc/woe-fe/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt index 5c76ca483..829e500ec 100644 --- a/npc/woe-fe/aldeg_cas01.txt +++ b/npc/woe-fe/aldeg_cas01.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/aldeg_cas02.txt b/npc/woe-fe/aldeg_cas02.txt index e588909a1..c4399d9ec 100644 --- a/npc/woe-fe/aldeg_cas02.txt +++ b/npc/woe-fe/aldeg_cas02.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt index a0076bfec..d9abdf85f 100644 --- a/npc/woe-fe/aldeg_cas03.txt +++ b/npc/woe-fe/aldeg_cas03.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/aldeg_cas04.txt b/npc/woe-fe/aldeg_cas04.txt index f96586f48..8ced8e6e3 100644 --- a/npc/woe-fe/aldeg_cas04.txt +++ b/npc/woe-fe/aldeg_cas04.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/aldeg_cas05.txt b/npc/woe-fe/aldeg_cas05.txt index 79c5c77af..cf71dbe42 100644 --- a/npc/woe-fe/aldeg_cas05.txt +++ b/npc/woe-fe/aldeg_cas05.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/gefg_cas01.txt b/npc/woe-fe/gefg_cas01.txt index 364222781..ab27b812a 100644 --- a/npc/woe-fe/gefg_cas01.txt +++ b/npc/woe-fe/gefg_cas01.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/gefg_cas02.txt b/npc/woe-fe/gefg_cas02.txt index 5729b4033..791f09971 100644 --- a/npc/woe-fe/gefg_cas02.txt +++ b/npc/woe-fe/gefg_cas02.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt index d74692200..42f1a6c2a 100644 --- a/npc/woe-fe/gefg_cas03.txt +++ b/npc/woe-fe/gefg_cas03.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/gefg_cas04.txt b/npc/woe-fe/gefg_cas04.txt index 39141723f..245f24df3 100644 --- a/npc/woe-fe/gefg_cas04.txt +++ b/npc/woe-fe/gefg_cas04.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/gefg_cas05.txt b/npc/woe-fe/gefg_cas05.txt index caa9a10fc..54624bb2e 100644 --- a/npc/woe-fe/gefg_cas05.txt +++ b/npc/woe-fe/gefg_cas05.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/payg_cas01.txt b/npc/woe-fe/payg_cas01.txt index d06883620..19dd2437e 100644 --- a/npc/woe-fe/payg_cas01.txt +++ b/npc/woe-fe/payg_cas01.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/payg_cas02.txt b/npc/woe-fe/payg_cas02.txt index 9b5b97811..2648c1802 100644 --- a/npc/woe-fe/payg_cas02.txt +++ b/npc/woe-fe/payg_cas02.txt @@ -72,10 +72,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/payg_cas03.txt b/npc/woe-fe/payg_cas03.txt index 10b859c8f..81050aded 100644 --- a/npc/woe-fe/payg_cas03.txt +++ b/npc/woe-fe/payg_cas03.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/payg_cas04.txt b/npc/woe-fe/payg_cas04.txt index 46f4fbb6b..8eca38c38 100644 --- a/npc/woe-fe/payg_cas04.txt +++ b/npc/woe-fe/payg_cas04.txt @@ -72,10 +72,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/payg_cas05.txt b/npc/woe-fe/payg_cas05.txt index a2a35790a..d2cbe6253 100644 --- a/npc/woe-fe/payg_cas05.txt +++ b/npc/woe-fe/payg_cas05.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/prtg_cas01.txt b/npc/woe-fe/prtg_cas01.txt index 33a564fe9..ec9d544c9 100644 --- a/npc/woe-fe/prtg_cas01.txt +++ b/npc/woe-fe/prtg_cas01.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt index 6531b681f..fa4f6d555 100644 --- a/npc/woe-fe/prtg_cas02.txt +++ b/npc/woe-fe/prtg_cas02.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/prtg_cas03.txt b/npc/woe-fe/prtg_cas03.txt index 2a3879f65..2b72d0976 100644 --- a/npc/woe-fe/prtg_cas03.txt +++ b/npc/woe-fe/prtg_cas03.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/prtg_cas04.txt b/npc/woe-fe/prtg_cas04.txt index 3e0de365f..438b3a7a6 100644 --- a/npc/woe-fe/prtg_cas04.txt +++ b/npc/woe-fe/prtg_cas04.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/prtg_cas05.txt b/npc/woe-fe/prtg_cas05.txt index 56dc902a3..46fcccb1c 100644 --- a/npc/woe-fe/prtg_cas05.txt +++ b/npc/woe-fe/prtg_cas05.txt @@ -71,10 +71,10 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; + mes "the private prossession 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."; close; diff --git a/npc/woe-fe/trs_rp.txt b/npc/woe-fe/trs_rp.txt index 7a71c1bbe..775b0befd 100644 --- a/npc/woe-fe/trs_rp.txt +++ b/npc/woe-fe/trs_rp.txt @@ -39,7 +39,7 @@ end; OnTouch: // Store the Guild ID of castle occupant. .@GID = getcastledata(strnpcinfo(NPC_NAME_HIDDEN),1); - if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (compare(strnpcinfo(NPC_NAME_HIDDEN),"aldeg")) warp "aldebaran",143,112; else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gefg")) diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt index 41430f6a1..c0304ebb8 100644 --- a/npc/woe-se/agit_main_se.txt +++ b/npc/woe-se/agit_main_se.txt @@ -230,18 +230,18 @@ OnTreasureDied: mes("to conquer this stronghold?"); close; } - if (getcharid(CHAR_ID_GUILD) != .@GID || strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (getcharid(CHAR_ID_GUILD) != .@GID || strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes("[ Steward ]"); mes("Hmpf. Your threats don't"); mes("scare me! Guardians, drive"); mes("this infidel away from here!"); mes("I will always be loyal to the"); mes("master of this stronghold,"); - mesf("the one and only ^FF0000%s^000000.", getguildmaster(.@GID)); + mesf("the one and only ^FF0000%s^000000.", getguildinfo(GUILDINFO_MASTER_NAME, .@GID)); close; } mes("[ Steward ]"); - mesf("Ah, Master ^FF0000%s^000000...", getguildmaster(.@GID)); + mesf("Ah, Master ^FF0000%s^000000...", getguildinfo(GUILDINFO_MASTER_NAME, .@GID)); mes("How shall I serve you today?"); mes("Was there an aspect of this"); mes("stronghold's maintenance"); @@ -637,7 +637,7 @@ OnStartArena: // Disable Kafra disablenpc "Kafra Employee#"+strnpcinfo(NPC_NAME_HIDDEN); - announce "The ["+getguildname(.@GID)+"] guild conquered the ["+.@region$+" "+charat(strnpcinfo(NPC_NAME_HIDDEN),3)+"] stronghold of "+getcastlename(strnpcinfo(NPC_MAP))+"!",bc_all|bc_woe; + announce "The ["+getguildinfo(GUILDINFO_NAME, .@GID)+"] guild conquered the ["+.@region$+" "+charat(strnpcinfo(NPC_NAME_HIDDEN),3)+"] stronghold of "+getcastlename(strnpcinfo(NPC_MAP))+"!",bc_all|bc_woe; mapannounce strnpcinfo(NPC_MAP),"The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40; donpcevent "Manager#"+strnpcinfo(NPC_MAP)+"::OnReset"; maprespawnguildid strnpcinfo(NPC_MAP),getcastledata(strnpcinfo(NPC_MAP),1),2; @@ -664,7 +664,7 @@ OnStartArena: close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { mes(.@n$); mes("As guardian of this"); mes("stronghold, I answer only"); @@ -857,7 +857,7 @@ OnInit: if (getcharid(CHAR_ID_GUILD) == .@GID && getgdskilllv(.@GID,10001)) { mes("[Kafra Employee]"); mes("Welcome, proud member"); - mesf("of the ^FF0000%s^000000 Guild!", getguildname(.@GID)); + mesf("of the ^FF0000%s^000000 Guild!", getguildinfo(GUILDINFO_NAME, .@GID)); mes("The Kafra Corporation is ready"); mes("to assist you wherever you go!"); next; @@ -953,7 +953,7 @@ OnInit: mes("I'm sorry, but I've been"); mes("exclusively contracted"); mes("to the members of the"); - mesf("^FF0000%s^000000 Guild.", getguildname(.@GID)); + mesf("^FF0000%s^000000 Guild.", getguildinfo(GUILDINFO_NAME, .@GID)); mes("You'll have to ask another"); mes("Kafra Employee to help you..."); close2; @@ -1121,7 +1121,7 @@ OnEnable: .@num = atoi(charat(strnpcinfo(NPC_NAME_VISIBLE),15)); .@var$ = "$agit_"+strnpcinfo(NPC_NAME_HIDDEN); if (getcharid(CHAR_ID_GUILD) == .@GID) { - if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) { if (getd(.@var$+"["+(.@num+1)+"]") == 2) { mes("^3355FFDemolished Fortress"); mes("Gates can be repaired,"); @@ -1808,11 +1808,11 @@ function script ReturnFlag { mes("The Holy Kingdom of"); mesf("%s decrees that", .@str$); mes("this stronghold is owned"); - mesf("by the ^FF0000%s^000000 Guild.", getguildname(.@GID)); + mesf("by the ^FF0000%s^000000 Guild.", getguildinfo(GUILDINFO_NAME, .@GID)); next; mesf("[ %s Royal Edict ]", .@str$); - mesf("^FF0000%s^000000 is", getguildmaster(.@GID)); - mesf("Guild Master of ^FF0000%s^000000.", getguildname(.@GID)); + mesf("^FF0000%s^000000 is", getguildinfo(GUILDINFO_MASTER_NAME, .@GID)); + mesf("Guild Master of ^FF0000%s^000000.", getguildinfo(GUILDINFO_NAME, .@GID)); mes("Any that object must claim this"); mes("stronghold through strength of"); mes("steel and magic during the"); diff --git a/src/map/clif.c b/src/map/clif.c index 5c86edcaa..baa6d7462 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9354,7 +9354,7 @@ static void clif_pcname_ack(int fd, struct block_list *bl) const struct map_session_data *ssd = BL_UCCAST(BL_PC, bl); - if (ssd->fakename[0] != '\0' && ssd->disguise != -1) { + if (ssd->fakename[0] != '\0') { packet.packet_id = reqName; len = sizeof(struct packet_reqname_ack); } else { @@ -9367,7 +9367,7 @@ static void clif_pcname_ack(int fd, struct block_list *bl) packet.gid = -bl->id; } - if (ssd->fakename[0] != '\0' && ssd->disguise != -1) { + if (ssd->fakename[0] != '\0') { memcpy(packet.name, ssd->fakename, NAME_LENGTH); } else { #if PACKETVER_MAIN_NUM >= 20150225 || PACKETVER_RE_NUM >= 20141126 || defined(PACKETVER_ZERO) diff --git a/src/map/guild.c b/src/map/guild.c index dbfe03d3e..2fcbe02e7 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -278,7 +278,7 @@ static struct guild *guild_search(int guild_id) } /// lookup: guild name -> guild* -static struct guild *guild_searchname(char *str) +static struct guild *guild_searchname(const char *str) { struct guild* g; struct DBIterator *iter = db_iterator(guild->db); diff --git a/src/map/guild.h b/src/map/guild.h index 41f52711d..5a14b8a34 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -91,7 +91,7 @@ struct guild_interface { bool (*isallied) (int guild_id, int guild_id2); //Checks alliance based on guild Ids. [Skotlex] /* */ struct guild *(*search) (int guild_id); - struct guild *(*searchname) (char *str); + struct guild *(*searchname) (const char *str); struct guild_castle *(*castle_search) (int gcid); /* */ struct guild_castle *(*mapname2gc) (const char* mapname); diff --git a/src/map/script.c b/src/map/script.c index bd0fbb611..4c2761812 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8981,6 +8981,93 @@ static BUILDIN(getpartyleader) return true; } +enum guildinfo_type { + GUILDINFO_NAME, + GUILDINFO_ID, + GUILDINFO_LEVEL, + GUILDINFO_ONLINE, + GUILDINFO_AV_LEVEL, + GUILDINFO_MAX_MEMBERS, + GUILDINFO_EXP, + GUILDINFO_NEXT_EXP, + GUILDINFO_SKILL_POINTS, + GUILDINFO_MASTER_NAME, + GUILDINFO_MASTER_CID, +}; + +static BUILDIN(getguildinfo) +{ + struct guild *g = NULL; + + if (script_hasdata(st, 3)) { + if (script_isstringtype(st, 3)) { + const char *guild_name = script_getstr(st, 3); + g = guild->searchname(guild_name); + } else { + int guild_id = script_getnum(st, 3); + g = guild->search(guild_id); + } + } else { + struct map_session_data *sd = script->rid2sd(st); + g = sd ? sd->guild : NULL; + } + + enum guildinfo_type type = script_getnum(st, 2); + + if (g == NULL) { + // guild does not exist + switch (type) { + case GUILDINFO_NAME: + case GUILDINFO_MASTER_NAME: + script_pushconststr(st, ""); + break; + default: + script_pushint(st, -1); + } + } else { + switch (type) { + case GUILDINFO_NAME: + script_pushstrcopy(st, g->name); + break; + case GUILDINFO_ID: + script_pushint(st, g->guild_id); + break; + case GUILDINFO_LEVEL: + script_pushint(st, g->guild_lv); + break; + case GUILDINFO_ONLINE: + script_pushint(st, g->connect_member); + break; + case GUILDINFO_AV_LEVEL: + script_pushint(st, g->average_lv); + break; + case GUILDINFO_MAX_MEMBERS: + script_pushint(st, g->max_member); + break; + case GUILDINFO_EXP: + script_pushint(st, g->exp); + break; + case GUILDINFO_NEXT_EXP: + script_pushint(st, g->next_exp); + break; + case GUILDINFO_SKILL_POINTS: + script_pushint(st, g->skill_point); + break; + case GUILDINFO_MASTER_NAME: + script_pushstrcopy(st, g->member[0].name); + break; + case GUILDINFO_MASTER_CID: + script_pushint(st, g->member[0].char_id); + break; + default: + ShowError("script:getguildinfo: unknown info type!\n"); + st->state = END; + return false; + } + } + return true; +} + /*========================================== * Return the name of the @guild_id * null if not found @@ -15925,7 +16012,7 @@ static BUILDIN(recovery) return true; } -/* +/* * Get your current pet information */ static BUILDIN(getpetinfo) @@ -15978,7 +16065,7 @@ static BUILDIN(getpetinfo) case PETINFO_ACCESSORYFLAG: script_pushint(st, (pd->pet.equip != 0)? 1:0); break; - case PETINFO_EVO_EGGID: + case PETINFO_EVO_EGGID: if (VECTOR_DATA(pd->petDB->evolve_data) != NULL) script_pushint(st, VECTOR_DATA(pd->petDB->evolve_data)->petEggId); else @@ -24902,7 +24989,7 @@ static BUILDIN(showscript) if (script_hasdata(st, 4)) if (script_getnum(st, 4) == SELF) flag = SELF; - + clif->ShowScript(bl, msg, flag); return true; } @@ -25787,7 +25874,7 @@ static BUILDIN(identifyidx) script_pushint(st, false); return true; } - + if (sd->status.inventory[idx].nameid <= 0 || sd->status.inventory[idx].identify != 0) { script_pushint(st, false); return true; @@ -26089,10 +26176,11 @@ static void script_parse_builtin(void) BUILDIN_DEF(getpartyname,"i"), BUILDIN_DEF(getpartymember,"i?"), BUILDIN_DEF(getpartyleader,"i?"), - BUILDIN_DEF(getguildname,"i"), - BUILDIN_DEF(getguildmaster,"i"), - BUILDIN_DEF(getguildmasterid,"i"), + BUILDIN_DEF_DEPRECATED(getguildname,"i"), + BUILDIN_DEF_DEPRECATED(getguildmaster,"i"), + BUILDIN_DEF_DEPRECATED(getguildmasterid,"i"), BUILDIN_DEF(getguildmember,"i?"), + BUILDIN_DEF(getguildinfo,"i?"), BUILDIN_DEF(getguildonline, "i?"), BUILDIN_DEF(strcharinfo,"i??"), BUILDIN_DEF(strnpcinfo,"i??"), @@ -27208,6 +27296,19 @@ static void script_hardcoded_constants(void) script->set_constant("SIEGE_TYPE_SE", SIEGE_TYPE_SE, false, false); script->set_constant("SIEGE_TYPE_TE", SIEGE_TYPE_TE, false, false); + script->constdb_comment("guildinfo types"); + script->set_constant("GUILDINFO_NAME", GUILDINFO_NAME, false, false); + script->set_constant("GUILDINFO_ID", GUILDINFO_ID, false, false); + script->set_constant("GUILDINFO_LEVEL", GUILDINFO_LEVEL, false, false); + script->set_constant("GUILDINFO_ONLINE", GUILDINFO_ONLINE, false, false); + script->set_constant("GUILDINFO_AV_LEVEL", GUILDINFO_AV_LEVEL, false, false); + script->set_constant("GUILDINFO_MAX_MEMBERS", GUILDINFO_MAX_MEMBERS, false, false); + script->set_constant("GUILDINFO_EXP", GUILDINFO_EXP, false, false); + script->set_constant("GUILDINFO_NEXT_EXP", GUILDINFO_NEXT_EXP, false, false); + script->set_constant("GUILDINFO_SKILL_POINTS", GUILDINFO_SKILL_POINTS, false, false); + script->set_constant("GUILDINFO_MASTER_NAME", GUILDINFO_MASTER_NAME, false, false); + script->set_constant("GUILDINFO_MASTER_CID", GUILDINFO_MASTER_CID, false, false); + script->constdb_comment("Renewal"); #ifdef RENEWAL script->set_constant("RENEWAL", 1, false, false); diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index c6af15643..3233916dd 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -2950,8 +2950,8 @@ typedef bool (*HPMHOOK_pre_guild_isallied) (int *guild_id, int *guild_id2); typedef bool (*HPMHOOK_post_guild_isallied) (bool retVal___, int guild_id, int guild_id2); typedef struct guild* (*HPMHOOK_pre_guild_search) (int *guild_id); typedef struct guild* (*HPMHOOK_post_guild_search) (struct guild* retVal___, int guild_id); -typedef struct guild* (*HPMHOOK_pre_guild_searchname) (char **str); -typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, char *str); +typedef struct guild* (*HPMHOOK_pre_guild_searchname) (const char **str); +typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, const char *str); typedef struct guild_castle* (*HPMHOOK_pre_guild_castle_search) (int *gcid); typedef struct guild_castle* (*HPMHOOK_post_guild_castle_search) (struct guild_castle* retVal___, int gcid); typedef struct guild_castle* (*HPMHOOK_pre_guild_mapname2gc) (const char **mapname); diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index d11022aa6..90b07c4e5 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -32850,11 +32850,11 @@ struct guild* HP_guild_search(int guild_id) { } return retVal___; } -struct guild* HP_guild_searchname(char *str) { +struct guild* HP_guild_searchname(const char *str) { int hIndex = 0; struct guild* retVal___ = NULL; if (HPMHooks.count.HP_guild_searchname_pre > 0) { - struct guild* (*preHookFunc) (char **str); + struct guild* (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_searchname_pre[hIndex].func; @@ -32869,7 +32869,7 @@ struct guild* HP_guild_searchname(char *str) { retVal___ = HPMHooks.source.guild.searchname(str); } if (HPMHooks.count.HP_guild_searchname_post > 0) { - struct guild* (*postHookFunc) (struct guild* retVal___, char *str); + struct guild* (*postHookFunc) (struct guild* retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_searchname_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); |