From fb5945f1e810ebf1584f03d2797c2ac005350223 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 4 Feb 2025 12:18:04 -0500 Subject: [PATCH] Place base battery schematics with full charge / Exclude fallback sprites from assetsJar --- build.gradle | 2 +- core/src/mindustry/maps/generators/BaseGenerator.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6a49b0ce6e..90e98a89dc 100644 --- a/build.gradle +++ b/build.gradle @@ -309,7 +309,7 @@ project(":core"){ task assetsJar(type: Jar, dependsOn: ":tools:pack"){ archiveClassifier = 'assets' from files("assets"){ - exclude "config", "cache", "music", "sounds" + exclude "config", "cache", "music", "sounds", "sprites/fallback" } } diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java index 27623957be..c39db91b6f 100644 --- a/core/src/mindustry/maps/generators/BaseGenerator.java +++ b/core/src/mindustry/maps/generators/BaseGenerator.java @@ -175,9 +175,13 @@ public class BaseGenerator{ if(tiles == null) return; for(Tile tile : tiles){ - if(tile.isCenter() && tile.block() instanceof PowerNode && tile.team() == state.rules.waveTeam){ - tile.build.configureAny(new Point2[0]); - tile.build.placed(); + if(tile.isCenter() && tile.team() == state.rules.waveTeam){ + if(tile.block() instanceof PowerNode){ + tile.build.configureAny(new Point2[0]); + tile.build.placed(); + }else if(tile.block() instanceof Battery){ + tile.build.power.status = 1f; + } } } }