diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index e6d8bfa6..ebc210a4 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -26,9 +26,7 @@ function InfoComponent(args) { if (isSkill) { const regEx = /(RedPower|BluePower|GreenPower|RedLife|BlueLife|GreenLife|SpeedStat)/; - const infoDescription = reactStringReplace(fullInfo.description, regEx, match => { - return shapes[match](); - }); + const infoDescription = reactStringReplace(fullInfo.description, regEx, match => shapes[match]()); return (
@@ -110,9 +108,7 @@ function InfoComponent(args) { ); }); const regEx = /(RedPower|BluePower|GreenPower|RedLife|BlueLife|GreenLife|SpeedStat)/; - const infoDescription = reactStringReplace(fullInfo.description, regEx, match => { - return shapes[match](); - }); + const infoDescription = reactStringReplace(fullInfo.description, regEx, match => shapes[match]()); return (
diff --git a/server/src/item.rs b/server/src/item.rs index a28d876c..4eb57ea1 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -493,24 +493,24 @@ impl Item { 100 - self.into_skill().unwrap().effect()[0].get_multiplier()), // specs // Base - Item::Power => format!("Base item for increased power. Power determines the damage caused by your skills."), + Item::Power => format!("Base item for increased power. Power determines the base damage and healing of your construct skills."), Item::Life => format!("Base item for increased life. When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), Item::Speed => format!("Base item for increased speed. Speed SpeedStat determines the order in which skills resolve."), // Lifes Upgrades - Item::LifeGG=> format!("Increases construct GreenLife. + Item::LifeGG=> format!("Increases construct GreenLife green life. When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), Item::LifeRR=> format!("Increases construct RedLife. RedLife mitigates red damage that would otherwise reduce your GreenLife."), Item::LifeBB=> format!("Increases construct BlueLife. - BlueDamage dealt to your construct reduces BlueLife before GreenLife."), + BlueLife mitigates blue damage that would otherwise reduce your GreenLife."), Item::LifeRG=> format!("Increases construct GreenLife and RedLife"), Item::LifeGB=> format!("Increases construct GreenLife and BlueLife"), Item::LifeRB=> format!("Increases construct RedLife and BlueLife"), Item::LifeGGPlus => format!("Increases construct GreenLife. - When your construct reaches 0 GreenLife it becomes KO and cannot cast SKILLS."), + When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), Item::LifeRRPlus => format!("Increases construct RedLife. RedDamage dealt to your construct reduces RedLife before GreenLife."), Item::LifeBBPlus => format!("Increases construct BlueLife. @@ -518,12 +518,12 @@ impl Item { Item::LifeRGPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeGBPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeRBPlus => format!("Increases construct RedLife and BlueLife"), - Item::LifeGGPlusPlus => format!("Increases construct GreenLife. - When your construct reaches 0 GreenLife it becomes KO and cannot cast SKILLS."), - Item::LifeRRPlusPlus => format!("Increases construct RedLife. - RedDamage dealt to your construct reduces RedLife before GreenLife."), - Item::LifeBBPlusPlus => format!("Increases construct BlueLife. - BlueDamage dealt to your construct reduces BlueLife before GreenLife."), + Item::LifeGGPlusPlus => format!("Increases construct GreenLife green life. + When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), + Item::LifeRRPlusPlus => format!("Increases construct RedLife red life. + RedLife mitigates red damage that would otherwise reduce your GreenLife."), + Item::LifeBBPlusPlus => format!("Increases construct BlueLife blue life. + BlueLife mitigates blue damage that would otherwise reduce your GreenLife."), Item::LifeRGPlusPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife"), @@ -588,7 +588,7 @@ impl Item { Item::Chaos| Item::ChaosPlus | Item::ChaosPlusPlus => format!( - "Hits twice for red and blue damage. Damage {:?}% red and blue power. Randomly deals 0 to 30% more damage", + "Hits twice for red and blue damage. Damage {:?}% RedPower and BluePower. Randomly deals 0 to 30% more damage", self.into_skill().unwrap().multiplier()), Item::Sustain| @@ -616,7 +616,7 @@ impl Item { Item::Decay| Item::DecayPlus | Item::DecayPlusPlus => format!( - "Reduces healing taken by {:?}% for {:?}T. Deals blue damage {:?}% blue power each turn for {:?}T", + "Reduces healing taken by {:?}% for {:?}T. Deals blue damage {:?}% BluePower each turn for {:?}T", 100 - self.into_skill().unwrap().effect()[0].get_multiplier(), self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().effect()[1].get_skill().unwrap().multiplier(), @@ -627,21 +627,20 @@ impl Item { Item::AbsorbPlusPlus => format!( "Gain Absorb for {:?}T. {} Absorption lasts {:?}T", self.into_skill().unwrap().effect()[0].get_duration(), - "When attacked with Absorb you gain Absorption which increased red and blue power based on Damage taken.", + "When attacked with Absorb you gain Absorption which increases RedPower and BluePower based on Damage taken.", self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration()), Item::Haste| Item::HastePlus | Item::HastePlusPlus => format!( - "Haste increases Speed by {:?}%, Red based Attack skills will strike again dealing {:?}{}. Lasts {:?}T", + "Haste increases SpeedStat by {:?}%, Red Attack based skills will strike again dealing {:?}% SpeedStat as red damage. Lasts {:?}T", self.into_skill().unwrap().effect()[0].get_multiplier() - 100, Skill::HasteStrike.multiplier(), - "% Speed as RedDamage", self.into_skill().unwrap().effect()[0].get_duration()), Item::Heal| Item::HealPlus | - Item::HealPlusPlus => format!("Heals for {:?}% green power.", self.into_skill().unwrap().multiplier()), + Item::HealPlusPlus => format!("Heals target for {:?}% GreenPower.", self.into_skill().unwrap().multiplier()), Item::Hex| Item::HexPlus | @@ -652,10 +651,9 @@ impl Item { Item::Hybrid| Item::HybridPlus | Item::HybridPlusPlus => format!( - "Hybrid increases Green Power by {:?}%, Blue based Attack skills will blast again dealing {:?}{}. Lasts {:?}T", + "Hybrid increases GreenPower by {:?}%, Blue based Attack skills will blast again dealing {:?}% GreenPower as blue damage. Lasts {:?}T", self.into_skill().unwrap().effect()[0].get_multiplier() - 100, Skill::HybridBlast.multiplier(), - "% GreenPower as BluePower", self.into_skill().unwrap().effect()[0].get_duration()), Item::Invert| @@ -666,11 +664,10 @@ impl Item { Item::Counter| Item::CounterPlus | - Item::CounterPlusPlus => format!("{} {:?}% red power and blocks red skills for {:?}T. {} {:?}% red power.", - "Self targetting skill. Recharges RedLife for", + Item::CounterPlusPlus => format!("Self targetting skill. Recharges RedLife for {:?}% RedPower and blocks red skills for {:?}T. + If a red skill is parried the construct will riposte the source dealing {:?}% RedPower as red damage.", self.into_skill().unwrap().multiplier(), self.into_skill().unwrap().effect()[0].get_duration(), - "If a red skill is parried the construct will riposte the source dealing red damage", self.into_skill().unwrap().effect()[0].get_skill().unwrap().multiplier()), Item::Purge| @@ -680,7 +677,7 @@ impl Item { Item::Purify| Item::PurifyPlus | Item::PurifyPlusPlus => format!( - "Remove debuffs and heals for {:?}% green power per debuff removed.", + "Remove debuffs and heals for {:?}% GreenPower per debuff removed.", self.into_skill().unwrap().multiplier()), Item::Reflect| @@ -692,7 +689,7 @@ impl Item { Item::Recharge| Item::RechargePlus | Item::RechargePlusPlus => format!( - "Recharge Red and Blue Life based on {:?} RedPower and BluePower", + "Recharge RedLife and BlueLife based on {:?}% RedPower and BluePower", self.into_skill().unwrap().multiplier()), Item::Ruin| @@ -704,16 +701,17 @@ impl Item { Item::Link| Item::LinkPlus | Item::LinkPlusPlus => format!( - "Caster links with target. Linked constructs split incoming Damage evenly. Recharges target Blue Life {:?}% of BluePower", + "Caster links with target. Linked constructs split incoming Damage evenly. + Recharges target BlueLife based on {:?}% of BluePower", self.into_skill().unwrap().multiplier()), Item::Silence| Item::SilencePlus | Item::SilencePlusPlus => format!( - "Block the target from using blue skills for {:?}T and deals blue damage {:?}% blue power. {}", + "Block the target from using blue skills for {:?}T and deals {:?}% BluePower as blue damage. + Deals 45% more Damage per blue skill on target", self.into_skill().unwrap().effect()[0].get_duration(), - self.into_skill().unwrap().multiplier(), - "Deals 45% more Damage per blue skill on target"), + self.into_skill().unwrap().multiplier()), Item::Slay| Item::SlayPlus | @@ -724,17 +722,17 @@ impl Item { Item::Sleep| Item::SleepPlus | Item::SleepPlusPlus => format!( - "Stun for {:?}T and heal for {:?}% GreenPower.", + "Stun for {:?}T and heal target for {:?}% GreenPower.", self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().multiplier()), Item::Restrict| Item::RestrictPlus | Item::RestrictPlusPlus => format!( - "Block the target from using red skills for {:?}T and deals RedDamage {:?}% RedPower. {}", + "Block the target from using red skills for {:?}T and deals {:?}% RedPower as red damage. {}", self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().multiplier(), - "Deals 35% more Damage per red skill on target"), + "Deals 35% more damage per red skill on target"), Item::Bash| Item::BashPlus | @@ -747,13 +745,13 @@ impl Item { Item::Strike| Item::StrikePlus | Item::StrikePlusPlus => format!( - "Hits at maximum speed dealing RedDamage {:?}% RedPower", + "Strike the target with speed dealing {:?}% RedPower as red damage", self.into_skill().unwrap().multiplier()), Item::Siphon| Item::SiphonPlus | Item::SiphonPlusPlus => format!( - "Deals BlueDamage {:?}% BluePower each turn and heals caster based on Damage dealt. Lasts {:?}T", + "Deals {:?}% BluePower as blue damage each turn and heals caster based on damage dealt. Lasts {:?}T", self.into_skill().unwrap().effect()[0].get_skill().unwrap().multiplier(), self.into_skill().unwrap().effect()[0].get_duration()), @@ -767,7 +765,7 @@ impl Item { Item::Break| Item::BreakPlus | Item::BreakPlusPlus => format!( - "Stun the target for {:?}T and applies Vulnerable increasing RedDamage taken by {:?}% for {:?}T", + "Stun the target for {:?}T and applies Vulnerable increasing red damage taken by {:?}% for {:?}T", self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().effect()[1].get_multiplier() - 100, self.into_skill().unwrap().effect()[1].get_duration()),