summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/pre-re/quests/quests_payon.txt35
-rw-r--r--npc/pre-re/scripts.conf1
-rw-r--r--npc/quests/quests_payon.txt2
-rw-r--r--npc/re/cities/brasilis.txt2
-rw-r--r--npc/re/quests/quests_payon.txt35
-rw-r--r--npc/re/scripts.conf1
-rw-r--r--npc/warps/cities/lighthalzen.txt2
-rw-r--r--npc/warps/cities/yuno.txt9
8 files changed, 82 insertions, 5 deletions
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/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/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/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