ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source 
base = develop
This commit is contained in:
ntr 2020-01-13 16:58:47 +10:00
commit caa5d31012
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/game.construct.anim.text.jsx
View File

@ -63,6 +63,8 @@ class AnimText extends preact.Component {
} }
case 'Ko': return <h1><span>KO!</span></h1>; case 'Ko': return <h1><span>KO!</span></h1>;
case 'Reflection': return <h1><span>REFLECT</span></h1>; case 'Reflection': return <h1><span>REFLECT</span></h1>;
case 'CooldownIncrease': return <h1>+{event.turns}T cooldowns</h1>;
case 'CooldownDecrease': return <h1>-{event.turns}T cooldowns</h1>;
default: return false; default: return false;
} }
}; };

12
core/src/construct.rs
View File

@ -470,24 +470,26 @@ impl Construct {
} }
pub fn increase_cooldowns(&mut self, turns: usize) -> Vec<Event> { pub fn increase_cooldowns(&mut self, turns: usize) -> Vec<Event> {
let mut events = vec![]; let mut cd_event = false;
for skill in self.skills.iter_mut() { for skill in self.skills.iter_mut() {
if skill.skill.base_cd().is_some() { // if has a cooldown if skill.skill.base_cd().is_some() { // if has a cooldown
cd_event = true;
match skill.cd { match skill.cd {
Some(cd) => { Some(cd) => {
skill.cd = Some(cd.saturating_add(turns)); skill.cd = Some(cd.saturating_add(turns));
events.push(Event::CooldownIncrease { construct: self.id, turns })
}, },
None => { None => {
skill.cd = Some(turns); skill.cd = Some(turns);
events.push(Event::CooldownIncrease { construct: self.id, turns })
}, },
} }
} }
} }
return events; if cd_event {
return vec![Event::CooldownIncrease { construct: self.id, turns }];
}
return vec![];
} }
pub fn reduce_cooldowns(&mut self) -> &mut Construct { pub fn reduce_cooldowns(&mut self) -> &mut Construct {