From 0d61d98c7038fd62c5d1d933ceda04902c171bd8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 May 2022 14:09:47 -0400 Subject: [PATCH] Bugfixes --- .../blocks/walls/reinforced-surge-wall-large.png | Bin 0 -> 800 bytes .../blocks/walls/reinforced-surge-wall.png | Bin 0 -> 312 bytes core/src/mindustry/content/Blocks.java | 14 ++++++-------- core/src/mindustry/content/UnitTypes.java | 3 +-- core/src/mindustry/input/MobileInput.java | 4 +++- 5 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png create mode 100644 core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png diff --git a/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png new file mode 100644 index 0000000000000000000000000000000000000000..9fe2c736cacd1800bb875471fbf4acecd71d07af GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z;w&g z#WAE}&f93iu-66xGJh@w1RmhDU`l^Hr?Q_rAb5gOsMm@=0X<9S-jzLCI4ARm-;;@D zo1(mx|F^I2|2}{E_4FLk!-e&SzCTZVS*X*-$goZ4kioy?)k<$pbwB>c@_-@VH=#AT z@@kDP&t?8SGZ*CDUj1I`A1A{HB^R~}yWGznPY7c;Af|ZvzR?(r2b=PHvgWOi9QCb4F6m{u;tg@Yd)>bq{_gYoggQ;DMn6E zgK^$HxnSl`TY?KWDw%XEEa0}gb??zBv14g$E1KUo=BS0RZfM%SY_GFhOC;lr2gmo{ zd~U4X+%LxxZ zbtKraF; zV`gXM2R43*bsyF)P)*s)cBhF$(>aBE2ls|A4Ab0B3CA$+s%*+`x+46=PExP(#m!Ye zg!~PDMeKR9aeFw+OjWimM}znNSg`HLi^GB3K4$~=mMj!G_=Wk(v>B(QLw+`ud+T^_ zDDyre;_#GhcKny%k7G5DqClX(xez7d-_>%v*#J#2!T-WvvbKMYepqg-_B-Yfs3 zs@Ae$sZ5vsjvienlzKZc+hN|zMNc*P6Q$kvGu6W%4V&iS1<<3F?LJwEN}J8XZPdVgo#hDDE0*kJ2xMg2%D)h6zDajaIF!1T=Ij}xFGN%<9cpq1_lNO MPgg&ebxsLQ0DJ^!4gdfE literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png new file mode 100644 index 0000000000000000000000000000000000000000..c10d2afdde428acfdb4356e0e39a5d8d391483a0 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VEE+e z;usRq`gXdZ*dYUswvFq%CpXVKpj=^g{^s{R4(aV>FRlcd$FFsG;O`_R`Pu2GQyqt` zjr@1<+&4wG!AnYiw`R_{&E(>|fnlP+U!yf8yJS~8M0~j-D5!gQmZ*o(X-2#73tW%9 znROMa&bP0zZQ{1*HGZuh#wZnY`*h<>h6(R7zIrk}*^<`1-kUl4_HtoX(`*NBy|tl? z7nl?U0@%E6$sgcduu^smnyEYvuC*E^Pus=n^aSU zvz?}Fp&z*xEmIC<78LLlyw+y$wK0a{?SADax)=BazDalrEL^Y1{*i6k;-Xz~YJ8xu OVeoYIb6Mw<&;$TK?{z)^ literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 3290095387..d5c051834f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1327,10 +1327,8 @@ public class Blocks{ //outputItem = new ItemStack(Items.scrap, 1); }}; - //TODO should have a useful turret ammo byproduct? scrap? - //TODO surge being removed I think surgeCrucible = new HeatCrafter("surge-crucible"){{ - requirements(Category.crafting, with(Items.silicon, 100, Items.graphite, 80, Items.carbide, 60, Items.thorium, 120, Items.phaseFabric, 80)); + requirements(Category.crafting, with(Items.silicon, 100, Items.graphite, 80, Items.tungsten, 80, Items.oxide, 80)); size = 3; @@ -1952,7 +1950,7 @@ public class Blocks{ }}; surgeConveyor = new StackConveyor("surge-conveyor"){{ - requirements(Category.distribution, with(Items.surgeAlloy, 3, Items.oxide, 5)); + requirements(Category.distribution, with(Items.surgeAlloy, 1, Items.tungsten, 1)); health = 130; //TODO different base speed/item capacity? speed = 5f / 60f; @@ -1968,7 +1966,7 @@ public class Blocks{ }}; surgeRouter = new StackRouter("surge-router"){{ - requirements(Category.distribution, with(Items.oxide, 10, Items.surgeAlloy, 10)); + requirements(Category.distribution, with(Items.surgeAlloy, 5, Items.tungsten, 1)); health = 130; speed = 6f; @@ -1983,7 +1981,7 @@ public class Blocks{ }}; unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{ - requirements(Category.distribution, with(Items.silicon, 80, Items.thorium, 50, Items.oxide, 50)); + requirements(Category.distribution, with(Items.silicon, 80, Items.surgeAlloy, 50, Items.oxide, 20)); size = 3; buildTime = 60f * 8f; @@ -1991,7 +1989,7 @@ public class Blocks{ consumePower(8f / 60f); //intentionally set absurdly high to make this block not overpowered - consumeLiquid(Liquids.nitrogen, 20f / 60f); + consumeLiquid(Liquids.nitrogen, 10f / 60f); itemCapacity = 200; }}; @@ -3076,7 +3074,7 @@ public class Blocks{ statusDuration = 10f; hittable = false; lightColor = Color.white; - collidesGround = false; + collidesAir = false; buildingDamageMultiplier = 0.25f; }}; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index f2b381ef7c..0e7e7f5b31 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1322,8 +1322,7 @@ public class UnitTypes{ }}; mega = new UnitType("mega"){{ - //TODO control? - aiController = RepairAI::new; + controller = u -> new RepairAI(); mineTier = 3; mineSpeed = 4f; diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 07c7f1f479..b95ae49601 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -991,7 +991,9 @@ public class MobileInput extends InputHandler implements GestureListener{ }else if(target == null){ player.shooting = false; if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){ - target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.checkTarget(type.targetAir, type.targetGround), u -> type.targetGround); + if(player.unit().type.canAttack){ + target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.checkTarget(type.targetAir, type.targetGround), u -> type.targetGround); + } if(allowHealing && target == null){ target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded));