diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 7fb1bc9d38..2159d0ab48 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -40,11 +40,11 @@ public class UnitBlocks extends BlockList implements ContentList{ monsoonPad = new UnitPad("monsoon-pad"){{ type = UnitTypes.monsoon; - produceTime = 3600; + produceTime = 3800; size = 3; consumes.power(0.2f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 10)}); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); }}; daggerPad = new UnitPad("dagger-pad"){{ @@ -57,7 +57,7 @@ public class UnitBlocks extends BlockList implements ContentList{ titanPad = new UnitPad("titan-pad"){{ type = UnitTypes.titan; - produceTime = 3700; + produceTime = 3600; size = 3; consumes.power(0.15f); shadow = "shadow-round-3"; diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index d84cfc2b33..e7085f93b6 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -80,9 +80,9 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ }else if(target == null){ retarget(() -> { targetClosest(); - targetClosestEnemyFlag(BlockFlag.target); - targetClosestEnemyFlag(BlockFlag.producer); - targetClosestEnemyFlag(BlockFlag.turret); + if(target == null) targetClosestEnemyFlag(BlockFlag.target); + if(target == null) targetClosestEnemyFlag(BlockFlag.producer); + if(target == null) targetClosestEnemyFlag(BlockFlag.turret); if(target == null && !isCommanded()){ setState(idle); diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 0901a82778..25213402c8 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -133,7 +133,7 @@ public class Sectors{ } private void initSector(Sector sector){ - double waveChance = 0.3; + double waveChance = 0.2; sector.difficulty = (int)(Mathf.dst(sector.x, sector.y)); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index d6d90797e6..ec45b6d59b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -14,6 +14,7 @@ import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.SpawnerTrait; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.UnitType; +import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; @@ -103,7 +104,7 @@ public class CoreBlock extends StorageBlock{ @Override public float handleDamage(Tile tile, float amount){ - return debug ? 0 : amount; + return debug && tile.getTeam() == Team.blue ? 0 : amount; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index d822e7a2b5..0061567938 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -38,7 +38,7 @@ public class CommandCenter extends Block{ public CommandCenter(String name){ super(name); - flags = EnumSet.of(BlockFlag.target); + flags = EnumSet.of(BlockFlag.comandCenter, BlockFlag.target); destructible = true; solid = true; configurable = true;