mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-05 18:30:22 -08:00
Code Issues Projects Releases Wiki Activity

Fixed black minimap color for metal walls

Browse source
This commit is contained in:
Anuken 2025-08-25 10:59:39 -04:00
parent a73a30f2b9
commit 2bdf2f39f8
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/src/mindustry/editor/EditorTool.java
View file

@ -133,7 +133,12 @@ public enum EditorTool{
Block dest = tile.floor(); Block dest = tile.floor();
if(dest == editor.drawBlock) return; if(dest == editor.drawBlock) return;
tester = t -> t.floor() == dest; tester = t -> t.floor() == dest;
setter = t -> t.setFloor(editor.drawBlock.asFloor()); setter = t -> {
t.setFloor(editor.drawBlock.asFloor());
if(!(t.overlay() instanceof OverlayFloor) && !t.floor().supportsOverlay){
t.setOverlay(Blocks.air);
}
};
}else{ }else{
Block dest = tile.block(); Block dest = tile.block();
if(dest == editor.drawBlock) return; if(dest == editor.drawBlock) return;

8
tools/src/mindustry/tools/Generators.java
View file

@ -89,16 +89,18 @@ public class Generators{
} }
}); });
if(!iconPath.exists() && v == 0){ if(v == 0){
//save the bottom right region as the "main" sprite for previews //save the bottom right region as the "main" sprite for previews
Pixmap out = new Pixmap(basePath); Pixmap out = new Pixmap(basePath);
Pixmap cropped = out.crop(32, 32, 32, 32); Pixmap cropped = out.crop(32, 32, 32, 32);
iconPath.writePng(cropped); if(!iconPath.exists()){
iconPath.writePng(cropped);
}
out.dispose(); out.dispose();
gens.put(block, cropped); gens.put(block, cropped);
} }
}else{ }else{
Log.warn("Autotile floor '@' not found: @", block.name, basePath.absolutePath()); Log.warn("Autotile block '@' not found: @", block.name, basePath.absolutePath());
} }
} }
} }