diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 06a14b95a8..d944f433f0 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -874,6 +874,7 @@ public class Blocks implements ContentList{ }}; thruster = new Thruster("thruster"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 96)); health = 55 * 16 * wallHealthMultiplier; size = 4; }}; diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index d31aa1694c..5a7bf4d692 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -381,7 +381,7 @@ public class ModsDialog extends BaseDialog{ }).tooltip(c.localizedName); - if(++i % Math.min(Core.graphics.getWidth() / Scl.scl(110), 14) == 0) cs.row(); + if(++i % (int)Math.min(Core.graphics.getWidth() / Scl.scl(110), 14) == 0) cs.row(); } }).grow(); d.addCloseButton(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index e03ed2c0b0..d0e900e479 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -202,10 +202,16 @@ public class Block extends UnlockableContent{ public int outlinedIcon = -1; /** Whether this block has a shadow under it. */ public boolean hasShadow = true; - /** Sounds made when this block is destroyed.*/ - public Sound destroySound = Sounds.boom; + /** Should the sound made when this block is built change in pitch. */ + public boolean placePitchChange = true; + /** Should the sound made when this block is deconstructed change in pitch. */ + public boolean breakPitchChange = true; + /** Sound made when this block is built. */ + public Sound placeSound = Sounds.place; /** Sound made when this block is deconstructed. */ public Sound breakSound = Sounds.breaks; + /** Sounds made when this block is destroyed.*/ + public Sound destroySound = Sounds.boom; /** How reflective this block is. */ public float albedo = 0f; /** Environmental passive light color. */ diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 9113a840a1..ee42782485 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -58,7 +58,7 @@ public class ConstructBlock extends Block{ block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor); Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null)); tile.remove(); - if(shouldPlay()) block.breakSound.at(tile, calcPitch(false)); + if(shouldPlay()) block.breakSound.at(tile, block.breakPitchChange ? calcPitch(false) : 1f); } @Remote(called = Loc.server) @@ -97,7 +97,7 @@ public class ConstructBlock extends Block{ } Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); - if(shouldPlay()) Sounds.place.at(tile, calcPitch(true)); + if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f); Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config)); } diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java index c6c688ae18..6df7ff8eca 100644 --- a/core/src/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -127,24 +127,32 @@ public class GenericCrafter extends Block{ } if(progress >= 1f){ - consume(); - - if(outputItems != null){ - for(ItemStack output : outputItems){ - for(int i = 0; i < output.amount; i++){ - offload(output.item); - } - } - } - - if(outputLiquid != null){ - handleLiquid(this, outputLiquid.liquid, outputLiquid.amount); - } - - craftEffect.at(x, y); - progress %= 1f; + craft(); } + dumpOutputs(); + } + + public void craft(){ + consume(); + + if(outputItems != null){ + for(ItemStack output : outputItems){ + for(int i = 0; i < output.amount; i++){ + offload(output.item); + } + } + } + + if(outputLiquid != null){ + handleLiquid(this, outputLiquid.liquid, outputLiquid.amount); + } + + craftEffect.at(x, y); + progress %= 1f; + } + + public void dumpOutputs(){ if(outputItems != null && timer(timerDump, dumpTime / timeScale)){ for(ItemStack output : outputItems){ dump(output.item); diff --git a/servers_v7.json b/servers_v7.json index 65d54ef732..3ac3890c61 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -46,5 +46,9 @@ { "name": "SubZero", "address": ["minty-server.ddns.net"] + }, + { + "name": "Shiza Minigames", + "address": ["shizashizashiza.ml"] } ]