Fill the Heroes Hold with rares.

I don't really think it is worth doing, but I'm not a hardcore player %%a

7 files changed, 46 insertions, 38 deletions

diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index 3c44649df..a711eb981 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -64,11 +64,11 @@ OnInit:
 	sellitem CelestiaTea,18;
 	sellitem HastePotion,15;
 	sellitem StrengthPotion,15;
-	sellitem Grenade,rand(9,14); // I really don't care about the price of this. Used to be 12.
     sellitem BottleOfDivineWater, 10;
     sellitem CursedArrow,8;
 	sellitem Curshroom,6;
 	sellitem PetcaringGuide,5; // I needed to add this somewhere
+	sellitem Grenade,3;
 	end;
 
 /* set currency to be item 828 */
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index f4794f4b8..af59b5024 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -119,7 +119,6 @@ L_Weapon:
         l("Iron Bug Slayer"),
         l("Iron Short Gladius"),
         l("Bronze Gladius"),
-        l("Iron Short Sword"),
         l("Iron Backsword");
 
     switch (@menu) {
@@ -138,9 +137,6 @@ L_Weapon:
         blacksmith_create(CopperIngot, 18, TinIngot, 2, RealBronzeGladius, 500);
         break;
     case 6:
-        blacksmith_create(IronIngot, 21, Coal, 27, ShortSword, 3550);
-        break;
-    case 7:
         blacksmith_create(IronIngot, 28, TitaniumIngot, 12, Backsword, 4550);
         break;
     }
diff --git a/npc/018-2-1/warps.txt b/npc/018-2-1/warps.txt
index 08df04618..4c3f95cec 100644
--- a/npc/018-2-1/warps.txt
+++ b/npc/018-2-1/warps.txt
@@ -42,7 +42,7 @@ OnTouch:
             rif(.@q & HH_NOVICE, l("Intermediary Dungeon (Lv 60+)")), // Level 21-60
             rif(.@q & HH_INTERMEDIARY, l("Advanced Dungeon (Lv 80+)")), // Level 41-80
             rif(.@q & HH_ADVANCED, l("Expert Dungeon (Lv 100+)")), // Level 61-100
-            rif(.@q & HH_REQUISITE, l("Master Dungeon (BOSS)")), // Boss Only (HH_EXPERT)
+            rif(.@q & HH_REQUISITE, l("Master Dungeon (BOSS)")), // Boss Only
             l("Heroes Hold - Exchange Hall"),
             l("Information");
         mes "";
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: