Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better price rationalisation

Browse Source
This commit is contained in:
Joshua Barretto 2021-04-18 18:11:00 +01:00
parent c0b71d0731
commit 250733a123
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/common/item_price_calculation.ron
View File

@ -7,9 +7,9 @@ loot_tables: [
(4.0, "common.loot_tables.weapons.tier-1"),
(2.0, "common.loot_tables.weapons.tier-2"),
(1.0, "common.loot_tables.weapons.tier-3"),
(0.5, "common.loot_tables.weapons.tier-4"),
(0.125, "common.loot_tables.weapons.tier-5"),
//(0.125, "common.loot_tables.weapons.cultist"),
(0.25, "common.loot_tables.weapons.tier-4"),
//(0.125, "common.loot_tables.weapons.tier-5"),
//(0.05, "common.loot_tables.weapons.cultist"),
(0.125, "common.loot_tables.weapons.cave"),
//(0.0625, "common.loot_tables.weapons.legendary"),
// Armor
@ -17,9 +17,9 @@ loot_tables: [
(6.0, "common.loot_tables.armor.agile"),
(3.0, "common.loot_tables.armor.swift"),
(6.0, "common.loot_tables.armor.druid"),
(2.0, "common.loot_tables.armor.twigs"),
(2.0, "common.loot_tables.armor.twigsflowers"),
(2.0, "common.loot_tables.armor.twigsleaves"),
(1.0, "common.loot_tables.armor.twigs"),
(1.0, "common.loot_tables.armor.twigsflowers"),
(1.0, "common.loot_tables.armor.twigsleaves"),
(0.5, "common.loot_tables.armor.plate"),
(0.25, "common.loot_tables.armor.steel"),
//(0.075, "common.loot_tables.armor.cultist"),
@ -28,18 +28,19 @@ loot_tables: [
(8.0, "common.loot_tables.materials.underground"),
// Food
(0.3, "common.loot_tables.food.farm_ingredients"),
(0.5, "common.loot_tables.food.wild_ingredients"),
(0.4, "common.loot_tables.food.wild_ingredients"),
(0.2, "common.loot_tables.food.prepared"),
// TODO: Change consumables when they are split up later
(1.0, "common.loot_tables.consumables"),
(0.5, "common.loot_tables.trading"),
],
// this is the amount of that good the most common item represents
// so basically this table balances the goods against each other (higher=less valuable)
good_scaling: [
(Potions, 0.2), // common.items.consumable.potion_minor
(Food, 3.0), // common.items.food.mushroom
(Potions, 0.005), // common.items.consumable.potion_minor
(Food, 0.1), // common.items.food.mushroom
(Coin, 1.0), // common.items.utility.coins
(Armor, 0.2), // common.items.armor.misc.pants.worker_blue
(Tools, 0.2), // common.items.weapons.staff.starter_staff
(Armor, 0.05), // common.items.armor.misc.pants.worker_blue
(Tools, 0.1), // common.items.weapons.staff.starter_staff
(Ingredients, 0.25), // common.items.crafting_ing.leather_scraps
])

1
assets/common/loot_tables/food/wild_ingredients.ron
View File

@ -3,5 +3,4 @@
(0.3, Item("common.items.food.cheese")),
(1.0, Item("common.items.food.coconut")),
(1.5, Item("common.items.food.mushroom")),
(0.5, Item("common.items.crafting_ing.honey")),
]

5
assets/common/loot_tables/trading.ron Normal file
View File

@ -0,0 +1,5 @@
// Loot table that exists purely for price rationalisation
[
(1.0, Item("common.items.crafting_ing.honey")),
(0.5, Item("common.items.crafting_ing.icy_fang")),
]

21
world/src/site/economy.rs
View File

@ -326,19 +326,24 @@ impl Economy {
}
pub fn get_site_prices(&self) -> SitePrices {
let normalize = |xs: MapVec<Good, Option<f32>>| {
let sum = xs
.iter()
.map(|(_, x)| (*x).unwrap_or(0.0))
.sum::<f32>()
.max(0.001);
xs.map(|_, x| Some(x? / sum))
};
SitePrices {
values: {
let labor_values = normalize(self.labor_values.clone());
// Use labor values as prices. Not correct (doesn't care about exchange value)
let prices = self.labor_values.clone();
// Normalized values. Note: not correct, but better than nothing
let sum = prices
.iter()
.map(|(_, price)| (*price).unwrap_or(0.0))
.sum::<f32>()
.max(0.001);
let prices = normalize(self.values.clone())
.map(|good, value| Some((labor_values[good]? + value?) * 0.5));
prices
.iter()
.map(|(g, v)| (g, v.map(|v| v / sum).unwrap_or(Economy::MINIMUM_PRICE)))
.map(|(g, v)| (g, v.unwrap_or(Economy::MINIMUM_PRICE)))
.collect()
},
}