Ore renaming

2022-01-18 10:48:27 -05:00
parent 51aa374225
commit f3811d6710
37 changed files with 20 additions and 12 deletions
@@ -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
@@ -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);

@@ -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<Vec2> 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;

@@ -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;
@@ -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