summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/merchants/shops.txt61
-rw-r--r--npc/pre-re/merchants/shops.txt57
-rw-r--r--npc/re/battleground/bg_common.txt36
-rw-r--r--npc/re/merchants/3rd_trader.txt4
-rw-r--r--npc/re/merchants/shops.txt192
-rw-r--r--npc/re/quests/mrsmile.txt6
-rw-r--r--npc/re/scripts.conf3
7 files changed, 294 insertions, 65 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 54870deae..d2745217d 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -46,7 +46,7 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.5.2
+//= 3.6
//=========================================================================
//== Alberta ===============================================
@@ -1292,39 +1292,6 @@ OnInit:
sellitem Venom_Knife;
}
-moc_ruins,91,128,4 trader Tool Dealer#moc1 4_F_04,{
-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;
-}
-
-moc_ruins,114,63,6 trader Tool Dealer#moc2 4W_M_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 Booby_Trap;
- sellitem Luxury_Sunglasses;
-}
-
moc_ruins,93,53,2 trader Item Collector#moc1 4_M_03,{
OnInit:
sellitem Scell;
@@ -1386,23 +1353,6 @@ OnInit:
moc_ruins,90,149,6 trader Trader#moc5 4W_M_03,{
OnInit:
sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
-}
-
-moc_ruins,118,170,4 trader Pet Groomer#moc 4_M_TELEPORTER,{
-OnInit:
- sellitem Pet_Food;
- sellitem Pet_Incubator;
- sellitem Backpack;
- sellitem Rocker_Glasses;
- sellitem Mojji;
- sellitem Vital_Flower_;
- sellitem Flame_Gemstone;
- sellitem Bun_;
}
morocc_in,141,67,0 trader Weapon Dealer#moc1 1_M_MERCHANT,{
@@ -1993,15 +1943,6 @@ OnInit:
sellitem Hot_Sauce;
}
-moc_ruins,115,123,5 trader Chef Assistant#moc 4_M_04,{
-OnInit:
- sellitem Hot_Sauce;
- sellitem Sweet_Sauce;
- sellitem Plain_Sauce;
- sellitem Red_Spice;
- sellitem Yellow_Spice;
-}
-
geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
OnInit:
sellitem Pot;
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 62ea538ba..4abe887a6 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -31,7 +31,7 @@
//================= Description ===========================================
//= Pre-renewal-specific town shop NPCs.
//================= Current Version =======================================
-//= 1.3
+//= 1.4
//=========================================================================
//== Prontera ==============================================
@@ -149,6 +149,52 @@ OnInit:
sellitem Thunder_P;
}
+//== Morroc ================================================
+moc_ruins,91,128,4 trader Tool Dealer#moc1 4_F_04,{
+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;
+}
+
+moc_ruins,114,63,6 trader Tool Dealer#moc2 4W_M_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 Booby_Trap;
+ sellitem Luxury_Sunglasses;
+}
+
+moc_ruins,118,170,4 trader Pet Groomer#moc 4_M_TELEPORTER,{
+OnInit:
+ sellitem Pet_Food;
+ sellitem Pet_Incubator;
+ sellitem Backpack;
+ sellitem Rocker_Glasses;
+ sellitem Mojji;
+ sellitem Vital_Flower_;
+ sellitem Flame_Gemstone;
+ sellitem Bun_;
+}
+
//== Cooking Addition ======================================
prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{
OnInit:
@@ -157,3 +203,12 @@ OnInit:
sellitem Pot;
sellitem Bread;
}
+
+moc_ruins,115,123,5 trader Chef Assistant#moc 4_M_04,{
+OnInit:
+ sellitem Hot_Sauce;
+ sellitem Sweet_Sauce;
+ sellitem Plain_Sauce;
+ sellitem Red_Spice;
+ sellitem Yellow_Spice;
+}
diff --git a/npc/re/battleground/bg_common.txt b/npc/re/battleground/bg_common.txt
new file mode 100644
index 000000000..2c47f8ed1
--- /dev/null
+++ b/npc/re/battleground/bg_common.txt
@@ -0,0 +1,36 @@
+//================= Hercules Script =======================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2012-2016 Hercules Dev Team
+//= Copyright (C) Frost
+//=
+//= 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/>.
+//=========================================================================
+// BattleGround System - Common NPCs
+//================= Description ===========================================
+//= Battleground NPC:
+//= - Battleground Warper
+//================= Current Version =======================================
+//= 1.0
+//=========================================================================
+
+morocc,145,82,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit8 4_F_JOB_KNIGHT \ No newline at end of file
diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index 02c4846ad..a0a3bb033 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -32,7 +32,7 @@
//= Sells some 3rd Job related items:
//= - Poison Herbs, Rune Stones, Rare Herbs, Points
//================= Current Version =======================================
-//= 1.5
+//= 1.6
//=========================================================================
//== Poison Herb Merchants (Guillotine Cross) ==============
@@ -97,7 +97,7 @@
close;
}
job3_guil01,79,96,3 duplicate(phs) Poison Herb Merchant 4_F_YUNYANG
-morocc,191,94,4 duplicate(phs) Poison Herb Merchant#moc 4_F_YUNYANG //Official: (190,96) -> in a wall
+morocc,193,100,4 duplicate(phs) Poison Herb Merchant#moc 4_F_YUNYANG
lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG
//== Rune Stone Merchants (Rune Knight) ====================
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 4af1fb509..773fddef8 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -36,7 +36,7 @@
//================= Description ===========================================
//= Renewal-specific town shop NPCs.
//================= Current Version =======================================
-//= 2.0
+//= 2.1
//=========================================================================
//== Comodo ================================================
@@ -573,6 +573,177 @@ OnInit:
sellitem Cyro_Grenade;
}
+//== Morroc ===============================================
+morocc,156,76,4 trader Butcher#moc1 1_M_MERCHANT,{
+OnInit:
+ sellitem Meat;
+}
+
+moc_ruins,91,128,4 trader Tool Dealer#moc1 4_F_04,{
+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;
+}
+
+moc_ruins,114,63,6 trader Tool Dealer#moc2 4W_M_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;
+ sellitem Booby_Trap;
+}
+
+morocc,147,103,6 trader Tool Dealer#moc3 4W_M_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;
+ sellitem Booby_Trap;
+}
+
+morocc,151,241,4 trader Tool Dealer#moc4 4_F_04,{
+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;
+}
+
+moc_ruins,118,170,4 trader Pet Groomer#moc 4_M_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;
+}
+
+morocc,203,87,4 trader Pet Groomer#moc1 4_M_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;
+}
+
+morocc,154,55,6 trader Jeweler#moc3 4W_M_03,{
+OnInit:
+ sellitem Crystal_Jewel;
+ sellitem Diamond_Ring;
+}
+
+morocc,171,103,4 trader Item Collector#moc3 4_M_03,{
+OnInit:
+ sellitem Scell;
+ sellitem Monster's_Feed;
+ sellitem Animal's_Skin;
+ sellitem Bill_Of_Birds;
+}
+
+morocc,205,247,2 trader Item Collector#moc4 4_M_03,{
+OnInit:
+ sellitem Scell;
+ sellitem Monster's_Feed;
+ sellitem Animal's_Skin;
+ sellitem Bill_Of_Birds;
+}
+
+morocc,140,90,6 trader Trader#moc6 4W_M_03,{
+OnInit:
+ sellitem Banana;
+}
+
+morocc,166,54,2 trader Jeweler#moc4 8_F,{
+OnInit:
+ sellitem Azure_Jewel;
+ sellitem Cardinal_Jewel;
+ sellitem Blue_Jewel;
+ sellitem Golden_Jewel;
+ sellitem Bluish_Green_Jewel;
+}
+
+morocc,34,68,0 trader Trader#moc7 4_F_04,{
+OnInit:
+ sellitem Witherless_Rose;
+}
+
+morocc,269,193,4 trader Trader#moc8 4_M_ORIENT02,{
+OnInit:
+ sellitem Skul_Ring;
+ sellitem Sword_Mace;
+ sellitem Stunner;
+}
+
+morocc,256,191,5 trader Trader#moc9 4_F_04,{
+OnInit:
+ sellitem Flower_Ring;
+}
+
//== Rachel ================================================
ra_in01,263,281,4 trader Trap Specialist#ra 1_F_01,{
OnInit:
@@ -636,3 +807,22 @@ OnInit:
sellitem Cookbook04;
sellitem Cookbook05;
}
+
+moc_ruins,115,123,5 trader Chef Assistant#moc 4_M_04,{
+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/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt
index 7cb093753..a98ac8b0e 100644
--- a/npc/re/quests/mrsmile.txt
+++ b/npc/re/quests/mrsmile.txt
@@ -31,11 +31,15 @@
//================= Description ===========================================
//= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
//================= Current Version =======================================
-//= 1.1
+//= 1.2
//=========================================================================
+//== Izlude ================================================
izlude,125,175,4 duplicate(SmileHelper) Smile Assistance#iz 4_F_03
izlude_a,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_a 4_F_03
izlude_b,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_b 4_F_03
izlude_c,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_c 4_F_03
izlude_d,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_d 4_F_03
+
+//== Morroc ================================================
+morocc,159,107,4 duplicate(SmileHelper) Smile Assistance#moc1 4_F_03
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index 706c4bb85..b03ebe46a 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -31,6 +31,9 @@
//================= Airport ===============================================
npc: npc/re/airports/izlude.txt
+//================ Battlegrounds ==========================================
+npc: npc/re/battleground/bg_common.txt
+
//================= Cities ================================================
npc: npc/re/cities/alberta.txt
npc: npc/re/cities/brasilis.txt
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 00:15:09 +0000