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

remove inversion event

Browse Source
This commit is contained in:
Mashy 2019-10-23 19:17:57 +10:00
parent a59a13e2e6
commit e6e7713539
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/animations.utils.jsx
View File

@ -75,8 +75,6 @@ function getObjects(resolution, stages, game, account) {
function getSequence(resolution) { function getSequence(resolution) {
if (!resolution.event) return []; if (!resolution.event) return [];
if (resolution.event[0] === 'Inversion') return [];
switch (resolution.stages) { switch (resolution.stages) {
case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL']; case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
case 'StartEnd': return ['START_SKILL', 'END_SKILL']; case 'StartEnd': return ['START_SKILL', 'END_SKILL'];

6
server/src/construct.rs
View File

@ -606,7 +606,7 @@ impl Construct {
}); });
}, },
true => { true => {
events.push(Event::Inversion { skill }); // events.push(Event::Inversion { skill });
// there is no green shield (yet) // there is no green shield (yet)
let current_green_life = self.green_life(); let current_green_life = self.green_life();
@ -669,7 +669,7 @@ impl Construct {
}); });
}, },
true => { true => {
events.push(Event::Inversion { skill }); // events.push(Event::Inversion { skill });
let current_green_life = self.green_life(); let current_green_life = self.green_life();
self.green_life.increase(modified_power); self.green_life.increase(modified_power);
@ -738,7 +738,7 @@ impl Construct {
}); });
}, },
true => { true => {
events.push(Event::Inversion { skill }); // events.push(Event::Inversion { skill });
let current_green_life = self.green_life(); let current_green_life = self.green_life();
self.green_life.increase(modified_power); self.green_life.increase(modified_power);

8
server/src/skill.rs
View File

@ -2004,10 +2004,10 @@ mod tests {
// attack should heal and recharge red shield // attack should heal and recharge red shield
let mut results = attack(&mut x, &mut y, vec![], Skill::Attack); let mut results = attack(&mut x, &mut y, vec![], Skill::Attack);
match results.remove(0).event { // match results.remove(0).event {
Event::Inversion { skill } => assert_eq!(skill, Skill::Attack), // Event::Inversion { skill } => assert_eq!(skill, Skill::Attack),
_ => panic!("not inversion"), // _ => panic!("not inversion"),
}; //};
match results.remove(0).event { match results.remove(0).event {
Event::Healing { skill: _, overhealing: _, amount } => assert!(amount > 0), Event::Healing { skill: _, overhealing: _, amount } => assert!(amount > 0),