diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall-large.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png similarity index 100% rename from core/assets-raw/sprites/blocks/walls/composite-wall-large.png rename to core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png similarity index 100% rename from core/assets-raw/sprites/blocks/walls/composite-wall.png rename to core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 13bdfdae8c..66955c6d72 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -512,8 +512,8 @@ block.blackrock.name=blackrock block.icerock.name=icerock block.copper-wall.name=Copper Wall block.copper-wall-large.name=Large Copper Wall -block.composite-wall.name=Composite Wall -block.composite-wall-large.name=Large Composite Wall +block.dense-alloy-wall.name=Dense Alloy Wall +block.dense-alloy-wall-large.name=Large Dense Alloy Wall block.phase-wall.name=Phase Wall block.phase-wall-large.name=Large Phase Wall block.thorium-wall.name=Thorium Wall diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 1c180ea23a..dadca85840 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -2622,79 +2622,51 @@ command-center orig: 16, 16 offset: 0, 0 index: -1 -block-icon-composite-wall - rotate: false - xy: 999, 443 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -composite-wall - rotate: false - xy: 999, 443 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-composite-wall-large - rotate: false - xy: 421, 340 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -composite-wall-large - rotate: false - xy: 421, 340 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-conduit rotate: false - xy: 619, 431 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 619, 421 + xy: 619, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 619, 421 + xy: 619, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 629, 431 + xy: 619, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 629, 431 + xy: 619, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 439, 435 + xy: 421, 340 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 439, 435 + xy: 421, 340 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2715,14 +2687,14 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 439, 417 + xy: 439, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 457, 435 + xy: 439, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2736,47 +2708,75 @@ block-icon-cyclone index: -1 block-icon-dagger-pad rotate: false - xy: 439, 399 + xy: 457, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dart-ship-factory rotate: false - xy: 457, 417 + xy: 439, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 457, 417 + xy: 439, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 619, 411 + xy: 629, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 619, 411 + xy: 629, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 475, 435 + xy: 457, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory + rotate: false + xy: 457, 417 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-dense-alloy-wall + rotate: false + xy: 619, 411 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +dense-alloy-wall + rotate: false + xy: 619, 411 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-dense-alloy-wall-large + rotate: false + xy: 475, 435 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +dense-alloy-wall-large rotate: false xy: 475, 435 size: 16, 16 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3d718905d4..db8eae01e8 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 3b19b2960c..5e1dc00598 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -19,8 +19,8 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.copperWall, new ItemStack(Items.copper, 12)); new Recipe(defense, DefenseBlocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4)); - new Recipe(defense, DefenseBlocks.compositeWall, new ItemStack(Items.densealloy, 12)); - new Recipe(defense, DefenseBlocks.compositeWallLarge, new ItemStack(Items.densealloy, 12 * 4)); + new Recipe(defense, DefenseBlocks.denseAlloyWall, new ItemStack(Items.densealloy, 12)); + new Recipe(defense, DefenseBlocks.denseAlloyWallLarge, new ItemStack(Items.densealloy, 12 * 4)); new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index d459561901..a6f335bedb 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -114,10 +114,9 @@ public class DebugBlocks extends BlockList implements ContentList{ for(int i = 0; i < items.size; i++){ if(i == 0) continue; final int f = i; - ImageButton button = cont.addImageButton("white", "toggle", 24, () -> { + ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "toggle", 24, () -> { Call.setLiquidSourceLiquid(null, tile, items.get(f)); }).size(38, 42).padBottom(-5.1f).group(group).get(); - button.getStyle().imageUpColor = items.get(i).color; button.setChecked(entity.source.id == f); if(i % 4 == 3){ diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 001ab1d461..5c94f5ca00 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.*; public class DefenseBlocks extends BlockList implements ContentList{ - public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, + public static Block copperWall, copperWallLarge, denseAlloyWall, denseAlloyWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine; @Override @@ -23,11 +23,11 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; - compositeWall = new Wall("composite-wall"){{ + denseAlloyWall = new Wall("dense-alloy-wall"){{ health = 110 * wallHealthMultiplier; }}; - compositeWallLarge = new Wall("composite-wall-large"){{ + denseAlloyWallLarge = new Wall("dense-alloy-wall-large"){{ health = 110 * wallHealthMultiplier * 4; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 522a0c17d4..afaa1ad879 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -217,10 +217,12 @@ public class TurretBlocks extends BlockList implements ContentList{ spectre = new DoubleTurret("spectre"){{ ammoTypes = new AmmoType[]{AmmoTypes.bulletDenseBig, AmmoTypes.bulletPyratiteBig, AmmoTypes.bulletThoriumBig}; reload = 4f; + coolantMultiplier = 0.5f; + maxCoolantUsed = 1.5f; restitution = 0.1f; ammoUseEffect = ShootFx.shellEjectBig; range = 200f; - inaccuracy = 4f; + inaccuracy = 3f; recoil = 3f; xRand = 3f; shotWidth = 4f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 4cd49b9747..8aee521de2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -15,7 +15,7 @@ public class CooledTurret extends Turret{ /**How much reload is lowered by for each unit of liquid of heat capacity 1.*/ protected float coolantMultiplier = 1f; /**Max coolant used per tick.*/ - protected float maxUsed = 1f; + protected float maxCoolantUsed = 1f; protected Effect coolEffect = BlockFx.fuelburn; public CooledTurret(String name){ @@ -33,7 +33,7 @@ public class CooledTurret extends Turret{ TurretEntity entity = tile.entity(); Liquid liquid = entity.liquids.current(); - float used = Math.min(Math.min(entity.liquids.get(liquid), maxUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); + float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); entity.reload += (used * liquid.heatCapacity) / liquid.heatCapacity; entity.liquids.remove(liquid, used);