summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/merchants/refine.txt6
-rw-r--r--npc/merchants/shops.txt43
-rw-r--r--npc/pre-re/merchants/shops.txt44
-rw-r--r--npc/re/merchants/shops.txt70
4 files changed, 115 insertions, 48 deletions
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 9fb1d70c3..281988946 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.1
//=========================================================================
//== Christopher: Geffen Blacksmith ========================
@@ -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..605a01777 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,7 +46,7 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.6
+//= 3.7
//=========================================================================
//== Alberta ===============================================
@@ -655,22 +655,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 +667,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:
@@ -1943,11 +1909,6 @@ 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;
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 4abe887a6..538e5b533 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.5
//=========================================================================
//== Prontera ==============================================
@@ -195,6 +195,41 @@ 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;
+}
+
//== Cooking Addition ======================================
prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{
OnInit:
@@ -212,3 +247,8 @@ OnInit:
sellitem Red_Spice;
sellitem Yellow_Spice;
}
+
+geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
+OnInit:
+ sellitem Pot;
+}
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 773fddef8..2d03059ab 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.2
//=========================================================================
//== Comodo ================================================
@@ -744,6 +744,53 @@ 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;
+}
+
//== Rachel ================================================
ra_in01,263,281,4 trader Trap Specialist#ra 1_F_01,{
OnInit:
@@ -826,3 +873,22 @@ 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;
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 13:03:28 +0000