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 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1eff61629a - Show all commits

4
src/ship/items/inventory.rs
View File

@ -256,11 +256,9 @@ impl InventoryItem {
Some((ArmorShopItem::unit_from_item(u).price() / 8) as u32) Some((ArmorShopItem::unit_from_item(u).price() / 8) as u32)
}, },
ItemDetail::Tool(t) => { ItemDetail::Tool(t) => {
if !matches!(t.tool, ToolType::PhotonDrop | ToolType::PhotonSphere | ToolType::PhotonCrystal) { if !matches!(t.tool, ToolType::PhotonDrop | ToolType::PhotonSphere | ToolType::PhotonCrystal) && t.is_rare_item() {
if t.is_rare_item() {
return Some(10u32) return Some(10u32)
} }
}
Some((ToolShopItem::tool_from_item(t).price() / 8) as u32) Some((ToolShopItem::tool_from_item(t).price() / 8) as u32)
}, },
ItemDetail::TechniqueDisk(d) => { // TODO: are all techs the same? ItemDetail::TechniqueDisk(d) => { // TODO: are all techs the same?