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

put display effects back

Browse Source
This commit is contained in:
ntr 2019-12-08 16:17:12 +10:00
parent b9c754dc02
commit 8b4b3a56e9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/game.rs
View File

@ -901,7 +901,7 @@ impl Resolution {
pub type Disable = Vec<Effect>; pub type Disable = Vec<Effect>;
pub type Direction = (i8, i8); pub type Direction = (i8, i8);
#[derive(Debug,Clone,Copy,PartialEq,Serialize,Deserialize)] #[derive(Debug,Clone,PartialEq,Serialize,Deserialize)]
pub enum Event { pub enum Event {
Cast { construct: Uuid, player: Uuid, direction: Direction }, Cast { construct: Uuid, player: Uuid, direction: Direction },
Hit { construct: Uuid, player: Uuid, direction: Direction }, Hit { construct: Uuid, player: Uuid, direction: Direction },
@ -941,12 +941,13 @@ impl Event {
// used to show the progress of a construct // used to show the progress of a construct
// while the resolutions are animating // while the resolutions are animating
#[derive(Debug,Clone,Copy,PartialEq,Serialize,Deserialize)] #[derive(Debug,Clone,PartialEq,Serialize,Deserialize)]
pub struct EventConstruct { pub struct EventConstruct {
pub id: Uuid, id: Uuid,
pub red: usize, red: usize,
pub green: usize, green: usize,
pub blue: usize, blue: usize,
effects: Vec<ConstructEffect>,
} }
impl EventConstruct { impl EventConstruct {
@ -956,6 +957,7 @@ impl EventConstruct {
red: construct.red_life(), red: construct.red_life(),
green: construct.green_life(), green: construct.green_life(),
blue: construct.blue_life(), blue: construct.blue_life(),
effects: construct.effects.clone(),
} }
} }
} }