From b04379cda97579eac80203ed3a6b93a19ce0e9f4 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sat, 20 Mar 2021 13:53:29 +1000
Subject: [PATCH] remove references to team colour bonuses

---
 client/src/components/vbox.utils.jsx |  3 +--
 core/src/item.rs                     | 39 ++++++++++------------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/client/src/components/vbox.utils.jsx b/client/src/components/vbox.utils.jsx
index 9fcaca5c..ddeab01c 100644
--- a/client/src/components/vbox.utils.jsx
+++ b/client/src/components/vbox.utils.jsx
@@ -102,7 +102,7 @@ function genItemInfo(item, itemInfo, player) {
             ? <div> Speed {shapes.SpeedStat()} multiplier {fullInfo.speed * 4}% </div>
             : null;
 
-        const thresholds = isSpec ? specThresholds(player, fullInfo, item) : null;
+        // const thresholds = isSpec ? specThresholds(player, fullInfo, item) : null;
 
         return (
             <div class="info info-item">
@@ -112,7 +112,6 @@ function genItemInfo(item, itemInfo, player) {
                 {cooldown}
                 {itemDescription()}
                 {speed}
-                {thresholds}
             </div>
         );
     }
diff --git a/core/src/item.rs b/core/src/item.rs
index 9b13f568..a3d35ea8 100644
--- a/core/src/item.rs
+++ b/core/src/item.rs
@@ -604,71 +604,59 @@ impl Item {
             // Lifes Upgrades
             Item::LifeGG |
             Item::LifeGGPlus |
-            Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRR |
             Item::LifeRRPlus |
-            Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeBB |
             Item::LifeBBPlus |
-            Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRG |
             Item::LifeRGPlus |
-            Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeGB |
             Item::LifeGBPlus |
-            Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRB |
             Item::LifeRBPlus |
-            Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}.",
                 self.into_spec().unwrap().values().base()),
 
             // Power Upgrades
             Item::PowerRR |
             Item::PowerRRPlus |
-            Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerBB |
             Item::PowerBBPlus |
-            Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
 
             Item::PowerGG |
             Item::PowerGGPlus |
-            Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerRG |
             Item::PowerRGPlus |
-            Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerGB |
             Item::PowerGBPlus |
-            Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerRB |
             Item::PowerRBPlus |
-            Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%.",
                 self.into_spec().unwrap().values().base()),
 
             // Speed Upgrades
@@ -689,8 +677,7 @@ impl Item {
             Item::SpeedGGPlusPlus |
             Item::SpeedRGPlusPlus |
             Item::SpeedGBPlusPlus |
-            Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%.
-                If your team meets total colour thresholds the spec provides additional bonuses.",
+            Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%.",
                 self.into_spec().unwrap().values().base()),