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

Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

Browse Source
This commit is contained in:
Mashy 2019-03-26 13:36:17 +10:00
commit 514b9b0b53
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/WORKLOG.md
View File

@ -22,7 +22,7 @@ ensure all skills impl
Skill::Slay -> red attack with bonus somethingorother for blue / maim no healing
Hatred -> damage received converted into bonus dmg
change inversion to several events
siphon test
make parry semi-aggressive
constants

4
server/src/game.rs
View File

@ -520,6 +520,10 @@ impl Game {
self.log.push(format!("[{:}] {:} {:?} {:} INVERTED",
speed, source.name, skill, target.name)),
Event::Reflection { skill } =>
self.log.push(format!("[{:}] {:} {:?} {:} REFLECTED",
speed, source.name, skill, target.name)),
Event::Effect { skill, effect, duration } =>
self.log.push(format!("[{:}] {:} {:?} {:} {:?} {:}T",
speed, source.name, skill, target.name, effect, duration)),

2
server/src/skill.rs
View File

@ -78,6 +78,7 @@ pub enum Event {
Healing { skill: Skill, amount: u64, overhealing: u64 },
Recharge { skill: Skill, red: u64, blue: u64 },
Inversion { skill: Skill },
Reflection { skill: Skill },
Effect { skill: Skill, effect: Effect, duration: u8 },
Removal { effect: Effect },
Evasion { skill: Skill, evasion_rating: u64 },
@ -630,6 +631,7 @@ impl Skill {
if source.affected(Effect::Reflect) {
return results;
}
results.push(Resolution::new(source, target).event(Event::Reflection { skill: *self }));
return self.resolve(target, source);
}