diff options
| author | Haru <haru@dotalux.com> | 2019-11-17 15:53:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 15:53:05 +0100 |
| commit | d92a4cdd378ab3c952f2419c46cd645348e1c61f (patch) | |
| tree | cdeea33ba7d1ce3672f44c772bc0b853b21da02e /npc/custom | |
| parent | 16f3d5e12cdf28c5209af7ce74d1dfe4614deb00 (diff) | |
| parent | 50f7cd8138cafc307b51d5c1f02c7f2893d2a0c5 (diff) | |
| download | hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.gz hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.bz2 hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.xz hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.zip | |
Merge pull request #2566 from Helianthella/guild
add getguildinfo()
Diffstat (limited to 'npc/custom')
| -rw-r--r-- | npc/custom/etc/quest_warper.txt | 2 | ||||
| -rw-r--r-- | npc/custom/itembind.txt | 4 | ||||
| -rw-r--r-- | npc/custom/woe_controller.txt | 4 |
3 files changed, 5 insertions, 5 deletions
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 " "; } |