From 3d4ace6ca856065ded2222c67a24b2bb9b73ae97 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 7 Oct 2020 18:24:30 -0700 Subject: [PATCH 1/5] If units can have `chargeSound`, why not `chargeTurret`s too? --- .../mindustry/world/blocks/defense/turrets/ChargeTurret.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 3680cce446..d5e7767cdf 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.defense.turrets; +import arc.audio.*; import arc.math.*; import arc.util.*; import mindustry.content.*; @@ -14,6 +15,7 @@ public class ChargeTurret extends PowerTurret{ public float chargeMaxDelay = 10f; public Effect chargeEffect = Fx.none; public Effect chargeBeginEffect = Fx.none; + public Sound chargeSound = Sounds.none; public ChargeTurret(String name){ super(name); @@ -28,7 +30,8 @@ public class ChargeTurret extends PowerTurret{ tr.trns(rotation, size * tilesize / 2f); chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); - + chargeSound.at(tile, Mathf.random(0.9f, 1.1f)); + for(int i = 0; i < chargeEffects; i++){ Time.run(Mathf.random(chargeMaxDelay), () -> { if(!isValid()) return; From 4317cad110d4c8031c46e6a74a99a98fa6da87c5 Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Wed, 7 Oct 2020 19:07:01 -0700 Subject: [PATCH 2/5] Since my Gradle is broken or something, I'll be relying on Travis until I get it fixed. --- .../mindustry/world/blocks/defense/turrets/ChargeTurret.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index d5e7767cdf..ab0cfbd9e4 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -6,6 +6,7 @@ import arc.util.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; +import mindustry.type.*; import static mindustry.Vars.*; @@ -30,7 +31,7 @@ public class ChargeTurret extends PowerTurret{ tr.trns(rotation, size * tilesize / 2f); chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); - chargeSound.at(tile, Mathf.random(0.9f, 1.1f)); + chargeSound.at(x + tr.x, y + tr.y, Mathf.random(0.8f, 1f)); for(int i = 0; i < chargeEffects; i++){ Time.run(Mathf.random(chargeMaxDelay), () -> { From f93b80dd3692df24c76cefa1139754df611b22ae Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Wed, 7 Oct 2020 21:24:32 -0700 Subject: [PATCH 3/5] thx --- .../src/mindustry/world/blocks/defense/turrets/ChargeTurret.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index ab0cfbd9e4..197ca83358 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -7,6 +7,7 @@ import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; import mindustry.type.*; +import mindustry.gen.*; import static mindustry.Vars.*; From 5600f96a37c6e87a55132281ebae20f83f3c9cb8 Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Sat, 10 Oct 2020 18:03:53 -0700 Subject: [PATCH 4/5] Make the sound pitch not random. --- .../mindustry/world/blocks/defense/turrets/ChargeTurret.java | 2 +- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 197ca83358..15feaf0379 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -32,7 +32,7 @@ public class ChargeTurret extends PowerTurret{ tr.trns(rotation, size * tilesize / 2f); chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); - chargeSound.at(x + tr.x, y + tr.y, Mathf.random(0.8f, 1f)); + chargeSound.at(x + tr.x, y + tr.y, 1); for(int i = 0; i < chargeEffects; i++){ Time.run(Mathf.random(chargeMaxDelay), () -> { diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 9d925af2f3..378b90da4e 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -432,7 +432,7 @@ public abstract class Turret extends Block{ fshootEffect.at(x + tr.x, y + tr.y, rotation); fsmokeEffect.at(x + tr.x, y + tr.y, rotation); - shootSound.at(tile, Mathf.random(0.9f, 1.1f)); + shootSound.at(x + tr.x, y + tr.y, 1); if(shootShake > 0){ Effect.shake(shootShake, shootShake, this); From 7662174dc41c52fbfdb019633bf278fc9a56f5d4 Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Sun, 11 Oct 2020 12:58:50 -0700 Subject: [PATCH 5/5] oki doki --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 378b90da4e..703833594a 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -432,7 +432,7 @@ public abstract class Turret extends Block{ fshootEffect.at(x + tr.x, y + tr.y, rotation); fsmokeEffect.at(x + tr.x, y + tr.y, rotation); - shootSound.at(x + tr.x, y + tr.y, 1); + shootSound.at(x + tr.x, y + tr.y, Mathf.random(0.9f, 1.1f)); if(shootShake > 0){ Effect.shake(shootShake, shootShake, this);