From 8c5901516e1208e295f7366ca67ccb76c5e54f43 Mon Sep 17 00:00:00 2001
From: Christof Petig <christof.petig@arcor.de>
Date: Sat, 9 Jul 2022 00:45:54 +0200
Subject: [PATCH] clean up

---
 common/src/comp/inventory/trade_pricing.rs | 54 +---------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs
index 2f650944b6..db9c8956c4 100644
--- a/common/src/comp/inventory/trade_pricing.rs
+++ b/common/src/comp/inventory/trade_pricing.rs
@@ -882,31 +882,7 @@ impl TradePricing {
     }
 
     fn get_materials_impl(&self, item: &ItemDefinitionId) -> Option<MaterialUse> {
-        //let tmp = format!("{:?}", item);
-        let ret = self.price_lookup(&item.to_owned()).cloned();
-        // match item {
-        //     ItemDefinitionIdOwned::Simple(id) => self.price_lookup(id).cloned(),
-        //     ItemDefinitionIdOwned::Modular { components, .. } => Some(
-        //         components
-        //             .into_iter()
-        //             .filter_map(|comp| self.get_materials_impl(comp))
-        //             .sum(),
-        //     ),
-        //     ItemDefinitionIdOwned::Compound {
-        //         simple_base,
-        //         components,
-        //     } => Some(
-        //         self.price_lookup(simple_base)
-        //             .cloned()
-        //             .unwrap_or_else(MaterialUse::default)
-        //             + components
-        //                 .into_iter()
-        //                 .filter_map(|comp| self.get_materials_impl(comp))
-        //                 .sum(),
-        //     ),
-        // };
-        println!("{:?} -> {:?}", item, ret);
-        ret
+        self.price_lookup(&item.to_owned()).cloned()
     }
 
     #[must_use]
@@ -1023,34 +999,6 @@ pub fn expand_loot_table(loot_table: &str) -> Vec<(f32, ItemDefinitionIdOwned, f
     ProbabilityFile::from(vec![(1.0, LootSpec::LootTable(loot_table.into()))]).content
 }
 
-// pub fn item_from_definition_id(id: &ItemDefinitionIdOwned) -> Item {
-//     match id {
-//         ItemDefinitionIdOwned::Simple(str) =>
-// Item::new_from_asset_expect(str),         ItemDefinitionIdOwned::Modular {
-//             pseudo_base:_,
-//             components:_,
-//         } => todo!(),
-//         ItemDefinitionIdOwned::Compound {
-//             simple_base,
-//             components,
-//         } => {
-//             warn!("simple_base {}", simple_base);
-//             let ability_map = &AbilityMap::load().read();
-//             let msm = &MaterialStatManifest::load().read();
-//             let components = components
-//                 .iter()
-//                 .map(|i| item_from_definition_id(i))
-//                 .collect();
-//             Item::new_from_item_base(
-//                 ItemBase::Modular(ModularBase::Tool),
-//                 components,
-//                 ability_map,
-//                 msm,
-//             )
-//         },
-//     }
-// }
-
 // if you want to take a look at the calculated values run:
 // cd common && cargo test trade_pricing -- --nocapture
 #[cfg(test)]