ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mashy 2021-03-20 13:57:39 +10:00
commit dde55e4cdb
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/vbox.utils.jsx
View File

@ -102,7 +102,7 @@ function genItemInfo(item, itemInfo, player) {
? <div> Speed {shapes.SpeedStat()} multiplier {fullInfo.speed * 4}% </div> ? <div> Speed {shapes.SpeedStat()} multiplier {fullInfo.speed * 4}% </div>
: null; : null;
const thresholds = isSpec ? specThresholds(player, fullInfo, item) : null; // const thresholds = isSpec ? specThresholds(player, fullInfo, item) : null;
return ( return (
<div class="info info-item"> <div class="info info-item">
@ -112,7 +112,6 @@ function genItemInfo(item, itemInfo, player) {
{cooldown} {cooldown}
{itemDescription()} {itemDescription()}
{speed} {speed}
{thresholds}
</div> </div>
); );
} }

39
core/src/item.rs
View File

@ -604,71 +604,59 @@ impl Item {
// Lifes Upgrades // Lifes Upgrades
Item::LifeGG | Item::LifeGG |
Item::LifeGGPlus | 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()), self.into_spec().unwrap().values().base()),
Item::LifeRR | Item::LifeRR |
Item::LifeRRPlus | 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()), self.into_spec().unwrap().values().base()),
Item::LifeBB | Item::LifeBB |
Item::LifeBBPlus | Item::LifeBBPlus |
Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}. 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()), self.into_spec().unwrap().values().base()),
Item::LifeRG | Item::LifeRG |
Item::LifeRGPlus | 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()), self.into_spec().unwrap().values().base()),
Item::LifeGB | Item::LifeGB |
Item::LifeGBPlus | 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()), self.into_spec().unwrap().values().base()),
Item::LifeRB | Item::LifeRB |
Item::LifeRBPlus | 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()), self.into_spec().unwrap().values().base()),
// Power Upgrades // Power Upgrades
Item::PowerRR | Item::PowerRR |
Item::PowerRRPlus | Item::PowerRRPlus |
Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%. 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()), self.into_spec().unwrap().values().base()),
Item::PowerBB | Item::PowerBB |
Item::PowerBBPlus | 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()), self.into_spec().unwrap().values().base()),
Item::PowerGG | Item::PowerGG |
Item::PowerGGPlus | 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()), self.into_spec().unwrap().values().base()),
Item::PowerRG | Item::PowerRG |
Item::PowerRGPlus | 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()), self.into_spec().unwrap().values().base()),
Item::PowerGB | Item::PowerGB |
Item::PowerGBPlus | 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()), self.into_spec().unwrap().values().base()),
Item::PowerRB | Item::PowerRB |
Item::PowerRBPlus | 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()), self.into_spec().unwrap().values().base()),
// Speed Upgrades // Speed Upgrades
@ -689,8 +677,7 @@ impl Item {
Item::SpeedGGPlusPlus | Item::SpeedGGPlusPlus |
Item::SpeedRGPlusPlus | Item::SpeedRGPlusPlus |
Item::SpeedGBPlusPlus | 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()), self.into_spec().unwrap().values().base()),