Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0

CHANGELOG.md

@@ -27,11 +27,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Vbox phase everything is now in one view
     - Game constructs and animations are much larger in mobile view
 
+- Amplify
+    Now increases green power
+
 - Absorb
     - Reduced duration and cooldown from 2T -> 1T (Absorption duration unchanged)
     - Absorption damage is now based on all damage taken (previously only green damage taken)
     - Now recharges blue life based on 95 / 120 / 155 blue power
 
+- Banish
+    Reduced cooldown to 1T
+
+- Decay
+    Removed cooldown
+
+- Haste / Hybrid
+    Fixed issue when hybridblast and hastestrike wouldn't trigger from upgraded + skills
+
 - Intercept
     - Reduced duration to 1T down from 2T
     - Reduced cooldown to 1T down from 2T

client/src/utils.jsx

@@ -264,7 +264,7 @@ function effectInfo(i) {
     }
 
     switch (i.effect) {
-    case 'Amplify': return `Increases construct RedPower and BluePower by  ${i.meta[1] - 100}%`;
+    case 'Amplify': return `Increases construct RedPower BluePower GreenPower by ${i.meta[1] - 100}%`;
     case 'Banish': return 'Banished construct cannot cast or take damage';
     case 'Block': return `Reduces construct red damage and blue damage taken by ${100 - i.meta[1]}%`;
     case 'Buff': return `Increases construct RedPower BluePower SpeedStat by ${i.meta[1] - 100}%`;

server/src/effect.rs

@@ -105,7 +105,7 @@ impl Effect {
 
             Effect::Absorption => vec![Stat::RedPower, Stat::BluePower],
 
-            Effect::Amplify => vec![Stat::RedPower, Stat::BluePower],
+            Effect::Amplify => vec![Stat::GreenPower, Stat::RedPower, Stat::BluePower],
             Effect::Curse => vec![Stat::RedDamageTaken, Stat::BlueDamageTaken],
 
             Effect::Hybrid => vec![Stat::GreenPower],

server/src/item.rs

@@ -712,7 +712,7 @@ impl Item {
             // Skills <- need to move effect mulltipliers into skills
             Item::Amplify|
             Item::AmplifyPlus |
-            Item::AmplifyPlusPlus => format!("Increase RedPower and BluePower by {:?}%. Lasts {:?}T.",
+            Item::AmplifyPlusPlus => format!("Increase RedPower BluePower GreenPower by {:?}%. Lasts {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_multiplier() - 100,
                 self.into_skill().unwrap().effect()[0].get_duration()),
 

server/src/skill.rs

@@ -89,10 +89,15 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
 
     if source.affected(Effect::Haste) {
         match skill {
-            Skill::Attack |
             Skill::Slay |
+            Skill::SlayPlus |
+            Skill::SlayPlusPlus |
             Skill::Chaos |
-            Skill::Strike=> {
+            Skill::ChaosPlus |
+            Skill::ChaosPlusPlus |
+            Skill::Strike |
+            Skill::StrikePlus |
+            Skill::StrikePlusPlus => {
                 let amount = source.speed().pct(Skill::HasteStrike.multiplier());
                 target.deal_red_damage(Skill::HasteStrike, amount)
                 .into_iter()
@@ -105,8 +110,14 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
     if source.affected(Effect::Hybrid) {
         match skill {
             Skill::Blast|
+            Skill::BlastPlus |
+            Skill::BlastPlusPlus |
             Skill::Chaos |
-            Skill::Siphon=> {
+            Skill::ChaosPlus |
+            Skill::ChaosPlusPlus |
+            Skill::Siphon |
+            Skill::SiphonPlus |
+            Skill::SiphonPlusPlus => {
                 let amount = source.green_power().pct(Skill::HybridBlast.multiplier());
                 target.deal_blue_damage(Skill::HybridBlast, amount)
                 .into_iter()
@@ -1066,9 +1077,11 @@ impl Skill {
             Skill::Invert=> Some(2),
             Skill::InvertPlus => Some(2),
             Skill::InvertPlusPlus => Some(2),
-            Skill::Decay=> Some(1), // dot
+
-            Skill::DecayPlus => Some(1),
+            Skill::Decay=> None, // dot
-            Skill::DecayPlusPlus => Some(1),
+            Skill::DecayPlus => None,
+            Skill::DecayPlusPlus => None,
+
             Skill::Siphon|
             Skill::SiphonPlus |
             Skill::SiphonPlusPlus => None,
@@ -1095,7 +1108,7 @@ impl Skill {
 
             Skill::Banish |
             Skill::BanishPlus |
-            Skill::BanishPlusPlus => Some(2),
+            Skill::BanishPlusPlus => Some(1),
 
             Skill::Haste=> Some(1),
             Skill::HastePlus => Some(1),