Minor cleanup
parent
132148fee3
commit
73f540d30a
|
@ -1,6 +1,6 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use galactica_content::{Content, GunPoint, Outfit, OutfitHandle, OutfitSpace, SpriteHandle};
|
use galactica_content::{GunPoint, Outfit, OutfitHandle, OutfitSpace};
|
||||||
|
|
||||||
/// Possible outcomes when adding an outfit
|
/// Possible outcomes when adding an outfit
|
||||||
pub enum OutfitAddResult {
|
pub enum OutfitAddResult {
|
||||||
|
@ -61,15 +61,16 @@ pub struct OutfitSet {
|
||||||
/// if value is Some, this point is taken.
|
/// if value is Some, this point is taken.
|
||||||
gun_points: HashMap<GunPoint, Option<OutfitHandle>>,
|
gun_points: HashMap<GunPoint, Option<OutfitHandle>>,
|
||||||
|
|
||||||
// Outfit values
|
/// Outfit values
|
||||||
// This isn't strictly necessary, but we don't want to
|
/// This isn't strictly necessary, but we don't want to
|
||||||
// re-compute this on each frame.
|
/// re-compute this on each frame.
|
||||||
engine_thrust: f32,
|
engine_thrust: f32,
|
||||||
steer_power: f32,
|
steer_power: f32,
|
||||||
shield_strength: f32,
|
shield_strength: f32,
|
||||||
|
|
||||||
// Delay, generation
|
/// All shield generators in this outfit set
|
||||||
// TODO: struct
|
// These can't be summed into one value, since each has a
|
||||||
|
// distinct delay.
|
||||||
shield_generators: Vec<ShieldGenerator>,
|
shield_generators: Vec<ShieldGenerator>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,19 +159,6 @@ impl OutfitSet {
|
||||||
|
|
||||||
return OutfitRemoveResult::Ok;
|
return OutfitRemoveResult::Ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: pick these better
|
|
||||||
/// Returns the flare sprite that should be shown when this
|
|
||||||
/// ship is using its thrusters
|
|
||||||
pub fn get_flare_sprite(&self, ct: &Content) -> Option<SpriteHandle> {
|
|
||||||
for i in self.outfits.keys() {
|
|
||||||
let c = ct.get_outfit(*i);
|
|
||||||
if c.engine_flare_sprite.is_some() {
|
|
||||||
return c.engine_flare_sprite;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Simple getters to make sure nobody meddles with our internal state
|
// Simple getters to make sure nobody meddles with our internal state
|
||||||
|
|
Loading…
Reference in New Issue