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/re | |
| 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/re')
| -rw-r--r-- | npc/re/woe-fe/invest_main.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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]; |