Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2022-05-07 14:09:47 -04:00
parent dfac73d81c
commit 0d61d98c70
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 800 B

BIN
core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B

14
core/src/mindustry/content/Blocks.java
View File

@@ -1327,10 +1327,8 @@ public class Blocks{
//outputItem = new ItemStack(Items.scrap, 1); //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"){{ 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; size = 3;
@@ -1952,7 +1950,7 @@ public class Blocks{
}}; }};
surgeConveyor = new StackConveyor("surge-conveyor"){{ 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; health = 130;
//TODO different base speed/item capacity? //TODO different base speed/item capacity?
speed = 5f / 60f; speed = 5f / 60f;
@@ -1968,7 +1966,7 @@ public class Blocks{
}}; }};
surgeRouter = new StackRouter("surge-router"){{ 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; health = 130;
speed = 6f; speed = 6f;
@@ -1983,7 +1981,7 @@ public class Blocks{
}}; }};
unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{ 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; size = 3;
buildTime = 60f * 8f; buildTime = 60f * 8f;
@@ -1991,7 +1989,7 @@ public class Blocks{
consumePower(8f / 60f); consumePower(8f / 60f);
//intentionally set absurdly high to make this block not overpowered //intentionally set absurdly high to make this block not overpowered
consumeLiquid(Liquids.nitrogen, 20f / 60f); consumeLiquid(Liquids.nitrogen, 10f / 60f);
itemCapacity = 200; itemCapacity = 200;
}}; }};
@@ -3076,7 +3074,7 @@ public class Blocks{
statusDuration = 10f; statusDuration = 10f;
hittable = false; hittable = false;
lightColor = Color.white; lightColor = Color.white;
collidesGround = false; collidesAir = false;
buildingDamageMultiplier = 0.25f; buildingDamageMultiplier = 0.25f;
}}; }};
}}; }};

3
core/src/mindustry/content/UnitTypes.java
View File

@@ -1322,8 +1322,7 @@ public class UnitTypes{
}}; }};
mega = new UnitType("mega"){{ mega = new UnitType("mega"){{
//TODO control? controller = u -> new RepairAI();
aiController = RepairAI::new;
mineTier = 3; mineTier = 3;
mineSpeed = 4f; mineSpeed = 4f;

4
core/src/mindustry/input/MobileInput.java
View File

@@ -991,7 +991,9 @@ public class MobileInput extends InputHandler implements GestureListener{
}else if(target == null){ }else if(target == null){
player.shooting = false; player.shooting = false;
if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){ 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){ if(allowHealing && target == null){
target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded)); target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded));