Nivalis Vendor arrives to the Bazaar

3 files changed, 82 insertions, 19 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 60001bb69..5c58ce9ff 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -19030,8 +19030,8 @@ item_db: (
 	AegisName: "MercBoxAA"
 	Name: "Mercenary Boxset AA"
 	Type: "IT_USABLE"
-	Buy: 0
-	Sell: 0
+	Buy: 1875
+	Sell: 625
 	Weight: 135
 	KeepAfterUse: false
 	Refine: false
@@ -19051,8 +19051,8 @@ item_db: (
 	AegisName: "MercBoxBB"
 	Name: "Mercenary Boxset BB"
 	Type: "IT_USABLE"
-	Buy: 0
-	Sell: 0
+	Buy: 5625
+	Sell: 1875
 	Weight: 135
 	KeepAfterUse: false
 	Refine: false
@@ -19072,8 +19072,8 @@ item_db: (
 	AegisName: "MercBoxCC"
 	Name: "Mercenary Boxset CC"
 	Type: "IT_USABLE"
-	Buy: 0
-	Sell: 0
+	Buy: 11250
+	Sell: 3750
 	Weight: 135
 	KeepAfterUse: false
 	Refine: false
@@ -19093,8 +19093,8 @@ item_db: (
 	AegisName: "MercBoxDD"
 	Name: "Mercenary Boxset DD"
 	Type: "IT_USABLE"
-	Buy: 0
-	Sell: 0
+	Buy: 22500
+	Sell: 7500
 	Weight: 135
 	KeepAfterUse: false
 	Refine: false
@@ -19114,8 +19114,8 @@ item_db: (
 	AegisName: "MercBoxEE"
 	Name: "Mercenary Boxset EE"
 	Type: "IT_USABLE"
-	Buy: 0
-	Sell: 0
+	Buy: 37500
+	Sell: 12500
 	Weight: 135
 	KeepAfterUse: false
 	Refine: false
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index 80a4a4649..91dbd0486 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -174,6 +174,13 @@ function	script	BazaarToggle	{
             unitwarp(.@gid, "017-1", 165, 171);
         else
             unitwarp(.@gid, "003-1", 112, 110);
+        // Nivalis Vendor
+        enablenpc "Nivalis Vendor";
+        .@gid = getnpcid("Nivalis Vendor");
+        if (.@lof)
+            unitwarp(.@gid, "017-1", 173, 177);
+        else
+            unitwarp(.@gid, "003-1", 107, 104);
     } else {
         // Close the Bazaar!
         disablenpc "Foreign Tiki";
@@ -181,6 +188,7 @@ function	script	BazaarToggle	{
         disablenpc "Hurnscald Vendor";
         disablenpc "Halinarzo Vendor";
         disablenpc "LoF Vendor";
+        disablenpc "Nivalis Vendor";
     }
     return;
 }
@@ -504,3 +512,65 @@ OnPayFunds:
 	end;
 }
 
+
+// Nivalis Vendor
+003-1,107,104,0	script	Nivalis Vendor	NPC_ELVEN_MAN_TRADER,{
+    mesn;
+    mes l("People say Nivalis has nothing unique to it... I'm here to prove you wrong!");
+    mesc l("You can still spend %s GP at the Bazaar.", fnum(BazaarFunds() - TULIM_BAZAAR));
+    next;
+    closeclientdialog;
+    npcshopattach(.name$);
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    sleep(SHOPWAIT);
+	tradertype(NST_CUSTOM);
+
+    sellitem CobaltHerb, price(CobaltHerb, 10);
+    sellitem ArtichokeHerb, price(ArtichokeHerb, 11);
+    sellitem GambogeHerb, price(GambogeHerb, 11);
+    sellitem MauveHerb, price(MauveHerb, 11);
+    sellitem AlizarinHerb, price(AlizarinHerb, 12);
+    sellitem ShadowHerb, price(ShadowHerb, 18);
+
+    sellitem WhiteFur, price(WhiteFur, 9);
+    sellitem IcedBottle, price(IcedBottle, 8);
+    sellitem SacredImmortalityPotion, 220000;
+    sellitem Coffee, price(Coffee, 9);
+    sellitem PurificationPotion, price(PurificationPotion, 9);
+    sellitem InsuranceContract, price(InsuranceContract, 8);
+    sellitem Insurance, 150000;
+
+    sellitem MercBoxAA, price(MercBoxAA, ($GAME_STORYLINE >= 2 ? 9 : 10));
+    sellitem MercBoxBB, price(MercBoxBB, ($GAME_STORYLINE >= 3 ? 9 : 10));
+    sellitem MercBoxCC, price(MercBoxCC, ($GAME_STORYLINE >= 4 ? 9 : 10));
+    sellitem MercBoxDD, price(MercBoxDD, ($GAME_STORYLINE >= 5 ? 9 : 10));
+    sellitem MercBoxEE, price(MercBoxEE, 10);
+
+    sellitem Beer, price(Beer, 9);
+    sellitem RedPlushWine, price(RedPlushWine, 9);
+    sellitem DwarvenSake, price(DwarvenSake, 10);
+    sellitem CrazyRum, price(CrazyRum, 12);
+    sellitem WhiskeyAle, price(WhiskeyAle, 15);
+
+    sellitem TrainingBow, price(TrainingBow, 9);
+    sellitem FluffyHat, price(FluffyHat, 8);
+
+
+    disablenpc .name$;
+    end;
+
+OnCountFunds:
+	setcurrency(Zeny, BazaarFunds() - TULIM_BAZAAR);
+	end;
+
+OnPayFunds:
+    BazaarPurchase();
+	end;
+}
+
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 80c8b5a1c..fc4f28bed 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -102,11 +102,6 @@ OnInit:
 
     sleep(SHOPWAIT);
 
-    sellitem TrainingBow,       -1, 5+.@steam-1;
-
-    sellitem Bullet,            4, 90000+(.@steam*1000-1000);
-
-    sellitem WhiteFur,          -1, 1+rand2(50)+.@steam;
     sellitem CherryCake,        -1, 1+rand2(50)+.@steam;
     sellitem RoastedMaggot,     -1, 1+rand2(50)+.@steam;
 
@@ -120,12 +115,10 @@ OnInit:
     // anyof(244 - 248) indigenous folks -> Halinarzo (Minerals) OK
     // TIKI -> Esperia/Artis (Odd stuff, Rare stuff) OK
     // LOF_TRAVMERC -> LoF (Magic, Science) OK
+    // NPC_ELVEN_MAN_TRADER -> Nivalis (Ice, cold) OK
 
-    // NPC_ELVEN_MAN_TRADER -> Nivalis (Ice, cold)
-        // white fur, ice bottle, coffee, merc boxes, purif potion, insurances
-        // alcoholic beverages
     // NPC_EURNI / NPC_WEIRDSELLER -> Nowhere (Illegal, Contraband Goods)
-        // death potion, grenades, mysterious fruit (500k), lockpicks, maps, G.P. Ring, M bottle
+        // death potion, grenades, mysterious fruit (500k=100%), lockpicks, maps, G.P. Ring, M bottle
     // NPC_GUGLI -> Tulimshar (Monster Parts and Dyes)
         // Cactus potions, apana cake,roasted maggot, cherry cake, tonori delight
         // dyes and random drops