menu styles
This commit is contained in:
+10
-2
@@ -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
@@ -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"),
|
||||
|
||||
Reference in New Issue
Block a user