Skip to content

Update NPC locations #2542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MishimaHaruna merged 4 commits into from
Nov 17, 2019
Merged

Update NPC locations #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dbda3e
Update Yuno Portals
Emistry Oct 2, 2019
8208324
Update Brasilis Sign Post location
Emistry Oct 2, 2019
543b923
Update Young Man NPC location
Emistry Oct 2, 2019
4a2f4bd
Add missing Portal of Yuno and Lighthalzen
Emistry Nov 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions npc/pre-re/quests/quests_payon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions npc/pre-re/scripts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
2 changes: 1 addition & 1 deletion npc/quests/quests_payon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion npc/re/cities/brasilis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
35 changes: 35 additions & 0 deletions npc/re/quests/quests_payon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions npc/re/scripts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
2 changes: 2 additions & 0 deletions npc/warps/cities/lighthalzen.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 6 additions & 3 deletions npc/warps/cities/yuno.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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