From 4254de01e42389e13ca518b2a141e2eaf46747e8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 17 May 2020 16:17:08 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/ctype/UnlockableContent.java        |  5 +++--
 .../mindustry/maps/generators/FileMapGenerator.java    |  5 +++++
 core/src/mindustry/ui/dialogs/PlanetDialog.java        | 10 ++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index 4e1043eb9f..04b396d8eb 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -38,10 +38,11 @@ public abstract class UnlockableContent extends MappableContent{
     /** Returns a specific content icon, or the region {contentType}-{name} if not found.*/
     public TextureRegion icon(Cicon icon){
         if(cicons[icon.ordinal()] == null){
-            cicons[icon.ordinal()] = Core.atlas.find(getContentType().name() + "-" + name + "-" + icon.name(),
+            cicons[icon.ordinal()] =
+                Core.atlas.find(getContentType().name() + "-" + name + "-" + icon.name(),
                 Core.atlas.find(getContentType().name() + "-" + name + "-full",
-                Core.atlas.find(getContentType().name() + "-" + name,
                 Core.atlas.find(name,
+                Core.atlas.find(getContentType().name() + "-" + name,
                 Core.atlas.find(name + "1")))));
         }
         return cicons[icon.ordinal()];
diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java
index 0f319a037e..b8fa0ae4f2 100644
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/core/src/mindustry/maps/generators/FileMapGenerator.java
@@ -55,6 +55,11 @@ public class FileMapGenerator implements WorldGenerator{
                 Schematics.placeLoadout(Loadouts.basicShard, tile.x, tile.y);
                 anyCores = true;
             }
+
+            //add random decoration
+            if(Mathf.chance(0.01) && !tile.floor().isLiquid && tile.block() == Blocks.air){
+                tile.setBlock(tile.floor().decoration);
+            }
         }
 
         if(!anyCores){
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index eb60f86a09..c24b865f8b 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -15,8 +15,8 @@ import arc.util.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
-import mindustry.game.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
@@ -74,7 +74,9 @@ public class PlanetDialog extends FloatingDialog{
             }
         });
 
-        Events.on(ResizeEvent.class, e -> makeBloom());
+        Events.on(ResizeEvent.class, e -> {
+            makeBloom();
+        });
 
         TextButtonStyle style = Styles.cleart;
         float bmargin = 6f;
@@ -282,9 +284,9 @@ public class PlanetDialog extends FloatingDialog{
             if(selectAlpha > 0.01f){
                 float stroke = 0.026f;
                 if(sec.hasBase()){
-                    drawSelection(sec, Tmp.c1.set(Team.sharded.color).a(selectAlpha), stroke, -0.01f);
+                    drawSelection(sec, Tmp.c1.set(Team.sharded.color).mul(0.8f).a(selectAlpha), stroke, -0.01f);
                 }else if(sec.hasEnemyBase()){
-                    drawSelection(sec, Tmp.c1.set(Team.crux.color).a(selectAlpha), stroke, -0.02f);
+                    drawSelection(sec, Tmp.c1.set(Team.crux.color).mul(0.8f).a(selectAlpha), stroke, -0.02f);
                 }
             }
         }