diff --git a/core/assets/sounds/beams/beamHeal.ogg b/core/assets/sounds/beams/beamHeal.ogg index 81440f1dc4..9944e023c4 100644 Binary files a/core/assets/sounds/beams/beamHeal.ogg and b/core/assets/sounds/beams/beamHeal.ogg differ diff --git a/core/assets/sounds/loops/loopCircuit.ogg b/core/assets/sounds/loops/loopCircuit.ogg new file mode 100644 index 0000000000..7928117498 Binary files /dev/null and b/core/assets/sounds/loops/loopCircuit.ogg differ diff --git a/core/assets/sounds/loops/loopDifferential.ogg b/core/assets/sounds/loops/loopDifferential.ogg new file mode 100644 index 0000000000..0e6566475b Binary files /dev/null and b/core/assets/sounds/loops/loopDifferential.ogg differ diff --git a/core/assets/sounds/loops/loopHover.ogg b/core/assets/sounds/loops/loopHover.ogg new file mode 100644 index 0000000000..b51e03e4c1 Binary files /dev/null and b/core/assets/sounds/loops/loopHover.ogg differ diff --git a/core/assets/sounds/loops/loopMachine2.ogg b/core/assets/sounds/loops/loopMachine2.ogg new file mode 100644 index 0000000000..a81f429e34 Binary files /dev/null and b/core/assets/sounds/loops/loopMachine2.ogg differ diff --git a/core/assets/sounds/loops/loopMachineSpin.ogg b/core/assets/sounds/loops/loopMachineSpin.ogg new file mode 100644 index 0000000000..0939d3d476 Binary files /dev/null and b/core/assets/sounds/loops/loopMachineSpin.ogg differ diff --git a/core/assets/sounds/loops/loopRegen.ogg b/core/assets/sounds/loops/loopRegen.ogg new file mode 100644 index 0000000000..1ba4999342 Binary files /dev/null and b/core/assets/sounds/loops/loopRegen.ogg differ diff --git a/core/assets/sounds/loops/loopUnitBuilding.ogg b/core/assets/sounds/loops/loopUnitBuilding.ogg index cc0e4332f8..07893d5944 100644 Binary files a/core/assets/sounds/loops/loopUnitBuilding.ogg and b/core/assets/sounds/loops/loopUnitBuilding.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index bcf2d0e39f..667a87317c 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1189,6 +1189,8 @@ public class Blocks{ envEnabled |= Env.space; size = 2; + ambientSound = Sounds.loopMachineSpin; + ambientSoundVolume = 0.09f; consumePower(0.20f); consumeItems(with(Items.coal, 1, Items.lead, 2, Items.sand, 2)); @@ -1201,6 +1203,8 @@ public class Blocks{ outputItem = new ItemStack(Items.blastCompound, 1); size = 2; envEnabled |= Env.space; + ambientSound = Sounds.loopMachineSpin; + ambientSoundVolume = 0.1f; consumeItems(with(Items.pyratite, 1, Items.sporePod, 1)); consumePower(0.40f); @@ -1932,6 +1936,7 @@ public class Blocks{ consumePower(3.50f); size = 2; consumeItem(Items.phaseFabric).boost(); + ambientSoundVolume = 0.05f; }}; overdriveDome = new OverdriveProjector("overdrive-dome"){{ @@ -2573,9 +2578,9 @@ public class Blocks{ hasLiquids = true; hasItems = true; size = 3; - ambientSound = Sounds.loopSteam; + ambientSound = Sounds.loopDifferential; generateEffect = Fx.generatespark; - ambientSoundVolume = 0.05f; + ambientSoundVolume = 0.12f; drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion(), new DrawLiquidRegion()); diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index ef98fb550a..2e9996ea24 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -417,7 +417,7 @@ public class Weapon implements Cloneable{ //flip weapon shoot side for alternating weapons boolean wasFlipped = mount.side; - if(otherSide != -1 && alternate && mount.side == flipSprite && mount.reload <= reload / 2f && lastReload > reload / 2f){ + if(otherSide >= 0 && alternate && mount.side == flipSprite && otherSide < unit.mounts.length && mount.reload <= reload / 2f && lastReload > reload / 2f){ unit.mounts[otherSide].side = !unit.mounts[otherSide].side; mount.side = !mount.side; } diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 9e957d0eee..17c606bd86 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -41,6 +41,8 @@ public class OverdriveProjector extends Block{ emitLight = true; lightRadius = 50f; envEnabled |= Env.space; + ambientSound = Sounds.loopCircuit; + ambientSoundVolume = 0.13f; } @Override @@ -71,7 +73,7 @@ public class OverdriveProjector extends Block{ stats.add(Stat.booster, StatValues.itemBoosters("+{0}%", stats.timePeriod, speedBoostPhase * 100f, phaseRangeBoost, items.items)); } } - + @Override public void setBars(){ super.setBars(); diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java index 15a163ff5c..88a1a8e549 100644 --- a/core/src/mindustry/world/blocks/defense/RegenProjector.java +++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java @@ -47,6 +47,8 @@ public class RegenProjector extends Block{ envEnabled |= Env.space; rotateDraw = false; flags = EnumSet.of(BlockFlag.blockRepair); + ambientSound = Sounds.loopRegen; + ambientSoundVolume = 0.45f; } @Override