From 870d74b7eb8cbdb1c072e99265b666ae0c905d61 Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 14 Dec 2018 13:57:32 +1100 Subject: [PATCH] renmae to basecd --- server/src/cryp.rs | 4 ++-- server/src/skill.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/cryp.rs b/server/src/cryp.rs index e9781b29..83d9dc55 100644 --- a/server/src/cryp.rs +++ b/server/src/cryp.rs @@ -24,7 +24,7 @@ impl CrypSkill { CrypSkill { skill, self_targeting: skill.self_targeting(), - cd: skill.cd(), + cd: skill.base_cd(), } } } @@ -255,7 +255,7 @@ impl Cryp { pub fn reduce_cooldowns(&mut self) -> &mut Cryp { for skill in self.skills.iter_mut() { // if used cooldown - if skill.skill.cd().is_some() { + if skill.skill.base_cd().is_some() { // what is the current cd if let Some(current_cd) = skill.cd { diff --git a/server/src/skill.rs b/server/src/skill.rs index c89fdbb3..4b0cc333 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -50,7 +50,7 @@ impl Cast { } pub fn used_cooldown(&self) -> bool { - return self.skill.cd().is_some(); + return self.skill.base_cd().is_some(); } } @@ -344,7 +344,7 @@ pub enum Skill { } impl Skill { - pub fn cd(&self) -> Cooldown { + pub fn base_cd(&self) -> Cooldown { match self { Skill::Attack => None,