jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

shop_sell #65

Merged
jake merged 36 commits from shop_sell into master 2021-12-29 23:02:32 -05:00
Conversation 0 Commits 36 Files Changed 29 -24
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8acbb91416 - Show all commits

14
src/ship/shops/armor.rs
View File

@ -90,20 +90,6 @@ impl ShopItem for ArmorShopItem {
}
}
// impl ArmorShopItem {
// pub fn armor_from_item(a: &Armor) -> ArmorShopItem {
// ArmorShopItem::Frame(a.armor, a.slots as usize)
// }
// pub fn shield_from_item(s: &Shield) -> ArmorShopItem {
// ArmorShopItem::Barrier(s.shield)
// }
// pub fn unit_from_item(u: &Unit) -> ArmorShopItem {
// ArmorShopItem::Unit(u.unit)
// }
// }
impl From<&Armor> for ArmorShopItem {
fn from(armor: &Armor) -> ArmorShopItem {
ArmorShopItem::Frame(armor.armor, armor.slots as usize)

10
src/ship/shops/tool.rs
View File

@ -96,16 +96,6 @@ impl ShopItem for ToolShopItem {
}
}
// impl ToolShopItem {
// pub fn tool_from_item(t: &Tool) -> ToolShopItem {
// ToolShopItem::Tool(t.tool)
// }
// pub fn tech_from_item(d: &TechniqueDisk) -> ToolShopItem {
// ToolShopItem::Tech(*d)
// }
// }
impl From<&Tool> for ToolShopItem {
fn from(tool: &Tool) -> ToolShopItem {
ToolShopItem::Tool(tool.tool)