summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-22 00:09:28 +0100
committerHaru <haru@dotalux.com>2016-02-22 00:09:28 +0100
commit540b4b0a29cbfbab4df73e4be4f86d9024a48959 (patch)
tree632f5197870f8d2e5f973010564893bc02e691a4
parent3023f509a563f65f624248c5b233472e519c4d10 (diff)
parent2824860863d78bcf02954e86a1e6540d125910b1 (diff)
downloadhercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.gz
hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.bz2
hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.xz
hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.zip
Merge branch 'Jedzkie-NPC_Updates' into hercules
Closes #1062 as merged
-rw-r--r--npc/cities/payon.txt4
-rw-r--r--npc/jobs/1-1e/taekwon.txt6
-rw-r--r--npc/merchants/refine.txt8
-rw-r--r--npc/merchants/shops.txt164
-rw-r--r--npc/pre-re/guides/guides_payon.txt6
-rw-r--r--npc/pre-re/jobs/1-1e/taekwon.txt34
-rw-r--r--npc/pre-re/merchants/shops.txt167
-rw-r--r--npc/quests/quests_payon.txt6
-rw-r--r--npc/re/guides/guides_payon.txt6
-rw-r--r--npc/re/jobs/1-1e/taekwon.txt34
-rw-r--r--npc/re/merchants/ammo_boxes.txt10
-rw-r--r--npc/re/merchants/ammo_dealer.txt10
-rw-r--r--npc/re/merchants/shops.txt239
-rw-r--r--npc/warps/cities/payon.txt87
14 files changed, 535 insertions, 246 deletions
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 03ddba417..468fb9811 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -37,7 +37,7 @@
//================= Description ===========================================
//= Payon City Npcs
//================= Current Version =======================================
-//= 2.1c
+//= 2.1.1
//=========================================================================
//== Payon =================================================
@@ -90,7 +90,7 @@ payon,134,211,4 script Young Man#payon 1_M_ORIENT01,{
close;
}
-payon,173,82,0 script Young Man#2payon 4_M_ORIENT01,{
+payon,176,85,0 script Young Man#2payon 4_M_ORIENT01,{
mes "[Young Man]";
mes "I remember the story my dearly departed grandfather has told me.";
next;
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 0f8c86362..60853001f 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) L0ne_W0lf
//= Copyright (C) Kisuka
//= Copyright (C) Samuray22
@@ -32,10 +32,10 @@
//================= Description ===========================================
//= Official iRO TaeKwon Job Change Quest
//================= Current Version =======================================
-//= 1.4
+//= 1.5
//=========================================================================
-payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
+- script Phoenix::TKJobChange FAKE_NPC,{
if(Upper == 2) {
mes "[Phoenix]";
mes "Hello, child.";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 9fb1d70c3..7f1b4d9a3 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//= Copyright (C) Masao
//= Copyright (C) Xantara
@@ -50,7 +50,7 @@
//================= Description ===========================================
//= Refining NPCs and Metal Salesmen.
//================= Current Version =======================================
-//= 3.3
+//= 3.3.2
//=========================================================================
//== Christopher: Geffen Blacksmith ========================
@@ -1101,7 +1101,7 @@ moc_ruins,107,94,4 script Repairman#moc 4W_M_03,{
end;
}
-payon,143,165,4 script Repairman#pay 4_M_ORIENT01,{
+payon,143,165,0 script Repairman#pay 4_M_ORIENT01,{
callfunc "repairmain","Repairman";
end;
}
@@ -1116,7 +1116,7 @@ yuno_in01,175,28,3 script Repairman#juno 4_M_04,{
end;
}
-geffen_in,34,166,3 script Repairman#gef 4W_M_03,{
+geffen_in,34,166,3 script Repairman#gef 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index d2745217d..d4b623031 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Yommy
//= Copyright (C) Streusel
//= Copyright (C) Euphy
@@ -46,46 +46,16 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.6
+//= 3.9
//=========================================================================
//== Alberta ===============================================
-alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{
-OnInit:
- sellitem Arrow;
- sellitem Silver_Arrow;
- sellitem Fire_Arrow;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
-}
-
alberta_in,165,96,0 trader Item Collector#alb 1_F_MERCHANT_02,{
OnInit:
sellitem Scell;
sellitem Monster's_Feed;
}
-alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Spinning_Eyes;
-}
-
alberta_in,180,15,0 trader Armor Dealer#alb 4W_F_01,{
OnInit:
sellitem Guard;
@@ -138,21 +108,6 @@ OnInit:
sellitem Cinquedea;
}
-alberta_in,176,81,3 trader Trading Merchant#alb 4_M_HUMERCHANT,{
-OnInit:
- sellitem Bullet;
- sellitem Silver_Bullet;
- sellitem Shell_Of_Blood;
- sellitem Branch;
- sellitem Crimson_Bolt;
- sellitem The_Cyclone;
- sellitem Rolling_Stone;
- sellitem Black_Rose;
- sellitem Long_Barrel;
- sellitem Jungle_Carbine;
- sellitem Thunder_P;
-}
-
//== Aldebaran =============================================
aldeba_in,20,60,0 trader Armor Dealer#alde 4W_F_01,{
OnInit:
@@ -655,22 +610,6 @@ OnInit:
sellitem Zargon;
}
-geffen_in,77,167,0 trader Tool Dealer#gef 1_F_03,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Granpa_Beard;
-}
-
geffen_in,77,173,0 trader Magical Item Seller#gef 1_M_WIZARD,{
OnInit:
sellitem Blue_Gemstone;
@@ -683,24 +622,6 @@ OnInit:
sellitem Silver_Robe;
}
-geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{
-OnInit:
- sellitem Empty_Cylinder;
- sellitem Empty_Potion;
-}
-
-geffen,193,152,4 trader Pet Groomer#gef 4_F_TELEPORTER,{
-OnInit:
- sellitem Pet_Food;
- sellitem Pet_Incubator;
- sellitem Backpack;
- sellitem Rocker_Glasses;
- sellitem Mojji;
- sellitem Vital_Flower_;
- sellitem Flame_Gemstone;
- sellitem Bun_;
-}
-
//== Kunlun ================================================
gonryun,147,84,5 trader Tool Dealer#gon 4_M_TWOLDMAN,{
OnInit:
@@ -1544,72 +1465,6 @@ OnInit:
sellitem Novice_Armlet;
}
-payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Booby_Trap;
-}
-
-payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{
-OnInit:
- sellitem Arrow;
- sellitem Silver_Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Booby_Trap;
-}
-
-payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{
-OnInit:
- sellitem Arrow;
- sellitem Red_Potion;
- sellitem Center_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
-}
-
-payon,177,131,4 trader Pet Groomer#pay 4_F_TELEPORTER,{
-OnInit:
- sellitem Pet_Food;
- sellitem Pet_Incubator;
- sellitem Backpack;
- sellitem Rocker_Glasses;
- sellitem Mojji;
- sellitem Flame_Gemstone;
- sellitem Vital_Flower_;
- sellitem Vital_Flower;
- sellitem Bun_;
- sellitem Damp_Darkness;
- sellitem Small_Snow_Flower;
- sellitem Fresh_Plant;
- sellitem Big_Cell;
- sellitem Apple_Pudding;
- sellitem Mystic_Stone;
- sellitem Flavored_Alcohol;
- sellitem Grilled_Rice_Cake;
- sellitem Fish_With_Blue_Back;
- sellitem Pumpkin_Pie_;
- sellitem Traditional_Cookie;
-}
-
//== Prontera ==============================================
prontera,73,134,0 trader Vendor from Milk Ranch#p 4_F_01,{
OnInit:
@@ -1938,21 +1793,6 @@ OnInit:
}
//== Cooking Addition ======================================
-payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{
-OnInit:
- sellitem Hot_Sauce;
-}
-
-geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
-OnInit:
- sellitem Pot;
-}
-
-alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{
-OnInit:
- sellitem Delicious_Fish;
-}
-
aldebaran,165,107,2 trader Chef Assistant#alde 4W_M_01,{
OnInit:
sellitem Red_Spice;
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index 1d583eac8..955497cf8 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Silent
//= Copyright (C) erKURITA
//= Copyright (C) MasterOfMuppets
@@ -35,10 +35,10 @@
//================= Description ===========================================
//= Guides for the City of Payon
//================= Current Version =======================================
-//= 1.6
+//= 1.6.1
//=========================================================================
-payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{
+payon,160,67,4 script Guide#pay 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to the";
diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt
new file mode 100644
index 000000000..3e9814dee
--- /dev/null
+++ b/npc/pre-re/jobs/1-1e/taekwon.txt
@@ -0,0 +1,34 @@
+//================= Hercules Script =======================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2012-2016 Hercules Dev Team
+//=
+//= 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/>.
+//=========================================================================
+//= Taekwon Job Quest (Pre-Renewal)
+//================= Description ===========================================
+//= Official TaeKwon Job Change Quest
+//================= Current Version =======================================
+//= 1.0
+//=========================================================================
+
+payon,157,141,5 duplicate(Pheonix) Phoenix#TKJobChangePRE 4_M_MONK
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 4abe887a6..f5dd954f8 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Frost
//= Copyright (C) Streusel
//= Copyright (C) Daegaladh
@@ -31,7 +31,7 @@
//================= Description ===========================================
//= Pre-renewal-specific town shop NPCs.
//================= Current Version =======================================
-//= 1.4
+//= 1.7
//=========================================================================
//== Prontera ==============================================
@@ -195,6 +195,154 @@ OnInit:
sellitem Bun_;
}
+//== Geffen ================================================
+geffen_in,77,167,0 trader Tool Dealer#gef 1_F_03,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Green_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Granpa_Beard;
+}
+
+geffen,193,152,4 trader Pet Groomer#gef 4_F_TELEPORTER,{
+OnInit:
+ sellitem Pet_Food;
+ sellitem Pet_Incubator;
+ sellitem Backpack;
+ sellitem Rocker_Glasses;
+ sellitem Mojji;
+ sellitem Vital_Flower_;
+ sellitem Flame_Gemstone;
+ sellitem Bun_;
+}
+
+geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{
+OnInit:
+ sellitem Empty_Cylinder;
+ sellitem Empty_Potion;
+}
+
+//== Payon =================================================
+payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Green_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Booby_Trap;
+}
+
+payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Green_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Booby_Trap;
+}
+
+payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Red_Potion;
+ sellitem Center_Potion;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+}
+
+payon,177,131,4 trader Pet Groomer#pay 4_F_TELEPORTER,{
+OnInit:
+ sellitem Pet_Food;
+ sellitem Pet_Incubator;
+ sellitem Backpack;
+ sellitem Rocker_Glasses;
+ sellitem Mojji;
+ sellitem Flame_Gemstone;
+ sellitem Vital_Flower_;
+ sellitem Vital_Flower;
+ sellitem Bun_;
+ sellitem Damp_Darkness;
+ sellitem Small_Snow_Flower;
+ sellitem Fresh_Plant;
+ sellitem Big_Cell;
+ sellitem Apple_Pudding;
+ sellitem Mystic_Stone;
+ sellitem Flavored_Alcohol;
+ sellitem Grilled_Rice_Cake;
+ sellitem Fish_With_Blue_Back;
+ sellitem Pumpkin_Pie_;
+ sellitem Traditional_Cookie;
+}
+
+//== Alberta ===============================================
+alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Fire_Arrow;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Green_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+}
+
+alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Green_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Spinning_Eyes;
+}
+
+alberta_in,176,81,3 trader Trading Merchant#alb 4_M_HUMERCHANT,{
+OnInit:
+ sellitem Bullet;
+ sellitem Silver_Bullet;
+ sellitem Shell_Of_Blood;
+ sellitem Branch;
+ sellitem Crimson_Bolt;
+ sellitem The_Cyclone;
+ sellitem Rolling_Stone;
+ sellitem Black_Rose;
+ sellitem Long_Barrel;
+ sellitem Jungle_Carbine;
+ sellitem Thunder_P;
+}
+
//== Cooking Addition ======================================
prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{
OnInit:
@@ -212,3 +360,18 @@ OnInit:
sellitem Red_Spice;
sellitem Yellow_Spice;
}
+
+geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
+OnInit:
+ sellitem Pot;
+}
+
+alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{
+OnInit:
+ sellitem Delicious_Fish;
+}
+
+payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{
+OnInit:
+ sellitem Hot_Sauce;
+}
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index f82e331ca..282bd2eb3 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) L0ne_W0lf
//= Copyright (C) Samuray22
//= Copyright (C) Silent
@@ -33,7 +33,7 @@
//================= Description ===========================================
//= Pretend Murder, Ear Muffs, Oxygen, Derivuchi Cap, Helm of Angel Quests.
//================= Current Version =======================================
-//= 1.7
+//= 1.7.1
//=========================================================================
//== 'Pretend Murdered' Quest ==============================
@@ -229,7 +229,7 @@ payon_in02,25,71,4 script Boy 4_M_04,{
}
//== 'Helm of Angel' and 'Deviruchi Cap' Quest =============
-payon_in01,56,12,7 script Young man#12 4_M_ORIENT02,{
+payon_in01,46,21,5 script Young man#12 4_M_ORIENT02,{
mes "[Young man]";
mes "...What is it?";
next;
diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt
index 66fce60b3..dfbdd6403 100644
--- a/npc/re/guides/guides_payon.txt
+++ b/npc/re/guides/guides_payon.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//= Copyright (C) L0ne_W0lf
//=
@@ -30,10 +30,10 @@
//================= Description ===========================================
//= Guides for the city of Payon.
//================= Current Version =======================================
-//= 1.2
+//= 1.2.1
//=========================================================================
-payon,163,64,3 script Guide#01payon::GuidePayon 4_M_PAY_SOLDIER,{
+payon,160,67,3 script Guide#01payon::GuidePayon 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to ^8B4513Payon^000000,";
diff --git a/npc/re/jobs/1-1e/taekwon.txt b/npc/re/jobs/1-1e/taekwon.txt
new file mode 100644
index 000000000..d4f512a94
--- /dev/null
+++ b/npc/re/jobs/1-1e/taekwon.txt
@@ -0,0 +1,34 @@
+//================= Hercules Script =======================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2012-2016 Hercules Dev Team
+//=
+//= 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/>.
+//=========================================================================
+//= Taekwon Job Quest (Renewal)
+//================= Description ===========================================
+//= Official TaeKwon Job Change Quest
+//================= Current Version =======================================
+//= 1.0
+//=========================================================================
+
+payon_in01,62,10,5 duplicate(Pheonix) Phoenix#TKJobChangeRE 4_M_MONK
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt
index 22f6d694b..a8a04d976 100644
--- a/npc/re/merchants/ammo_boxes.txt
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//=
//= Hercules is free software: you can redistribute it and/or modify
@@ -29,12 +29,8 @@
//================= Description ===========================================
//= Turns bullets into magazines/packs.
//================= Current Version =======================================
-//= 1.1
+//= 1.2
//=========================================================================
que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 4_M_01
-izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
-izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 4_M_01
-izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 4_M_01
-izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 4_M_01
-izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 4_M_01
+izlude_in,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt
index 87d641910..6b273371d 100644
--- a/npc/re/merchants/ammo_dealer.txt
+++ b/npc/re/merchants/ammo_dealer.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//=
//= Hercules is free software: you can redistribute it and/or modify
@@ -29,12 +29,8 @@
//================= Description ===========================================
//= Bullet trader.
//================= Current Version =======================================
-//= 1.1
+//= 1.2
//=========================================================================
que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 4_M_04
-izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 //Official: (74,106) -> in the water
-izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 4_M_04
-izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 4_M_04
-izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 4_M_04
-izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 4_M_04
+izlude_in,74,106,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 773fddef8..54155e8c4 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Frost
//= Copyright (C) rAthena Dev Team
//= Copyright (C) Lemongrass
@@ -36,7 +36,7 @@
//================= Description ===========================================
//= Renewal-specific town shop NPCs.
//================= Current Version =======================================
-//= 2.1
+//= 2.4
//=========================================================================
//== Comodo ================================================
@@ -192,10 +192,22 @@ OnInit:
sellitem Pet_Incubator;
sellitem Backpack;
sellitem Rocker_Glasses;
- sellitem Mojji;
sellitem Vital_Flower_;
sellitem Flame_Gemstone;
sellitem Bun_;
+ sellitem Vital_Flower;
+ sellitem Damp_Darkness;
+ sellitem Small_Snow_Flower;
+ sellitem Fresh_Plant;
+ sellitem Big_Cell;
+ sellitem Apple_Pudding;
+ sellitem Mystic_Stone;
+ sellitem Flavored_Alcohol;
+ sellitem Spirit_Liquor;
+ sellitem Pumpkin_Pie_;
+ sellitem Sunset_On_The_Rock;
+ sellitem Morning_Dew;
+ sellitem Grilled_Rice_Cake;
}
izlude_in,57,110,0 trader Tool Dealer#iz 1_M_01,{
@@ -205,16 +217,16 @@ OnInit:
sellitem Orange_Potion;
sellitem Yellow_Potion;
sellitem White_Potion;
- sellitem Green_Potion;
sellitem Center_Potion;
sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
sellitem Wing_Of_Fly;
sellitem Wing_Of_Butterfly;
sellitem Booby_Trap;
sellitem Arrow;
}
-izlude_in,72,102,3 trader Trading Merchant#iz 4_M_HUMERCHANT,{
+izlude_in,72,110,3 trader Trading Merchant#iz 4_M_HUMERCHANT,{
OnInit:
sellitem Bullet;
sellitem Silver_Bullet;
@@ -744,6 +756,166 @@ OnInit:
sellitem Flower_Ring;
}
+//== Geffen ================================================
+geffen_in,77,167,0 trader Tool Dealer#gef 1_F_03,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+}
+
+geffen,193,152,4 trader Pet Groomer#gef 4_F_TELEPORTER,{
+OnInit:
+ sellitem Pet_Food;
+ sellitem Pet_Incubator;
+ sellitem Backpack;
+ sellitem Rocker_Glasses;
+ sellitem Vital_Flower_;
+ sellitem Flame_Gemstone;
+ sellitem Bun_;
+ sellitem Vital_Flower;
+ sellitem Damp_Darkness;
+ sellitem Small_Snow_Flower;
+ sellitem Fresh_Plant;
+ sellitem Big_Cell;
+ sellitem Apple_Pudding;
+ sellitem Mystic_Stone;
+ sellitem Flavored_Alcohol;
+ sellitem Spirit_Liquor;
+ sellitem Pumpkin_Pie_;
+ sellitem Sunset_On_The_Rock;
+ sellitem Morning_Dew;
+ sellitem Grilled_Rice_Cake;
+}
+
+geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{
+OnInit:
+ sellitem Empty_Cylinder;
+ sellitem Empty_Potion;
+ sellitem Empty_Bottle;
+}
+
+//== Alberta ===============================================
+alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Fire_Arrow;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+}
+
+alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+}
+
+alberta_in,176,81,3 trader Trading Merchant#alb 4_M_HUMERCHANT,{
+OnInit:
+ sellitem Bullet;
+ sellitem Silver_Bullet_;
+ sellitem Shell_Of_Blood_;
+ sellitem Branch;
+ sellitem Crimson_Bolt;
+ sellitem The_Cyclone;
+ sellitem Rolling_Stone;
+ sellitem Black_Rose;
+ sellitem Long_Barrel;
+ sellitem Jungle_Carbine;
+ sellitem Thunder_P;
+}
+
+//== Payon =================================================
+payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Red_Potion;
+ sellitem Center_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+}
+
+payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Booby_Trap;
+}
+
+payon,177,131,4 trader Pet Groomer#pay 4_F_TELEPORTER,{
+OnInit:
+ sellitem Pet_Food;
+ sellitem Pet_Incubator;
+ sellitem Backpack;
+ sellitem Rocker_Glasses;
+ sellitem Vital_Flower_;
+ sellitem Flame_Gemstone;
+ sellitem Bun_;
+ sellitem Vital_Flower;
+ sellitem Damp_Darkness;
+ sellitem Small_Snow_Flower;
+ sellitem Fresh_Plant;
+ sellitem Big_Cell;
+ sellitem Apple_Pudding;
+ sellitem Mystic_Stone;
+ sellitem Flavored_Alcohol;
+ sellitem Spirit_Liquor;
+ sellitem Pumpkin_Pie_;
+ sellitem Sunset_On_The_Rock;
+ sellitem Morning_Dew;
+ sellitem Grilled_Rice_Cake;
+}
+
+payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Spectacles;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+ sellitem Booby_Trap;
+}
+
//== Rachel ================================================
ra_in01,263,281,4 trader Trap Specialist#ra 1_F_01,{
OnInit:
@@ -826,3 +998,60 @@ OnInit:
sellitem Indoor_Cooking_Kits;
sellitem High_end_Cooking_Kits;
}
+
+geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
+OnInit:
+ sellitem Combination_Kit;
+ sellitem Mushroom;
+ sellitem Pot;
+ sellitem Bread;
+ sellitem Grain;
+ sellitem Cooking_Oil;
+ sellitem Plain_Sauce;
+ sellitem Hot_Sauce;
+ sellitem Sweet_Sauce;
+ sellitem Red_Spice;
+ sellitem Yellow_Spice;
+ sellitem Delicious_Fish;
+ sellitem Outdoor_Cooking_Kits;
+ sellitem Indoor_Cooking_Kits;
+ sellitem High_end_Cooking_Kits;
+}
+
+alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{
+OnInit:
+ sellitem Combination_Kit;
+ sellitem Mushroom;
+ sellitem Pot;
+ sellitem Bread;
+ sellitem Grain;
+ sellitem Cooking_Oil;
+ sellitem Plain_Sauce;
+ sellitem Hot_Sauce;
+ sellitem Sweet_Sauce;
+ sellitem Red_Spice;
+ sellitem Yellow_Spice;
+ sellitem Delicious_Fish;
+ sellitem Outdoor_Cooking_Kits;
+ sellitem Indoor_Cooking_Kits;
+ sellitem High_end_Cooking_Kits;
+}
+
+payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{
+OnInit:
+ sellitem Combination_Kit;
+ sellitem Mushroom;
+ sellitem Pot;
+ sellitem Bread;
+ sellitem Grain;
+ sellitem Cooking_Oil;
+ sellitem Plain_Sauce;
+ sellitem Hot_Sauce;
+ sellitem Sweet_Sauce;
+ sellitem Red_Spice;
+ sellitem Yellow_Spice;
+ sellitem Delicious_Fish;
+ sellitem Outdoor_Cooking_Kits;
+ sellitem Indoor_Cooking_Kits;
+ sellitem High_end_Cooking_Kits;
+}
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
index 5ee540568..a87fd0062 100644
--- a/npc/warps/cities/payon.txt
+++ b/npc/warps/cities/payon.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Masao
//= Copyright (C) L0ne_W0lf
//= Copyright (C) MasterOfMuppets
@@ -35,39 +35,39 @@
//================= Description ===========================================
//= Warp Points for Payon Town
//================= Current Version =======================================
-//= 1.7
+//= 1.7.1
//=========================================================================
// == Official Warps From kRO Screenshots ==
// -- Entrance / Exit --
payon,122,27,0 warp payonwarp003 5,3,pay_fild01,333,356
-pay_fild01,333,360,0 warp payonwarp004 5,3,payon,122,31
+pay_fild01,333,361,0 warp payonwarp004 5,3,payon,122,31
payon,267,89,0 warp payonwarp005 1,1,pay_fild08,20,74
-payon,228,330,0 warp payonwarp007 4,2,pay_arche,81,22
-pay_arche,81,18,0 warp payonwarp008 5,2,payon,228,326
+payon,228,329,0 warp payonwarp007 4,2,pay_arche,81,22
+pay_arche,81,17,0 warp payonwarp008 5,2,payon,228,326
// -- Inn --
payon,223,117,0 warp payonwarp009 2,2,payon_in01,175,11
-payon_in01,172,11,0 warp payonwarp010 2,2,payon,219,117
+payon_in01,172,11,0 warp payonwarp010 2,2,payon,220,117
payon_in01,180,43,0 warp payonwarp011 2,2,payon_in01,181,73
-payon_in01,181,70,0 warp payonwarp012 2,2,payon_in01,180,40
+payon_in01,180,70,0 warp payonwarp012 2,2,payon_in01,181,40
payon_in01,193,92,0 warp payonwarp013 2,2,payon_in01,143,61
payon_in01,146,61,0 warp payonwarp014 2,2,payon_in01,193,89
payon_in01,133,42,0 warp payonwarp015 2,2,payon_in01,133,18
payon_in01,133,21,0 warp payonwarp016 2,2,payon_in01,133,45
// -- Sort of Mill --
-payon,140,85,0 warp payonwarp017 2,2,payon_in01,14,51
-payon_in01,17,51,0 warp payonwarp018 2,2,payon,143,85
+payon,141,85,0 warp payonwarp017 2,2,payon_in01,14,51
+payon_in01,17,51,0 warp payonwarp018 2,2,payon,144,85
payon_in01,10,59,0 warp payonwarp019 2,2,payon_in01,10,83
payon_in01,10,80,0 warp payonwarp021 2,2,payon_in01,10,56
payon_in01,10,38,0 warp payonwarp022 2,2,payon_in01,10,14
payon_in01,10,17,0 warp payonwarp023 2,2,payon_in01,10,41
// -- Weaponshop --
-payon,135,158,0 warp payonwarp024 2,2,payon_in01,20,129
-payon_in01,23,129,0 warp payonwarp025 2,2,payon,138,158
+payon,136,158,0 warp payonwarp024 2,2,payon_in01,20,129
+payon_in01,23,129,0 warp payonwarp025 2,2,payon,139,158
payon,130,169,0 warp payonwarp026 2,2,payon_in01,13,136
payon_in01,13,139,0 warp payonwarp027 2,2,payon,130,172
@@ -76,8 +76,8 @@ payon,151,127,0 warp payonwarp028 2,2,payon_in01,56,53
payon_in01,56,50,0 warp payonwarp029 2,2,payon,151,124
// -- Middle Castle --
-payon,155,248,0 warp payonwarp030 4,1,payon_in03,98,117
-payon_in03,98,114,0 warp payonwarp031 5,1,payon,155,245
+payon,156,247,0 warp payonwarp030 4,1,payon_in03,98,117
+payon_in03,98,114,0 warp payonwarp031 5,1,payon,156,244
payon_in03,90,124,0 warp payonwarp032 2,2,payon_in03,80,124
payon_in03,83,124,0 warp payonwarp033 2,2,payon_in03,93,124
payon_in03,99,133,0 warp payonwarp034 2,2,payon_in03,99,151
@@ -114,43 +114,40 @@ payon_in02,70,33,0 warp payonwarp058 2,2,payon_in02,58,33
payon_in02,75,67,0 warp payonwarp059 2,2,payon_in02,13,25
payon_in02,82,45,0 warp payonwarp060 2,2,pay_arche,74,153
-
-// == Self Made Warps, No Screen Availble ==
-
// -- Large West House --
-payon,127,204,0 warp payonwarp061 2,2,payon_in03,81,19
-payon_in03,85,19,0 warp payonwarp062 2,2,payon,131,204
-payon_in03,74,18,0 warp payonwarp063 2,2,payon_in03,62,18
-payon_in03,67,18,0 warp payonwarp064 2,2,payon_in03,78,18
-payon_in03,46,18,0 warp payonwarp065 2,2,payon_in03,35,18
-payon_in03,39,18,0 warp payonwarp066 2,2,payon_in03,51,18
-payon_in03,28,18,0 warp payonwarp067 2,2,payon_in03,17,18
-payon_in03,21,18,0 warp payonwarp068 2,2,payon_in03,32,18
+payon,127,204,0 warp payonwarp061 2,2,payon_in03,82,19
+payon_in03,85,19,0 warp payonwarp062 2,2,payon,130,204
+payon_in03,74,19,0 warp payonwarp063 2,2,payon_in03,64,19
+payon_in03,67,19,0 warp payonwarp064 2,2,payon_in03,77,19
+payon_in03,46,19,0 warp payonwarp065 2,2,payon_in03,36,19
+payon_in03,39,19,0 warp payonwarp066 2,2,payon_in03,49,19
+payon_in03,28,19,0 warp payonwarp067 2,2,payon_in03,18,19
+payon_in03,21,19,0 warp payonwarp068 2,2,payon_in03,31,19
// -- Big Kitchen --
-payon,155,327,0 warp payonwarp069 2,2,payon_in03,165,143
-payon_in03,165,140,0 warp payonwarp070 2,2,payon,155,324
-payon_in03,185,178,0 warp payonwarp071 2,2,payon_in03,185,149
-payon_in03,185,153,0 warp payonwarp072 2,2,payon_in03,185,182
+payon,155,328,0 warp payonwarp069 2,2,payon_in03,165,143
+payon_in03,165,140,0 warp payonwarp070 2,2,payon,155,325
+payon_in03,186,178,0 warp payonwarp071 2,2,payon_in03,186,150
+payon_in03,186,153,0 warp payonwarp072 2,2,payon_in03,186,181
// -- Upper Castle --
-payon,107,327,0 warp payonwarp073 2,2,payon_in03,19,64
-payon_in03,19,60,0 warp payonwarp074 2,2,payon,107,323
-payon_in03,19,73,0 warp payonwarp075 2,2,payon_in03,19,90
-payon_in03,19,86,0 warp payonwarp076 2,2,payon_in03,19,69
-payon_in03,19,103,0 warp payonwarp077 2,2,payon_in03,19,122
-payon_in03,19,118,0 warp payonwarp078 2,2,payon_in03,19,99
-payon_in03,11,131,0 warp payonwarp079 2,2,payon_in03,11,146
-payon_in03,11,142,0 warp payonwarp080 2,2,payon_in03,11,127
-payon_in03,27,131,0 warp payonwarp081 2,2,payon_in03,27,146
-payon_in03,27,142,0 warp payonwarp082 2,2,payon_in03,27,127
-payon_in03,11,161,0 warp payonwarp083 2,2,payon_in03,11,176
-payon_in03,11,172,0 warp payonwarp084 2,2,payon_in03,11,157
-payon_in03,27,161,0 warp payonwarp085 2,2,payon_in03,27,176
-payon_in03,27,172,0 warp payonwarp086 2,2,payon_in03,27,157
+payon,107,326,0 warp payonwarp073 2,2,payon_in03,20,63
+payon_in03,20,60,0 warp payonwarp074 2,2,payon,107,323
+payon_in03,20,73,0 warp payonwarp075 2,2,payon_in03,20,89
+payon_in03,20,86,0 warp payonwarp076 2,2,payon_in03,20,70
+payon_in03,20,103,0 warp payonwarp077 2,2,payon_in03,20,121
+payon_in03,20,118,0 warp payonwarp078 2,2,payon_in03,20,100
+payon_in03,12,131,0 warp payonwarp079 2,2,payon_in03,12,145
+payon_in03,12,142,0 warp payonwarp080 2,2,payon_in03,12,128
+payon_in03,28,131,0 warp payonwarp081 2,2,payon_in03,28,145
+payon_in03,28,142,0 warp payonwarp082 2,2,payon_in03,28,128
+payon_in03,12,161,0 warp payonwarp083 2,2,payon_in03,12,175
+payon_in03,12,172,0 warp payonwarp084 2,2,payon_in03,12,158
+payon_in03,28,161,0 warp payonwarp085 2,2,payon_in03,28,175
+payon_in03,28,172,0 warp payonwarp086 2,2,payon_in03,28,158
// -- House --
payon_in01,86,9,0 warp payonwarp087 2,2,payon,266,152
-payon,270,152,0 warp payonwarp088 2,2,payon_in01,90,9
-payon_in01,107,71,0 warp payonwarp089 2,2,payon_in01,96,37
-payon_in01,93,37,0 warp payonwarp090 2,2,payon_in01,104,71
+payon,269,152,0 warp payonwarp088 2,2,payon_in01,89,9
+payon_in01,107,71,0 warp payonwarp089 2,2,payon_in01,95,37
+payon_in01,92,37,0 warp payonwarp090 2,2,payon_in01,104,71