diff options
Diffstat (limited to 'npc/re')
| -rw-r--r-- | npc/re/cities/brasilis.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_payon.txt | 35 | ||||
| -rw-r--r-- | npc/re/scripts.conf | 1 | ||||
| -rw-r--r-- | npc/re/woe-fe/invest_main.txt | 4 |
4 files changed, 39 insertions, 3 deletions
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]; |