diff --git a/core/assets-raw/sprites/statuses/status-blasted.png b/core/assets-raw/sprites/statuses/status-blasted.png index 96331365fc..79f635ffb7 100644 Binary files a/core/assets-raw/sprites/statuses/status-blasted.png and b/core/assets-raw/sprites/statuses/status-blasted.png differ diff --git a/core/assets-raw/sprites/statuses/status-shocked.png b/core/assets-raw/sprites/statuses/status-shocked.png index 9d6822a636..2a08b271b8 100644 Binary files a/core/assets-raw/sprites/statuses/status-shocked.png and b/core/assets-raw/sprites/statuses/status-shocked.png differ diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 7cd14828f5..fbc3ba9ee8 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -198,6 +198,12 @@ public class NetClient implements ApplicationListener{ Events.fire(new PlayerChatEvent(player, message)); + //log commands before they are handled + if(message.startsWith(netServer.clientCommands.getPrefix())){ + //log with brackets + Log.info("<&fi@: @&fr>", "&lk" + player.name, "&lw" + message); + } + //check if it's a command CommandResponse response = netServer.clientCommands.handleMessage(message, player); if(response.type == ResponseType.noCommand){ //no command to handle @@ -219,8 +225,6 @@ public class NetClient implements ApplicationListener{ //this is required so other clients get the correct name even if they don't know who's sending it yet Call.sendMessage(message, colorizeName(player.id(), player.name), player); }else{ - //log command to console but with brackets - Log.info("<&fi@: @&fr>", "&lk" + player.name, "&lw" + message); //a command was sent, now get the output if(response.type != ResponseType.valid){ diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index baf23762bf..72c0d4b9e3 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -398,7 +398,7 @@ public class Generators{ //if(icon.size == base.width) continue; Image image = new Image(icon.size, icon.size); image.drawScaled(base); - image.save(item.getContentType().name() + "-" + item.name + "-" + icon.name(), false); + image.save(item.getContentType().name() + "-" + item.name + "-" + icon.name(), !(item instanceof StatusEffect)); if(icon == Cicon.medium){ image.save("../ui/" + item.getContentType() + "-" + item.name + "-icon");