diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/ore-coal1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/coal1.png rename to core/assets-raw/sprites/blocks/environment/ore-coal1.png diff --git a/core/assets-raw/sprites/blocks/environment/coal2.png b/core/assets-raw/sprites/blocks/environment/ore-coal2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/coal2.png rename to core/assets-raw/sprites/blocks/environment/ore-coal2.png diff --git a/core/assets-raw/sprites/blocks/environment/coal3.png b/core/assets-raw/sprites/blocks/environment/ore-coal3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/coal3.png rename to core/assets-raw/sprites/blocks/environment/ore-coal3.png diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/ore-copper1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/copper1.png rename to core/assets-raw/sprites/blocks/environment/ore-copper1.png diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/ore-copper2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/copper2.png rename to core/assets-raw/sprites/blocks/environment/ore-copper2.png diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/ore-copper3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/copper3.png rename to core/assets-raw/sprites/blocks/environment/ore-copper3.png diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png new file mode 100644 index 0000000000..5790f50c77 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png new file mode 100644 index 0000000000..ad5ab21dad Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png new file mode 100644 index 0000000000..7e8112349e Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/lead1.png b/core/assets-raw/sprites/blocks/environment/ore-lead1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/lead1.png rename to core/assets-raw/sprites/blocks/environment/ore-lead1.png diff --git a/core/assets-raw/sprites/blocks/environment/lead2.png b/core/assets-raw/sprites/blocks/environment/ore-lead2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/lead2.png rename to core/assets-raw/sprites/blocks/environment/ore-lead2.png diff --git a/core/assets-raw/sprites/blocks/environment/lead3.png b/core/assets-raw/sprites/blocks/environment/ore-lead3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/lead3.png rename to core/assets-raw/sprites/blocks/environment/ore-lead3.png diff --git a/core/assets-raw/sprites/blocks/environment/scrap1.png b/core/assets-raw/sprites/blocks/environment/ore-scrap1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/scrap1.png rename to core/assets-raw/sprites/blocks/environment/ore-scrap1.png diff --git a/core/assets-raw/sprites/blocks/environment/scrap2.png b/core/assets-raw/sprites/blocks/environment/ore-scrap2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/scrap2.png rename to core/assets-raw/sprites/blocks/environment/ore-scrap2.png diff --git a/core/assets-raw/sprites/blocks/environment/scrap3.png b/core/assets-raw/sprites/blocks/environment/ore-scrap3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/scrap3.png rename to core/assets-raw/sprites/blocks/environment/ore-scrap3.png diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-thorium1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/thorium1.png rename to core/assets-raw/sprites/blocks/environment/ore-thorium1.png diff --git a/core/assets-raw/sprites/blocks/environment/thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-thorium2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/thorium2.png rename to core/assets-raw/sprites/blocks/environment/ore-thorium2.png diff --git a/core/assets-raw/sprites/blocks/environment/thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-thorium3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/thorium3.png rename to core/assets-raw/sprites/blocks/environment/ore-thorium3.png diff --git a/core/assets-raw/sprites/blocks/environment/titanium1.png b/core/assets-raw/sprites/blocks/environment/ore-titanium1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/titanium1.png rename to core/assets-raw/sprites/blocks/environment/ore-titanium1.png diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/ore-titanium2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/titanium2.png rename to core/assets-raw/sprites/blocks/environment/ore-titanium2.png diff --git a/core/assets-raw/sprites/blocks/environment/titanium3.png b/core/assets-raw/sprites/blocks/environment/ore-titanium3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/titanium3.png rename to core/assets-raw/sprites/blocks/environment/ore-titanium3.png diff --git a/core/assets-raw/sprites/blocks/environment/tungsten1.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/tungsten1.png rename to core/assets-raw/sprites/blocks/environment/ore-tungsten1.png diff --git a/core/assets-raw/sprites/blocks/environment/tungsten2.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/tungsten2.png rename to core/assets-raw/sprites/blocks/environment/ore-tungsten2.png diff --git a/core/assets-raw/sprites/blocks/environment/tungsten3.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/tungsten3.png rename to core/assets-raw/sprites/blocks/environment/ore-tungsten3.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-beryllium1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-beryllium1.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-beryllium1.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-beryllium2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-beryllium2.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-beryllium2.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-beryllium3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-beryllium3.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-beryllium3.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-tungsten1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-tungsten1.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-tungsten1.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-tungsten2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-tungsten2.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-tungsten2.png diff --git a/core/assets-raw/sprites/blocks/environment/wall-tungsten3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/wall-tungsten3.png rename to core/assets-raw/sprites/blocks/environment/ore-wall-tungsten3.png diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 6988e1de63..dba21cc9e6 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -496,3 +496,6 @@ 63208=quell-missile|unit-quell-missile-ui 63207=bulwark|unit-bulwark-ui 63206=mech-assembler|block-mech-assembler-ui +63205=ore-crystal-thorium|block-ore-crystal-thorium-ui +63204=ore-wall-beryllium|block-ore-wall-beryllium-ui +63203=ore-wall-tungsten|block-ore-wall-tungsten-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index bbcfe219bd..c125c43533 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -55,7 +55,7 @@ public class Blocks{ //ores oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium, - oreTungsten, + oreTungsten, oreCrystalThorium, //wall ores wallOreBeryl, graphiticWall, wallOreTungsten, @@ -697,8 +697,7 @@ public class Blocks{ oreTungsten = new OreBlock(Items.tungsten); - //endregion - //region wall ore + oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium); wallOreBeryl = new WallOreBlock(Items.beryllium); diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index c5bf8291f4..5a8d4817cc 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -255,7 +255,7 @@ public class SectorDamage{ //first, calculate the total health of blocks in the path //radius around the path that gets counted - int radius = 5; + int radius = 6; IntSet counted = new IntSet(); for(Tile t : sparse2){ @@ -335,6 +335,7 @@ public class SectorDamage{ Seq waveDps = new Seq<>(), waveHealth = new Seq<>(); int groundSpawns = Math.max(spawner.countFlyerSpawns(), 1), airSpawns = Math.max(spawner.countGroundSpawns(), 1); + //TODO storing all this is dumb when you can just calculate it exactly from the rules... for(int wave = state.wave; wave < state.wave + 10; wave ++){ float sumWaveDps = 0f, sumWaveHealth = 0f; diff --git a/core/src/mindustry/world/blocks/environment/OreBlock.java b/core/src/mindustry/world/blocks/environment/OreBlock.java index 7f16310378..78bca2abe4 100644 --- a/core/src/mindustry/world/blocks/environment/OreBlock.java +++ b/core/src/mindustry/world/blocks/environment/OreBlock.java @@ -44,7 +44,11 @@ public class OreBlock extends OverlayFloor{ @OverrideCallSuper public void createIcons(MultiPacker packer){ for(int i = 0; i < variants; i++){ - PixmapRegion shadow = Core.atlas.getPixmap(itemDrop.name + (i + 1)); + //use name (e.g. "ore-copper1"), fallback to "copper1" as per the old naming system + PixmapRegion shadow = Core.atlas.has(name + (i + 1)) ? + Core.atlas.getPixmap(name + (i + 1)) : + Core.atlas.getPixmap(itemDrop.name + (i + 1)); + Pixmap image = shadow.crop(); int offset = image.width / tilesize - 1; diff --git a/core/src/mindustry/world/blocks/environment/WallOreBlock.java b/core/src/mindustry/world/blocks/environment/WallOreBlock.java index cdfffff89e..9bcb4b6d6a 100644 --- a/core/src/mindustry/world/blocks/environment/WallOreBlock.java +++ b/core/src/mindustry/world/blocks/environment/WallOreBlock.java @@ -6,7 +6,7 @@ import mindustry.type.*; public class WallOreBlock extends OreBlock{ public WallOreBlock(Item ore){ - super("wall-ore-" + ore.name, ore); + super("ore-wall-" + ore.name, ore); } //mods only diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 0d555560e9..d51e55e039 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -668,13 +668,12 @@ public class Generators{ generate("ore-icons", () -> { content.blocks().each(b -> b instanceof OreBlock, ore -> { - String prefix = ore instanceof WallOreBlock ? "wall-ore-" : "ore-"; - Item item = ore.itemDrop; + ore.load(); int shadowColor = Color.rgba8888(0, 0, 0, 0.3f); for(int i = 0; i < ore.variants; i++){ //get base image to draw on - Pixmap base = get((ore instanceof WallOreBlock ? "wall-" : "") + item.name + (i + 1)); + Pixmap base = get(ore.variantRegions[i]); Pixmap image = base.copy(); int offset = image.width / tilesize - 1; @@ -688,9 +687,11 @@ public class Generators{ } } + replace(ore.variantRegions[i], image); + image.draw(base, true); - save(image, "../blocks/environment/" + prefix + item.name + (i + 1)); - save(image, "../editor/editor-" + prefix + item.name + (i + 1)); + save(image, "../blocks/environment/" + ore.name + (i + 1)); + save(image, "../editor/editor-" + ore.name + (i + 1)); save(image, "block-" + ore.name + "-full"); save(image, "../ui/block-" + ore.name + "-ui"); diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 42ffc6d797..8a7b8004b1 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -27,7 +27,7 @@ public class ScriptMainGenerator{ public static void main(String[] args) throws Exception{ String base = "mindustry"; Seq blacklist = Seq.with("plugin", "mod", "net", "io", "tools"); - Seq nameBlacklist = Seq.with("ClassAccess"); + Seq nameBlacklist = Seq.with(); Seq> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, Shader.class, Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,