diff --git a/VERSION b/VERSION index 9dbb0c00..081af9a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.0 \ No newline at end of file +1.7.1 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index c90324b5..48ed247e 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.7.0", + "version": "1.7.1", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 40922a43..f446e92c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.7.0", + "version": "1.7.1", "description": "", "main": "index.js", "scripts": { diff --git a/client/src/components/buttons.jsx b/client/src/components/buttons.jsx index c2f72b15..78232928 100644 --- a/client/src/components/buttons.jsx +++ b/client/src/components/buttons.jsx @@ -1,4 +1,5 @@ -module.exports = { // This will need to be edited if we change server recipes +// This will need to be edited if we change server recipes +module.exports = { // Attack Strike: () => 'red-border', Blast: () => 'blue-border', @@ -31,9 +32,9 @@ module.exports = { // This will need to be edited if we change server recipes Restrict: () => 'red-border', Purge: () => 'green-border', Silence: () => 'blue-border', - Curse: () => 'red-green-border', + Invert: () => 'red-green-border', Decay: () => 'blue-green-border', - Invert: () => 'red-blue-border', + Curse: () => 'red-blue-border', // // Lifes Upgrades // LifeGG: () => 'green-border', diff --git a/ops/package.json b/ops/package.json index 808951f4..876bd4cf 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.7.0", + "version": "1.7.1", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 52007285..40e26480 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.7.0" +version = "1.7.1" authors = ["ntr "] [dependencies] diff --git a/server/src/item.rs b/server/src/item.rs index 52b3bb8b..4d5604f0 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -620,70 +620,70 @@ impl Item { // Lifes Upgrades Item::LifeGG | Item::LifeGGPlus | - Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}. + Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::LifeRR | Item::LifeRRPlus | - Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}. + Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), - Item::LifeBB | - Item::LifeBBPlus | - Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}. + Item::LifeBB | + Item::LifeBBPlus | + Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::LifeRG | Item::LifeRGPlus | - Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}. + Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::LifeGB | Item::LifeGBPlus | - Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}. + Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::LifeRB | Item::LifeRBPlus | - Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}. + Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), // Power Upgrades - Item::PowerRR | - Item::PowerRRPlus | - Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%. + Item::PowerRR | + Item::PowerRRPlus | + Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::PowerBB | Item::PowerBBPlus | - Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%. + Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::PowerGG | Item::PowerGGPlus | - Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%. + Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::PowerRG | Item::PowerRGPlus | - Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%. + Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::PowerGB | Item::PowerGBPlus | - Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%. + Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), Item::PowerRB | Item::PowerRBPlus | - Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%. + Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), @@ -705,7 +705,7 @@ impl Item { Item::SpeedGGPlusPlus | Item::SpeedRGPlusPlus | Item::SpeedGBPlusPlus | - Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%. + Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%. If your team meets total colour thresholds the spec provides additional bonuses.", self.into_spec().unwrap().values().base()), @@ -796,7 +796,7 @@ impl Item { Item::Hybrid| Item::HybridPlus | Item::HybridPlusPlus => format!( - "Hybrid increases GreenPower by {:?}%. + "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, @@ -823,7 +823,7 @@ impl Item { Item::Purge| Item::PurgePlus | Item::PurgePlusPlus => format!( - "Remove buffs from target construct. + "Remove buffs from target construct. Applies purge disabling target green skills for {:?}T.", self.into_skill().unwrap().effect()[0].get_duration()), @@ -836,7 +836,7 @@ impl Item { Item::Reflect| Item::ReflectPlus | Item::ReflectPlusPlus => format!( - "Reflect incoming blue skills to source. Lasts {:?}T. + "Reflect incoming blue skills to source. Lasts {:?}T. Recharges target BlueLife based on {:?}% BluePower.", self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().multiplier()), @@ -943,6 +943,11 @@ impl Item { } } + // !!!!!! + // IF YOU CHANGE A COMBO + // BE SURE TO EDIT BUTTONS.JSX TOO + // !!!!!! + fn combo(&self) -> Vec { match self { Item::Intercept => vec![Item::Buff, Item::Red, Item::Red], diff --git a/server/src/skill.rs b/server/src/skill.rs index 313b21a3..ceccf0f8 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -831,13 +831,13 @@ impl Skill { // Buff base Skill::HybridBlast => 50, - + Skill::HasteStrike => 60, - + Skill::Intercept=> 80, Skill::InterceptPlus => 110, Skill::InterceptPlusPlus => 150, - + Skill::TriageTick=> 75, Skill::TriageTickPlus => 110, Skill::TriageTickPlusPlus => 140, @@ -1392,7 +1392,10 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti if red > 0 || blue > 0 { EventStages::PostOnly } else { EventStages::NoStages } } - _ => EventStages::NoStages, + _ => { + warn!("no recharge event found {:?}", e); + EventStages::NoStages + } }; results.push(Resolution::new(source, target).event(e).stages(stages)); @@ -1411,7 +1414,10 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu if red > 0 || blue > 0 { EventStages::PostOnly } else { EventStages::NoStages } } - _ => EventStages::NoStages, + _ => { + warn!("no recharge event found {:?}", e); + EventStages::NoStages + } }; results.push(Resolution::new(source, target).event(e).stages(stages)); @@ -1712,8 +1718,11 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti Event::Recharge { red, blue, skill: _ } => { if red > 0 || blue > 0 { EventStages::PostOnly } else { EventStages::NoStages } - }, - _ => EventStages::NoStages, + } + _ => { + warn!("no recharge event found {:?}", e); + EventStages::NoStages + } }; results.push(Resolution::new(source, target).event(e).stages(stages)); return results;; @@ -1728,7 +1737,10 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut if red > 0 || blue > 0 { EventStages::AllStages } else { EventStages::StartEnd } } - _ => EventStages::NoStages, + _ => { + warn!("no recharge event found {:?}", e); + EventStages::NoStages + } }; results.push(Resolution::new(source, target).event(e).stages(stages)); return results;