From c5c6169806f91a933217aef47b70d98aade5671f Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 9 Dec 2019 15:52:49 +1000 Subject: [PATCH] removeall --- core/src/game.rs | 4 ++-- core/src/skill.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/game.rs b/core/src/game.rs index f3202ed6..d37724ed 100644 --- a/core/src/game.rs +++ b/core/src/game.rs @@ -863,7 +863,7 @@ pub enum Value { // Skills { construct: Uuid, colour: Colour }, } -#[derive(Debug,Clone,PartialEq,Serialize,Deserialize)] +#[derive(Debug,PartialEq)] pub enum Action { Hit, Cast, @@ -871,7 +871,7 @@ pub enum Action { Damage { construct: Uuid, values: Vec, colour: Colour }, Effect { construct: Uuid, effect: ConstructEffect }, Remove { construct: Uuid, effect: Effect }, - RemoveAll { construct: Uuid }, + RemoveAll { construct: Uuid }, IncreaseCooldowns { construct: Uuid, turns: usize }, // Recharge { skill: Skill, red: usize, blue: usize }, } diff --git a/core/src/skill.rs b/core/src/skill.rs index 9d83a746..3cc11b28 100644 --- a/core/src/skill.rs +++ b/core/src/skill.rs @@ -552,7 +552,7 @@ impl Cast { ], Skill::Purge => vec![ - Action::Purge { + Action::RemoveAll { construct: self.target, }, Action::Effect { @@ -561,7 +561,7 @@ impl Cast { }, ], Skill::PurgePlus => vec![ - Action::Purge { + Action::RemoveAll { construct: self.target, }, Action::Effect { @@ -570,7 +570,7 @@ impl Cast { }, ], Skill::PurgePlusPlus => vec![ - Action::Purge { + Action::RemoveAll { construct: self.target, }, Action::Effect {