From 2824860863d78bcf02954e86a1e6540d125910b1 Mon Sep 17 00:00:00 2001
From: Jedzkie <jedzkie13@rocketmail.com>
Date: Tue, 12 Jan 2016 13:39:40 +0800
Subject: Alberta NPC Updates
- Separate Tool Dealer and Pet Groomer selling items in Renewal and PRE-Renewal
- Change the selling bullets of Trading Merchant in Renewal and PRE-Renewal
---
npc/merchants/shops.txt | 52 +--------------------------------
npc/pre-re/merchants/shops.txt | 53 ++++++++++++++++++++++++++++++++-
npc/re/merchants/shops.txt | 66 +++++++++++++++++++++++++++++++++++++++++-
3 files changed, 118 insertions(+), 53 deletions(-)
(limited to 'npc')
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index f94640829..d4b623031 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -46,46 +46,16 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.8
+//= 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:
@@ -1838,11 +1793,6 @@ OnInit:
}
//== Cooking Addition ======================================
-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/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index c887a74d8..f5dd954f8 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.6
+//= 1.7
//=========================================================================
//== Prontera ==============================================
@@ -297,6 +297,52 @@ OnInit:
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:
@@ -320,6 +366,11 @@ 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/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index d874147b9..54155e8c4 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.3.1
+//= 2.4
//=========================================================================
//== Comodo ================================================
@@ -803,6 +803,51 @@ OnInit:
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:
@@ -973,6 +1018,25 @@ OnInit:
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;
--
cgit v1.2.3-70-g09d2