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

combat phase fixes to decay, siphon tick

Browse Source
This commit is contained in:
Mashy 2019-05-02 12:19:29 +10:00
parent 5029e60746
commit b368ada693
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/utils.jsx
View File

@ -218,6 +218,9 @@ function getCombatSequence(event) {
if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL']; if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL'];
if (['Healing'].includes(event[0]) && event[1].skill === 'Slay') return ['POST_SKILL']; if (['Healing'].includes(event[0]) && event[1].skill === 'Slay') return ['POST_SKILL'];
if (['Effect'].includes(event[0])
&& event[1].skill === 'Decay' && event[1].effect === 'Wither') return ['POST_SKILL'];
if (['Damage'].includes(event[0]) if (['Damage'].includes(event[0])
&& event[1].skill === 'Chaos' && event[1].colour === 'RedDamage') return ['POST_SKILL']; && event[1].skill === 'Chaos' && event[1].colour === 'RedDamage') return ['POST_SKILL'];

4
server/src/skill.rs Executable file → Normal file
View File

@ -651,7 +651,7 @@ impl Skill {
Skill::Chaos => None, Skill::Chaos => None,
Skill::Amplify => Some(1), Skill::Amplify => Some(1),
Skill::Invert => Some(2), Skill::Invert => Some(2),
Skill::Decay => None, // dot Skill::Decay => Some(1), // dot
Skill::DecayTick => None, Skill::DecayTick => None,
Skill::Siphon => None, Skill::Siphon => None,
Skill::SiphonTick => None, Skill::SiphonTick => None,
@ -1155,7 +1155,7 @@ fn siphon_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions, s
match e { match e {
Event::Damage { amount, mitigation: _, colour: _, skill: _ } => { Event::Damage { amount, mitigation: _, colour: _, skill: _ } => {
results.push(Resolution::new(source, target).event(e)); results.push(Resolution::new(source, target).event(e));
let heal = source.deal_green_damage(Skill::Siphon, amount); let heal = source.deal_green_damage(Skill::SiphonTick, amount);
for h in heal { for h in heal {
results.push(Resolution::new(source, source).event(h)); results.push(Resolution::new(source, source).event(h));
}; };