Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -986,7 +986,7 @@ bullet.infinitepierce = [stat]pierce
 bullet.healpercent = [stat]{0}[lightgray]% repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
 unit.blocks = blocks

core/src/mindustry/core/UI.java

@@ -127,6 +127,7 @@ public class UI implements ApplicationListener, Loadable{
         Colors.put("unlaunched", Color.valueOf("8982ed"));
         Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f));
         Colors.put("stat", Pal.stat);
+        Colors.put("negstat", Pal.negativeStat);
 
         drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale());
         unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale());

core/src/mindustry/graphics/Pal.java

@@ -75,6 +75,7 @@ public class Pal{
     bar = Color.slate,
     accent = Color.valueOf("ffd37f"),
     stat = Color.valueOf("ffd37f"),
+    negativeStat = Color.valueOf("e55454"),
     gray = Color.valueOf("454545"),
     metalGrayDark = Color.valueOf("6e7080"),
     accentBack = Color.valueOf("d4816b"),

core/src/mindustry/input/DesktopInput.java

@@ -493,7 +493,7 @@ public class DesktopInput extends InputHandler{
             schematicY += shiftY;
         }
 
-        if(Core.input.keyTap(Binding.deselect) && !isPlacing()){
+        if(Core.input.keyTap(Binding.deselect) && !isPlacing() && !commandMode){
             player.unit().mineTile = null;
         }
 

core/src/mindustry/world/meta/StatValues.java

@@ -350,11 +350,12 @@ public class StatValues{
                     }
 
                     if(type.buildingDamageMultiplier != 1){
-                        sep(bt, Core.bundle.format("bullet.buildingdamage", (int)(type.buildingDamageMultiplier * 100)));
+                        int val = (int)(type.buildingDamageMultiplier * 100 - 100);
+                        sep(bt, Core.bundle.format("bullet.buildingdamage", ammoStat(val)));
                     }
 
                     if(type.rangeChange != 0 && !compact){
-                        sep(bt, Core.bundle.format("bullet.range", (type.rangeChange > 0 ? "+" : "-") + Strings.autoFixed(type.rangeChange / tilesize, 1)));
+                        sep(bt, Core.bundle.format("bullet.range", ammoStat(type.rangeChange / tilesize)));
                     }
 
                     if(type.splashDamage > 0){
@@ -366,7 +367,8 @@ public class StatValues{
                     }
 
                     if(!compact && !Mathf.equal(type.reloadMultiplier, 1f)){
-                        sep(bt, Core.bundle.format("bullet.reload", Strings.autoFixed(type.reloadMultiplier, 2)));
+                        int val = (int)(type.reloadMultiplier * 100 - 100);
+                        sep(bt, Core.bundle.format("bullet.reload", ammoStat(val)));
                     }
 
                     if(type.knockback > 0){
@@ -424,6 +426,11 @@ public class StatValues{
         table.add(text);
     }
 
+    //for AmmoListValue
+    private static String ammoStat(float val){
+        return (val > 0 ? "[stat]+" : "[negstat]") + Strings.autoFixed(val, 1);
+    }
+
     private static TextureRegion icon(UnlockableContent t){
         return t.uiIcon;
     }

servers_v7.json

@@ -142,5 +142,9 @@
   {
     "name": "mindustry.ddns.net",
     "address": ["mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000"]
+  },
+  {
+    "name": "EasyPlay.su",
+    "address": ["easyplay.su"]
   }
 ]