From 406d2b949bcc5b73df856ba9ac86a9abbfcad14b Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Feb 2022 15:40:17 -0500 Subject: [PATCH] Beryllium floor ore --- .../blocks/environment/ore-beryllium1.png | Bin 0 -> 301 bytes .../blocks/environment/ore-beryllium2.png | Bin 0 -> 328 bytes .../blocks/environment/ore-beryllium3.png | Bin 0 -> 273 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/ai/types/CommandAI.java | 17 ++++++++++++++++- core/src/mindustry/content/Blocks.java | 8 +++++--- .../maps/planet/AsteroidGenerator.java | 2 +- .../maps/planet/ErekirPlanetGenerator.java | 2 +- 8 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/ore-beryllium1.png create mode 100644 core/assets-raw/sprites/blocks/environment/ore-beryllium2.png create mode 100644 core/assets-raw/sprites/blocks/environment/ore-beryllium3.png diff --git a/core/assets-raw/sprites/blocks/environment/ore-beryllium1.png b/core/assets-raw/sprites/blocks/environment/ore-beryllium1.png new file mode 100644 index 0000000000000000000000000000000000000000..2cadc169adc5785d5ed720063e5e9c154079dfb2 GIT binary patch literal 301 zcmV+|0n+}7P)Px#=Sf6CR9J=Wlf4bXFc5{G5u0QS=An+n0u)&QiJAdYX9%{S%^FZ4S;^h`U33l- z^6M-){=VD~(9-hbq*@Q(U)Ohj?z=%`RS{UiEs1ae4X#Oq3Y6fIM3?{zAEy}r@Vq<{ z034$PSnx8{1vIcrATO`BP9FHT`~Yz9z@@V$R{C>FK!cSAj)eop7BEvSwc~UPx$0!c(cR9J=WRk;lVArRy&cXC}&5AjKEz`-?u}l?6GJ49IFz3@xMT$|5si2O+dxl@TXrlv z>QM@zQ~?q$=0z2dU|aWv(=p;nC>^`K@YY9%R)EvT6sVklKPjOQlX&!6?{drOZXme> zMlYcPQ3!jX!Uoi^0qq^2HqeTH6QBWZA8SDdh&p3!2w7yvgjU=bW*5v5ng;7#*0$b> apTY+*IGE!Ts local = new Seq<>(false); @Override public void updateUnit(){ @@ -26,6 +30,17 @@ public class CommandAI extends AIController{ targetPos = null; } + if(targetPos != null){ + if(timer.get(timerTarget3, localInterval)){ + local.clear(); + float size = unit.hitSize * 3f; + unit.team.data().tree().intersect(unit.x - size / 2f, unit.y - size/2f, size, size, local); + } + }else{ + //make sure updates are staggered randomly + timer.reset(timerTarget3, Mathf.random(localInterval)); + } + if(attackTarget != null){ if(targetPos == null) targetPos = new Vec2(); targetPos.set(attackTarget); diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b68aff3c3d..2f815b6cf2 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -60,10 +60,10 @@ public class Blocks{ //ores oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium, - oreTungsten, oreCrystalThorium, wallOreThorium, + oreBeryllium, oreTungsten, oreCrystalThorium, wallOreThorium, //wall ores - wallOreBeryl, graphiticWall, wallOreTungsten, + wallOreBeryllium, graphiticWall, wallOreTungsten, //crafting siliconSmelter, siliconCrucible, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, @@ -823,6 +823,8 @@ public class Blocks{ oreScale = 25.380953f; }}; + oreBeryllium = new OreBlock(Items.beryllium); + oreTungsten = new OreBlock(Items.tungsten); oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium); @@ -831,7 +833,7 @@ public class Blocks{ wallOre = true; }}; - wallOreBeryl = new OreBlock("ore-wall-beryllium", Items.beryllium){{ + wallOreBeryllium = new OreBlock("ore-wall-beryllium", Items.beryllium){{ wallOre = true; }}; diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index 09112f83f3..959d1564e5 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -116,7 +116,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ wallOre(Blocks.carbonWall, Blocks.graphiticWall, 35f, 0.57f * graphiteScale); - wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryl, 50f, 0.62f * berylliumScale); + wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryllium, 50f, 0.62f * berylliumScale); //titanium pass((x, y) -> { diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index fa207636f2..7c606678e7 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -277,7 +277,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){ block = Blocks.graphiticWall; }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.665f){ - ore = Blocks.wallOreBeryl; + ore = Blocks.wallOreBeryllium; } }