From 40f2c59401289cde5bd00d1036daff205b95661d Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Sun, 28 Mar 2021 10:29:40 -0400 Subject: [PATCH] Reclassify Glowing Remains as Armor for econsim. --- CHANGELOG.md | 1 + common/src/comp/inventory/trade_pricing.rs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc857e1de6..1e14c1295b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Permission to build is no longer tied to being an admin - Separated character randomization buttons into appearance and name. - Reworked mindflayer to have unique attacks +- Glowing remains are now `Armor` instead of `Ingredients`. ### Removed diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs index 1e2ddeb3ee..de4953a7cc 100644 --- a/common/src/comp/inventory/trade_pricing.rs +++ b/common/src/comp/inventory/trade_pricing.rs @@ -104,6 +104,7 @@ impl TradePricing { fn get_list_by_path(&self, name: &str) -> &Entries { match name { + "common.items.crafting_ing.mindflayer_bag_damaged" => &self.armor, _ if name.starts_with("common.items.crafting_ing.") => &self.ingredients, _ if name.starts_with("common.items.armor.") => &self.armor, _ if name.starts_with("common.items.glider.") => &self.other, @@ -126,6 +127,7 @@ impl TradePricing { fn get_list_by_path_mut(&mut self, name: &str) -> &mut Entries { match name { + "common.items.crafting_ing.mindflayer_bag_damaged" => &mut self.armor, _ if name.starts_with("common.items.crafting_ing.") => &mut self.ingredients, _ if name.starts_with("common.items.armor.") => &mut self.armor, _ if name.starts_with("common.items.glider.") => &mut self.other,