menu styles

This commit is contained in:
ntr
2019-05-30 14:42:32 +10:00
parent dc6de694da
commit f94aff376d
5 changed files with 48 additions and 10 deletions
+10 -2
View File
@@ -757,8 +757,16 @@ impl Construct {
skill,
};
// info!("{:?} {:?} adding effect", self.name, effect.effect);
self.effects.push(effect);
if let Some(p) = self.effects.iter().position(|ce| ce.effect == effect.effect) {
// duplicate effect
// replace existing
self.effects[p] = effect;
} else {
// new effect
// info!("{:?} {:?} adding effect", self.name, effect.effect);
self.effects.push(effect);
}
return result;
}
+1 -1
View File
@@ -1617,7 +1617,7 @@ fn heal(source: &mut Construct, target: &mut Construct, mut results: Resolutions
}
fn triage(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
let ConstructEffect { effect, duration, meta, tick: _ } = skill.effect().first().unwrap().clone();
let ConstructEffect { effect, duration, meta, tick: _ } = skill.effect()[0];
let tick_skill = match meta {
Some(EffectMeta::Skill(s)) => s,
_ => panic!("no triage tick skill"),