Sanitize ore price (applies to official) + remaster FOS formula

(and make it visible)

2 files changed, 121 insertions, 121 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 4bfa8fb48..670c73c10 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4808,8 +4808,8 @@ item_db: (
 	AegisName: "CopperOre"
 	Name: "Copper Ore"
 	Type: "IT_ETC"
-	Buy: 10000
-	Sell: 200
+	Buy: 1000
+	Sell: 250
 	Weight: 750
 },
 {
@@ -4817,8 +4817,8 @@ item_db: (
 	AegisName: "LeadOre"
 	Name: "Lead Ore"
 	Type: "IT_ETC"
-	Buy: 11000
-	Sell: 900
+	Buy: 4000
+	Sell: 1000
 	Weight: 750
 },
 {
@@ -4826,8 +4826,8 @@ item_db: (
 	AegisName: "TinOre"
 	Name: "Tin Ore"
 	Type: "IT_ETC"
-	Buy: 9000
-	Sell: 750
+	Buy: 3600
+	Sell: 900
 	Weight: 750
 },
 {
@@ -4835,7 +4835,7 @@ item_db: (
 	AegisName: "SilverOre"
 	Name: "Silver Ore"
 	Type: "IT_ETC"
-	Buy: 10000
+	Buy: 2000
 	Sell: 500
 	Weight: 750
 },
@@ -4844,8 +4844,8 @@ item_db: (
 	AegisName: "GoldOre"
 	Name: "Gold Ore"
 	Type: "IT_ETC"
-	Buy: 12500
-	Sell: 700
+	Buy: 3000
+	Sell: 750
 	Weight: 750
 },
 {
@@ -4853,7 +4853,7 @@ item_db: (
 	AegisName: "PlatinumOre"
 	Name: "Platinum Ore"
 	Type: "IT_ETC"
-	Buy: 40000
+	Buy: 24000
 	Sell: 6000
 	Weight: 750
 },
@@ -4862,7 +4862,7 @@ item_db: (
 	AegisName: "IridiumOre"
 	Name: "Iridium Ore"
 	Type: "IT_ETC"
-	Buy: 20000
+	Buy: 16000
 	Sell: 4000
 	Weight: 750
 },
@@ -4871,7 +4871,7 @@ item_db: (
 	AegisName: "TitaniumOre"
 	Name: "Titanium Ore"
 	Type: "IT_ETC"
-	Buy: 20000
+	Buy: 6000
 	Sell: 1500
 	Weight: 750
 },
@@ -5107,7 +5107,7 @@ item_db: (
 	AegisName: "EverburnPowder"
 	Name: "Everburn Powder"
 	Type: "IT_ETC"
-	Buy: 50000
+	Buy: 15000
 	Sell: 3500
 	Weight: 100
 	Refine: false
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 0b718bbb9..72eb9ec52 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -62,60 +62,60 @@ OnInit:
     .distance=5;
     .sex=G_MALE;
 
-    sellitem LeatherPatch, 800, 45;
-    sellitem RawLog, -1, 40;
-    sellitem WoodenLog, -1, 40;
-    sellitem Coal, -1, 35;
-    sellitem IronOre, -1, 30;
-    sellitem CopperOre, -1, 20;
-    sellitem LeadOre, -1, 15;
-    sellitem TinOre, -1, 15;
-    sellitem SilverOre, -1, 14;
-    sellitem GoldOre, -1, 14;
-    sellitem TitaniumOre, -1, 9;
-    sellitem IridiumOre, -1, 6;
-    sellitem PlatinumOre, -1, 3;
-    sellitem EarthPowder, -1, 3;
-    sellitem EverburnPowder, -1, 2;
-
-    sellitem AncientBlueprint, 10000, 4;
-    sellitem RustyKnife, -1, 5;
-    sellitem TrainingWand, -1, 5;
-    sellitem TrainingBow, -1, 5;
-
-    sellitem AlchemyBlueprintA, -1, 5;
-    sellitem AlchemyBlueprintB, -1, 4;
-    sellitem AlchemyBlueprintC, -1, 3;
-    sellitem AlchemyBlueprintD, -1, 2;
-    sellitem AlchemyBlueprintE, -1, 1;
-
-    sellitem EquipmentBlueprintA, -1, 5;
-    sellitem EquipmentBlueprintB, -1, 4;
-    sellitem EquipmentBlueprintC, -1, 3;
-    sellitem EquipmentBlueprintD, -1, 2;
-    sellitem EquipmentBlueprintE, -1, 1;
-
-    sellitem ArcmageBoxset, 10000, 4;
-    sellitem ScholarshipBadge, -1, 3;
-    sellitem Bullet, 4, 90000;
-    sellitem Lifestone,  -1, 800;
-    sellitem Bread,  -1, 750;
-    sellitem Cheese, -1, 400;
-    sellitem Aquada, -1, 200;
-
-    sellitem WhiteFur, -1, rand2(50);
-    sellitem Piberries, -1, rand2(50);
-    sellitem CherryCake, -1, rand2(50);
-    sellitem LettuceLeaf, -1, rand2(50);
-    sellitem BugLeg, -1, rand2(50);
-    sellitem RoastedMaggot, -1, rand2(50);
-    sellitem Moss, -1, rand2(50);
-    sellitem AnimalBones, -1, rand2(40);
-    sellitem Milk, -1, rand2(50);
-    sellitem Mashmallow, -1, rand2(50);
-    sellitem Dragonfruit, -1, rand2(50);
-    sellitem Root, -1, 40;
-    sellitem ManaPiouFeathers, -1, rand2(300);
+    sellitem Coal, -1, 50+($FIRESOFSTEAM*3-3);
+    sellitem LeatherPatch, 800, 45+($FIRESOFSTEAM*3-3);
+    sellitem RawLog, -1, 40+($FIRESOFSTEAM*3-3);
+    sellitem WoodenLog, -1, 40+($FIRESOFSTEAM*3-3);
+    sellitem IronOre, -1, 30+($FIRESOFSTEAM*3-3);
+    sellitem CopperOre, 1000, 20+($FIRESOFSTEAM*2-2);
+    sellitem SilverOre, 2000, 14+($FIRESOFSTEAM*2-2);
+    sellitem GoldOre, 3000, 14+($FIRESOFSTEAM*2-2);
+    sellitem TinOre, 3600, 15+($FIRESOFSTEAM*2-2);
+    sellitem LeadOre, 4000, 15+($FIRESOFSTEAM*2-2);
+    sellitem TitaniumOre, 6000, 9+($FIRESOFSTEAM*2-2);
+    sellitem IridiumOre, 16000, 6+($FIRESOFSTEAM*2-2);
+    sellitem PlatinumOre, 24000, 3+($FIRESOFSTEAM*2-2);
+    sellitem EarthPowder, -1, 3+$FIRESOFSTEAM-1;
+    sellitem EverburnPowder, 15000, 2+$FIRESOFSTEAM-1;
+
+    sellitem AncientBlueprint, 10000, 4+$FIRESOFSTEAM-1;
+    sellitem RustyKnife, -1, 5+$FIRESOFSTEAM-1;
+    sellitem TrainingWand, -1, 5+$FIRESOFSTEAM-1;
+    sellitem TrainingBow, -1, 5+$FIRESOFSTEAM-1;
+
+    sellitem AlchemyBlueprintA, -1, 5+$FIRESOFSTEAM-1;
+    sellitem AlchemyBlueprintB, -1, 4+$FIRESOFSTEAM-1;
+    sellitem AlchemyBlueprintC, -1, 3+$FIRESOFSTEAM-1;
+    sellitem AlchemyBlueprintD, -1, 2+$FIRESOFSTEAM-1;
+    sellitem AlchemyBlueprintE, -1, 1+$FIRESOFSTEAM-1;
+
+    sellitem EquipmentBlueprintA, -1, 5+$FIRESOFSTEAM-1;
+    sellitem EquipmentBlueprintB, -1, 4+$FIRESOFSTEAM-1;
+    sellitem EquipmentBlueprintC, -1, 3+$FIRESOFSTEAM-1;
+    sellitem EquipmentBlueprintD, -1, 2+$FIRESOFSTEAM-1;
+    sellitem EquipmentBlueprintE, -1, 1+$FIRESOFSTEAM-1;
+
+    sellitem ArcmageBoxset, 10000, 4+$FIRESOFSTEAM-1;
+    sellitem ScholarshipBadge, -1, 3+$FIRESOFSTEAM-1;
+    sellitem Bullet, 4, 90000+$FIRESOFSTEAM-1;
+    sellitem Lifestone,  -1, 800+$FIRESOFSTEAM-1;
+    sellitem Bread,  -1, 750+$FIRESOFSTEAM-1;
+    sellitem Cheese, -1, 400+$FIRESOFSTEAM-1;
+    sellitem Aquada, -1, 200+$FIRESOFSTEAM-1;
+
+    sellitem WhiteFur, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem Piberries, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem CherryCake, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem LettuceLeaf, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem BugLeg, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem RoastedMaggot, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem Moss, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem AnimalBones, -1, rand2(40)+$FIRESOFSTEAM-1;
+    sellitem Milk, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem Mashmallow, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem Dragonfruit, -1, rand2(50)+$FIRESOFSTEAM-1;
+    sellitem Root, -1, 40+$FIRESOFSTEAM-1;
+    sellitem ManaPiouFeathers, -1, rand2(300)+$FIRESOFSTEAM-1;
 
     if (gettime(7) != 2021)
         disablenpc .name$;
@@ -155,60 +155,60 @@ OnClock2201:
     .robp=rand2(900, 1200);
     .robg=.robp*rand2(40, 60);//rand2(80, 110);
 
-    restoreshopitem LeatherPatch, 800, 45;
-    restoreshopitem RawLog, 40;
-    restoreshopitem WoodenLog, 40;
-    restoreshopitem Coal, 35;
-    restoreshopitem IronOre, 30;
-    restoreshopitem CopperOre, 20;
-    restoreshopitem LeadOre, 15;
-    restoreshopitem TinOre, 15;
-    restoreshopitem SilverOre, 14;
-    restoreshopitem GoldOre, 14;
-    restoreshopitem TitaniumOre, 9;
-    restoreshopitem IridiumOre, 6;
-    restoreshopitem PlatinumOre, 3;
-    restoreshopitem EarthPowder, 3;
-    restoreshopitem EverburnPowder, 2;
-
-    restoreshopitem AncientBlueprint, 10000, 4;
-    restoreshopitem RustyKnife, 5;
-    restoreshopitem TrainingWand, 5;
-    restoreshopitem TrainingBow, 5;
-
-    restoreshopitem AlchemyBlueprintA, 5;
-    restoreshopitem AlchemyBlueprintB, 4;
-    restoreshopitem AlchemyBlueprintC, 3;
-    restoreshopitem AlchemyBlueprintD, 2;
-    restoreshopitem AlchemyBlueprintE, 1;
-
-    restoreshopitem EquipmentBlueprintA, 5;
-    restoreshopitem EquipmentBlueprintB, 4;
-    restoreshopitem EquipmentBlueprintC, 3;
-    restoreshopitem EquipmentBlueprintD, 2;
-    restoreshopitem EquipmentBlueprintE, 1;
-
-    restoreshopitem ArcmageBoxset, 10000, 4;
-    restoreshopitem ScholarshipBadge, 3;
-    restoreshopitem Lifestone, 800;
-    restoreshopitem Bullet, 4, 90000;
-    restoreshopitem Bread,  750;
-    restoreshopitem Cheese, 400;
-    restoreshopitem Aquada, 200;
-
-    restoreshopitem WhiteFur, rand2(50);
-    restoreshopitem Piberries, rand2(50);
-    restoreshopitem CherryCake, rand2(50);
-    restoreshopitem LettuceLeaf, rand2(50);
-    restoreshopitem BugLeg, rand2(50);
-    restoreshopitem RoastedMaggot, rand2(50);
-    restoreshopitem Moss, rand2(50);
-    restoreshopitem AnimalBones, rand2(40);
-    restoreshopitem Milk, rand2(50);
-    restoreshopitem Mashmallow, rand2(50);
-    restoreshopitem Dragonfruit, rand2(50);
-    restoreshopitem Root, 40;
-    restoreshopitem ManaPiouFeathers, rand2(300);
+    restoreshopitem Coal, 50+($FIRESOFSTEAM*3-3);
+    restoreshopitem LeatherPatch, 800, 45+($FIRESOFSTEAM*3-3);
+    restoreshopitem RawLog, 40+($FIRESOFSTEAM*3-3);
+    restoreshopitem WoodenLog, 40+($FIRESOFSTEAM*3-3);
+    restoreshopitem IronOre, 30+($FIRESOFSTEAM*3-3);
+    restoreshopitem CopperOre,   1000, 20+($FIRESOFSTEAM*2-2);
+    restoreshopitem SilverOre,   2000, 14+($FIRESOFSTEAM*2-2);
+    restoreshopitem GoldOre,     3000, 14+($FIRESOFSTEAM*2-2);
+    restoreshopitem TinOre,      3600, 15+($FIRESOFSTEAM*2-2);
+    restoreshopitem LeadOre,     4000, 15+($FIRESOFSTEAM*2-2);
+    restoreshopitem TitaniumOre, 6000, 9+($FIRESOFSTEAM*2-2);
+    restoreshopitem IridiumOre,  16000, 6+($FIRESOFSTEAM*2-2);
+    restoreshopitem PlatinumOre, 24000, 3+($FIRESOFSTEAM*2-2);
+    restoreshopitem EarthPowder, 3+$FIRESOFSTEAM-1;
+    restoreshopitem EverburnPowder, 15000, 2+$FIRESOFSTEAM-1;
+
+    restoreshopitem AncientBlueprint, 10000, 4+$FIRESOFSTEAM-1;
+    restoreshopitem RustyKnife, 5+$FIRESOFSTEAM-1;
+    restoreshopitem TrainingWand, 5+$FIRESOFSTEAM-1;
+    restoreshopitem TrainingBow, 5+$FIRESOFSTEAM-1;
+
+    restoreshopitem AlchemyBlueprintA, 5+$FIRESOFSTEAM-1;
+    restoreshopitem AlchemyBlueprintB, 4+$FIRESOFSTEAM-1;
+    restoreshopitem AlchemyBlueprintC, 3+$FIRESOFSTEAM-1;
+    restoreshopitem AlchemyBlueprintD, 2+$FIRESOFSTEAM-1;
+    restoreshopitem AlchemyBlueprintE, 1+$FIRESOFSTEAM-1;
+
+    restoreshopitem EquipmentBlueprintA, 5+$FIRESOFSTEAM-1;
+    restoreshopitem EquipmentBlueprintB, 4+$FIRESOFSTEAM-1;
+    restoreshopitem EquipmentBlueprintC, 3+$FIRESOFSTEAM-1;
+    restoreshopitem EquipmentBlueprintD, 2+$FIRESOFSTEAM-1;
+    restoreshopitem EquipmentBlueprintE, 1+$FIRESOFSTEAM-1;
+
+    restoreshopitem ArcmageBoxset, 10000, 4+$FIRESOFSTEAM-1;
+    restoreshopitem ScholarshipBadge, 3+$FIRESOFSTEAM-1;
+    restoreshopitem Lifestone, 800+$FIRESOFSTEAM-1;
+    restoreshopitem Bullet, 4, 90000+$FIRESOFSTEAM-1;
+    restoreshopitem Bread,  750+$FIRESOFSTEAM-1;
+    restoreshopitem Cheese, 400+$FIRESOFSTEAM-1;
+    restoreshopitem Aquada, 200+$FIRESOFSTEAM-1;
+
+    restoreshopitem WhiteFur, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem Piberries, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem CherryCake, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem LettuceLeaf, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem BugLeg, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem RoastedMaggot, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem Moss, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem AnimalBones, rand2(40)+$FIRESOFSTEAM-1;
+    restoreshopitem Milk, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem Mashmallow, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem Dragonfruit, rand2(50)+$FIRESOFSTEAM-1;
+    restoreshopitem Root, 40+$FIRESOFSTEAM-1;
+    restoreshopitem ManaPiouFeathers, rand2(300)+$FIRESOFSTEAM-1;
     end;
 
 OnMinute02: