diff --git a/core/src/game.rs b/core/src/game.rs index ae5df71c..b9e70d37 100644 --- a/core/src/game.rs +++ b/core/src/game.rs @@ -901,7 +901,7 @@ impl Resolution { pub type Disable = Vec; pub type Direction = (i8, i8); -#[derive(Debug,Clone,Copy,PartialEq,Serialize,Deserialize)] +#[derive(Debug,Clone,PartialEq,Serialize,Deserialize)] pub enum Event { Cast { 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 // while the resolutions are animating -#[derive(Debug,Clone,Copy,PartialEq,Serialize,Deserialize)] +#[derive(Debug,Clone,PartialEq,Serialize,Deserialize)] pub struct EventConstruct { - pub id: Uuid, - pub red: usize, - pub green: usize, - pub blue: usize, + id: Uuid, + red: usize, + green: usize, + blue: usize, + effects: Vec, } impl EventConstruct { @@ -956,6 +957,7 @@ impl EventConstruct { red: construct.red_life(), green: construct.green_life(), blue: construct.blue_life(), + effects: construct.effects.clone(), } } }