diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 43cd8ef89b..226fc67ea6 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -162,6 +162,11 @@ public class TypeIO{ read.b(bytes); yield bytes; } + //unit command + case 15 -> { + read.b(); + yield null; + } case 16 -> { int boollen = read.i(); boolean[] bools = new boolean[boollen]; @@ -467,6 +472,9 @@ public class TypeIO{ //make sure player exists if(player == null) return prev; return player; + }else if(type == 1){ //formation controller (ignored) + read.i(); + return prev; }else if(type == 3){ int pos = read.i(); if(prev instanceof LogicAI pai){ diff --git a/core/src/mindustry/io/versions/LegacySaveVersion2.java b/core/src/mindustry/io/versions/LegacySaveVersion2.java index 02a986cb85..ea51e475b8 100644 --- a/core/src/mindustry/io/versions/LegacySaveVersion2.java +++ b/core/src/mindustry/io/versions/LegacySaveVersion2.java @@ -1,6 +1,7 @@ package mindustry.io.versions; import arc.func.*; +import arc.util.*; import arc.util.io.*; import mindustry.gen.*; diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index 12fec02fa1..01a0de88b6 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -42,6 +42,7 @@ public class NuclearReactor extends PowerGenerator{ public int explosionDamage = 1250; /** heat removed per unit of coolant */ public float coolantPower = 0.5f; + public float smoothLight; public Item fuelItem = Items.thorium; @@ -143,7 +144,8 @@ public class NuclearReactor extends PowerGenerator{ @Override public void drawLight(){ float fract = productionEfficiency; - Drawf.light(x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract); + smoothLight = Mathf.lerpDelta(smoothLight, fract, 0.08f); + Drawf.light(x, y, (90f + Mathf.absin(5, 5f)) * smoothLight, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * smoothLight); } @Override