diff --git a/client/src/components/vbox.utils.jsx b/client/src/components/vbox.utils.jsx index 4a4a90d1..9fcaca5c 100644 --- a/client/src/components/vbox.utils.jsx +++ b/client/src/components/vbox.utils.jsx @@ -96,7 +96,7 @@ function genItemInfo(item, itemInfo, player) { itemSourceInfo = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]()); } - const cooldown = isSkill && fullInfo.cooldown ?
{fullInfo.cooldown} Turn delay
: null; + const cooldown = isSkill && fullInfo.cooldown ?
{fullInfo.delay} turn delay, {fullInfo.cooldown} turn cooldown
: null; const speed = isSkill ?
Speed {shapes.SpeedStat()} multiplier {fullInfo.speed * 4}%
diff --git a/core/src/item.rs b/core/src/item.rs index 185b1832..9b13f568 100644 --- a/core/src/item.rs +++ b/core/src/item.rs @@ -1362,6 +1362,7 @@ pub struct ItemInfo { pub values: Option, pub skill: bool, pub speed: Option, + pub delay: Cooldown, pub cooldown: Cooldown, pub description: String, } @@ -1406,6 +1407,10 @@ pub fn item_info() -> ItemInfoCtr { Some(s) => s.base_cd(), None => None }, + delay: match v.into_skill() { + Some(s) => s.delay(), + None => None + }, }) .collect::>(); diff --git a/core/src/skill.rs b/core/src/skill.rs index 12045329..f26729a5 100644 --- a/core/src/skill.rs +++ b/core/src/skill.rs @@ -571,7 +571,7 @@ impl Skill { Skill::Counter| Skill::CounterPlus | - Skill::CounterPlusPlus => None, // avoid all damage + Skill::CounterPlusPlus => None, Skill::Restrict | Skill::RestrictPlus |