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

remove comments and don't be canadian

Browse Source
This commit is contained in:
andy 2020-10-23 23:12:11 -03:00
parent 790668f6f7
commit e256423dfa
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/main.rs
View File

@ -234,7 +234,7 @@ fn main() {
item::unit::Unit { item::unit::Unit {
unit: item::unit::UnitType::PriestMind, unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus), modifier: Some(item::unit::UnitModifier::Minus),
armour_slot: 0, armor_slot: 0,
} }
), ),
location: ItemLocation::Inventory { location: ItemLocation::Inventory {
@ -250,7 +250,7 @@ fn main() {
item::unit::Unit { item::unit::Unit {
unit: item::unit::UnitType::PriestMind, unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus), modifier: Some(item::unit::UnitModifier::Minus),
armour_slot: 1, armor_slot: 1,
} }
), ),
location: ItemLocation::Inventory { location: ItemLocation::Inventory {
@ -266,7 +266,7 @@ fn main() {
item::unit::Unit { item::unit::Unit {
unit: item::unit::UnitType::PriestMind, unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus), modifier: Some(item::unit::UnitModifier::Minus),
armour_slot: 2, armor_slot: 2,
} }
), ),
location: ItemLocation::Inventory { location: ItemLocation::Inventory {
@ -282,7 +282,7 @@ fn main() {
item::unit::Unit { item::unit::Unit {
unit: item::unit::UnitType::PriestMind, unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus), modifier: Some(item::unit::UnitModifier::Minus),
armour_slot: 3, armor_slot: 3,
} }
), ),
location: ItemLocation::Inventory { location: ItemLocation::Inventory {

6
src/entity/item/unit.rs
View File

@ -335,7 +335,7 @@ pub enum UnitModifier {
pub struct Unit { pub struct Unit {
pub unit: UnitType, pub unit: UnitType,
pub modifier: Option<UnitModifier>, pub modifier: Option<UnitModifier>,
pub armour_slot: u8, // 0 - 3 = armour slot 1 - 4 pub armor_slot: u8,
} }
@ -362,7 +362,7 @@ impl Unit {
}, },
} }
} }
result[4] = self.armour_slot; result[4] = self.armor_slot;
result result
} }
@ -380,7 +380,7 @@ impl Unit {
Ok(Unit{ Ok(Unit{
unit: u.unwrap(), unit: u.unwrap(),
modifier: m, modifier: m,
armour_slot: data[4], armor_slot: data[4],
}) })
} }
else { else {

4
src/ship/drops/generic_unit.rs
View File

@ -89,7 +89,7 @@ impl GenericUnitTable {
ItemDropType::Unit(Unit { ItemDropType::Unit(Unit {
unit: unit_type, unit: unit_type,
modifier: unit_modifier, modifier: unit_modifier,
armour_slot: 0, armor_slot: 0,
}) })
}) })
} }
@ -117,7 +117,7 @@ mod test {
assert!(gut.get_drop(&area, &mut rng) == Some(ItemDropType::Unit(Unit { assert!(gut.get_drop(&area, &mut rng) == Some(ItemDropType::Unit(Unit {
unit: unit, unit: unit,
modifier: umod, modifier: umod,
armour_slot: 0, armor_slot: 0,
}))); })));
} }
} }

2
src/ship/drops/rare_drop_table.rs
View File

@ -128,7 +128,7 @@ impl RareDropTable {
ItemDropType::Unit(Unit { ItemDropType::Unit(Unit {
unit: unit, unit: unit,
modifier: None, modifier: None,
armour_slot: 0, armor_slot: 0,
}) })
}, },
RareDropItem::Tool(tool) => { RareDropItem::Tool(tool) => {

6
src/ship/items/manager.rs
View File

@ -912,13 +912,13 @@ impl ItemManager {
inventory_item.item = ItemDetail::Unit(unit::Unit { inventory_item.item = ItemDetail::Unit(unit::Unit {
unit: u.unit, unit: u.unit,
modifier: u.modifier, modifier: u.modifier,
armour_slot: ((equip_slot & 0x7) - 1) % 4, armor_slot: ((equip_slot & 0x7) - 1) % 4,
}); });
} else { } else {
inventory_item.item = ItemDetail::Unit(unit::Unit { inventory_item.item = ItemDetail::Unit(unit::Unit {
unit: u.unit, unit: u.unit,
modifier: u.modifier, modifier: u.modifier,
armour_slot: 0, armor_slot: 0,
}); });
} }
}; };
@ -953,7 +953,7 @@ impl ItemManager {
inventory_item.item = ItemDetail::Unit(unit::Unit { inventory_item.item = ItemDetail::Unit(unit::Unit {
unit: u.unit, unit: u.unit,
modifier: u.modifier, modifier: u.modifier,
armour_slot: 0, armor_slot: 0,
}); });
}; };
entity_gateway.change_item_location(&inventory_item.entity_id, ItemLocation::Inventory{ entity_gateway.change_item_location(&inventory_item.entity_id, ItemLocation::Inventory{

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

@ -89,7 +89,7 @@ impl ShopItem for ArmorShopItem {
ItemDetail::Unit(Unit { ItemDetail::Unit(Unit {
unit: *unit, unit: *unit,
modifier: None, modifier: None,
armour_slot: 0, armor_slot: 0,
}) })
}, },
} }