diff --git a/server/src/item.rs b/server/src/item.rs index ae9e50db..2831eaab 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -251,7 +251,7 @@ impl Item { Item::Red => format!("Combine with skills and specs to create upgraded items. \n Speed and chaos."), // base skills - Item::Attack => format!("Deal {:?}% RedDamage", self.into_skill().unwrap().multiplier()), + Item::Attack => format!("Deal red damage based on {:?}% red power", self.into_skill().unwrap().multiplier()), Item::Block => format!("description"), Item::Stun => format!("description"), Item::Buff => format!("description"), @@ -287,41 +287,146 @@ impl Item { Item::GBSpeedI => format!("description"), Item::RBSpeedI => format!("description"), - Item::Amplify => format!("description"), - Item::Banish => format!("description"), - Item::Blast => format!("description"), - Item::Chaos => format!("description"), - Item::Clutch => format!("description"), - Item::Corrupt => format!("description"), - Item::Curse => format!("description"), - Item::Decay => format!("description"), - Item::Hostility => format!("description"), - Item::Haste => format!("description"), - Item::Heal => format!("description"), - Item::Hex => format!("description"), - Item::Impurity => format!("description"), - Item::Invert => format!("description"), - Item::Parry => format!("description"), - Item::Purge => format!("description"), - Item::Purify => format!( - "Remove debuffs and heal for {:?}% GreenDamage per debuff removed.", + // Skills <- need to move effect mulltipliers into skills + Item::Amplify => format!("Increase red and blue power by 50%. Lasts {:?}T", self.into_skill().unwrap().duration()), + + Item::Banish => format!("Banish target for {:?}T", self.into_skill().unwrap().duration()), + + Item::Blast => format!("Deals blue damage {:?}% blue power.", self.into_skill().unwrap().multiplier()), + + Item::Chaos => format!( + "Hits twice for red and blue damage. Damage is random 0 to 30% + {:?}% red and blue power.", self.into_skill().unwrap().multiplier()), - Item::Reflect => format!("description"), - Item::Recharge => format!("description"), - Item::Ruin => format!("description"), - Item::Scatter => format!("description"), - Item::Silence => format!("description"), - Item::Slay => format!("description"), - Item::Sleep => format!("description"), - Item::Snare => format!("description"), - Item::Strangle => format!("description"), - Item::Strike => format!("description"), - Item::StrikeII => format!("description"), - Item::StrikeIII => format!("description"), - Item::Siphon => format!("description"), - Item::Taunt => format!("description"), - Item::Throw => format!("description"), - Item::Triage => format!("description"), + + Item::Clutch => format!("description"), // WIP + + Item::Corrupt => format!( + "Self targetting defensive for {:?}T. Applies corrupt to attackers dealing blue damage {:?}% blue power per turn for {:?}T.", + self.into_skill().unwrap().duration(), + Skill::Corrupt.multiplier(), + Skill::Corrupt.duration()), + + Item::Curse => format!( + "Increases red and blue damage taken by 50%. Lasts {:?}T", + self.into_skill().unwrap().duration()), + + Item::Decay => format!( + "Reduces healing taken by 50% and deals blue damage {:?}% blue power each turn. Lasts {:?}T", + self.into_skill().unwrap().multiplier(), + self.into_skill().unwrap().duration()), + + Item::Hostility => format!( + "Gain Hostility for {:?}T. {} Hatred lasts {:?}T", + self.into_skill().unwrap().duration(), + "When attacked by Hostility you gain Hatred which increased red and blue power based on damage taken.", + self.into_skill().unwrap().secondary_duration()), + + Item::Haste => format!( + "{} {:?}{}. Lasts {:?}T", + "Haste increases Speed by 50%, Red based Attack skills will strike again dealing", + Skill::HasteStrike.multiplier(), + "% Speed as Red Damage", + self.into_skill().unwrap().duration()), + + Item::Heal => format!("Heals for {:?}% green power.", self.into_skill().unwrap().multiplier()), + + Item::Hex => format!("Applies Hex for {:?}T", self.into_skill().unwrap().duration()), + + Item::Impurity => format!( + "{} {:?}{}. Lasts {:?}T", + "Impurity increases Green Power by 50%, Blue based Attack skills will blast again dealing", + Skill::HasteStrike.multiplier(), + "% Green Power as Blue Damage", + self.into_skill().unwrap().duration()), + + Item::Invert => format!( + "Reverse healing into damage and damage into healing."), + + Item::Parry => format!("{} {:?}% red power and blocks red skills for {:?}T. {} {:?}% red power.", + "Self targetting skill. Recharges red life for", + self.into_skill().unwrap().multiplier(), + self.into_skill().unwrap().duration(), + "If a red skill is parried the cryp will riposte the source dealing red damage", + Skill::Riposte.multiplier()), + + Item::Purge => format!("Remove buffs from target cryp"), + + Item::Purify => format!( + "Remove debuffs and heals for {:?}% green power per debuff removed.", + self.into_skill().unwrap().multiplier()), + + Item::Reflect => format!( + "Reflect incoming skills to source. Lasts {:?}T", + self.into_skill().unwrap().duration()), + + Item::Recharge => format!( + "Recharge red and blue shield based on {:?} red and blue power", + self.into_skill().unwrap().multiplier()), + + Item::Ruin => format!( + "Team wide Stun for {:?}T. Stunned cryps are unable to cast skills.", + self.into_skill().unwrap().duration()), + + Item::Scatter => format!( + "Caster links with target. Linked cryps split incoming damage evenly. Recharges target blue shield {:?}% of blue power", + self.into_skill().unwrap().multiplier()), + + Item::Silence => format!( + "Block the target from using blue skills for {:?}T and deals blue damage {:?}% blue power. {}", + self.into_skill().unwrap().duration(), + self.into_skill().unwrap().multiplier(), + "Deals 45% more damage per blue skill on target"), + + Item::Slay => format!( + "Deals red damage {:?}% red power and provides self healing based on damage dealt.", + self.into_skill().unwrap().multiplier()), + + Item::Sleep => format!( + "Stun for {:?}T and heal for {:?}% green power.", + self.into_skill().unwrap().duration(), + self.into_skill().unwrap().multiplier()), + + Item::Snare => format!( + "Block the target from using red skills for {:?}T and deals red damage {:?}% red power. {}", + self.into_skill().unwrap().duration(), + self.into_skill().unwrap().multiplier(), + "Deals 35% more damage per red skill on target"), + + Item::Strangle => format!( + "{} While strangling deal red damage each turn {:?}% red power. Lasts {:?}T.", + "Strangle the target disabling skills from both the caster and the target.", + self.into_skill().unwrap().multiplier(), + self.into_skill().unwrap().duration()), + + Item::Strike => format!( + "Hits at maximum speeding dealing red damage {:?}% red power", + self.into_skill().unwrap().multiplier()), + Item::StrikeII => format!( + "Hits at maximum speeding dealing red damage {:?}% red power", + self.into_skill().unwrap().multiplier()), + Item::StrikeIII => format!( + "Hits at maximum speeding dealing red damage {:?}% red power", + self.into_skill().unwrap().multiplier()), + + Item::Siphon => format!( + "Deals blue damage {:?}% blue power each turn and heals caster based on damage dealt . Lasts {:?}T", + self.into_skill().unwrap().multiplier(), + self.into_skill().unwrap().duration()), + + Item::Taunt => format!("{} {:?}T. Recharges red life for {:?} red power.", + "Taunt redirects skills against the team to target, lasts", + self.into_skill().unwrap().duration(), + self.into_skill().unwrap().multiplier()), + + Item::Throw => format!( + "Stun the target for {:?}T and applies Vulnerable increasing red damage taken by 50% for {:?}T", + self.into_skill().unwrap().duration(), + self.into_skill().unwrap().secondary_duration()), + + Item::Triage => format!( + "Heals target for {:?}% green power each turn. Lasts {:?}T", + self.into_skill().unwrap().multiplier(), + self.into_skill().unwrap().duration()), _ => format!("..."), } diff --git a/server/src/skill.rs b/server/src/skill.rs index 3839df43..5d4998b6 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -1103,7 +1103,7 @@ fn snare(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions, skill: let s_multi = target.skills .iter() .fold(100, |acc, cs| match cs.skill.category() { - Category::Red => acc + 45, + Category::Red => acc + 35, _ => acc, });