4 files changed, 44 insertions, 32 deletions
diff --git a/npc/018-2-4/lv1.txt b/npc/018-2-4/lv1.txt
index 2a06eb873..f6bb1ce4e 100644
--- a/npc/018-2-4/lv1.txt
+++ b/npc/018-2-4/lv1.txt
@@ -6,7 +6,9 @@
 //    Heroes Hold Exchanger - Level 1
 
 018-2-4,33,28,0	script	Novice Exchanger#0	NPC_M_COINKEEPER,{
-    openshop;
+    if (.@q & HH_NOVICE)
+        openshop;
+    goodbye;
     closedialog;
     close;
 
@@ -25,13 +27,14 @@ OnInit:
 
 	tradertype(NST_CUSTOM);
 
-	sellitem ElixirOfLife,320;
-	sellitem CelestiaTea,180;
-	sellitem HastePotion,150;
-	sellitem StrengthPotion,150;
-	sellitem Grenade,rand(90,140); // I really don't care about the price of this. Used to be 12.
-    sellitem CursedArrow,80;
-	sellitem Curshroom,60;
+	sellitem BugSlayer,800;
+	sellitem LeatherShield,600;
+
+	sellitem HastePotion,50;
+	sellitem StrengthPotion,50;
+
+	sellitem Curshroom,10;
+	sellitem Grenade,4;
 	end;
 
 OnCountFunds:
diff --git a/npc/018-2-4/lv2.txt b/npc/018-2-4/lv2.txt
index 13a832b8c..b70b888a8 100644
--- a/npc/018-2-4/lv2.txt
+++ b/npc/018-2-4/lv2.txt
@@ -6,7 +6,9 @@
 //    Heroes Hold Exchanger - Level 2
 
 018-2-4,40,28,0	script	Advanced Exchanger#0	NPC_M_COINKEEPER,{
-    openshop;
+    if (.@q & HH_INTERMEDIARY)
+        openshop;
+    goodbye;
     closedialog;
     close;
 
@@ -25,13 +27,13 @@ OnInit:
 
 	tradertype(NST_CUSTOM);
 
-	sellitem ElixirOfLife,320;
-	sellitem CelestiaTea,180;
-	sellitem HastePotion,150;
-	sellitem StrengthPotion,150;
-	sellitem Grenade,rand(90,140); // I really don't care about the price of this. Used to be 12.
-    sellitem CursedArrow,80;
-	sellitem Curshroom,60;
+	sellitem ShortSword,1800;
+	sellitem Chainmail,1400;
+
+	sellitem BronzeGift,120;
+	sellitem CoinBag,60;
+
+	sellitem CasinoCoins,4;
 	end;
 
 OnCountFunds:
diff --git a/npc/018-2-4/lv3.txt b/npc/018-2-4/lv3.txt
index ea7680217..483caa073 100644
--- a/npc/018-2-4/lv3.txt
+++ b/npc/018-2-4/lv3.txt
@@ -6,7 +6,9 @@
 //    Heroes Hold Exchanger - Level 3
 
 018-2-4,47,28,0	script	Master Exchanger#0	NPC_M_COINKEEPER,{
-    openshop;
+    if (.@q & HH_ADVANCED)
+        openshop;
+    goodbye;
     closedialog;
     close;
 
@@ -25,13 +27,13 @@ OnInit:
 
 	tradertype(NST_CUSTOM);
 
-	sellitem ElixirOfLife,320;
-	sellitem CelestiaTea,180;
-	sellitem HastePotion,150;
-	sellitem StrengthPotion,150;
-	sellitem Grenade,rand(90,140); // I really don't care about the price of this. Used to be 12.
-    sellitem CursedArrow,80;
-	sellitem Curshroom,60;
+	sellitem Kanabo,5400;
+
+	sellitem IronShovel,2000;
+	sellitem MercBoxA,1200;
+
+	sellitem SilverGift,480;
+	sellitem Lockpicks,112;
 	end;
 
 OnCountFunds:
diff --git a/npc/018-2-4/lv4.txt b/npc/018-2-4/lv4.txt
index f42595cf4..52fc7d125 100644
--- a/npc/018-2-4/lv4.txt
+++ b/npc/018-2-4/lv4.txt
@@ -6,7 +6,9 @@
 //    Heroes Hold Exchanger - Level 4
 
 018-2-4,54,28,0	script	Ultimate Exchanger#0	NPC_M_COINKEEPER,{
-    openshop;
+    if (.@q & HH_EXPERT)
+        openshop;
+    goodbye;
     closedialog;
     close;
 
@@ -25,13 +27,16 @@ OnInit:
 
 	tradertype(NST_CUSTOM);
 
-	sellitem ElixirOfLife,320;
-	sellitem CelestiaTea,180;
-	sellitem HastePotion,150;
-	sellitem StrengthPotion,150;
-	sellitem Grenade,rand(90,140); // I really don't care about the price of this. Used to be 12.
-    sellitem CursedArrow,80;
-	sellitem Curshroom,60;
+	sellitem BlacksmithAxe,36000;
+	sellitem Judgement,16200;
+
+	sellitem MercBoxB,2500;
+	sellitem GoldenGift,1920;
+
+	sellitem PlatinumOre,1600;
+	sellitem IridiumOre,1000;
+
+	sellitem PoisonArrow,12;
 	end;
 
 OnCountFunds: