From 5dc1e290e8bf2d1ed224b141d1277a463984bdb6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 14 Dec 2025 19:36:42 -0500 Subject: [PATCH] Scepter secondary sounds --- .../sounds/shoot/shootScepterSecondary.ogg | Bin 0 -> 17182 bytes core/src/mindustry/content/Fx.java | 35 +++++++++++++++ core/src/mindustry/content/UnitTypes.java | 41 +++--------------- gradle.properties | 2 +- 4 files changed, 42 insertions(+), 36 deletions(-) create mode 100644 core/assets/sounds/shoot/shootScepterSecondary.ogg diff --git a/core/assets/sounds/shoot/shootScepterSecondary.ogg b/core/assets/sounds/shoot/shootScepterSecondary.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2619ad645406bc0a227f0cedf05b685f6ecd82d2 GIT binary patch literal 17182 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 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 3b75ab1437..5caaa4b53b 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -164,6 +164,27 @@ public class Fx{ Lines.circle(e.x, e.y, e.fin() * 6f); }), + hitScepterSecondary = new Effect(8, e -> { + rand.setSeed(e.id); + + for(int i : Mathf.signs){ + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.2f); + Drawf.tri(e.x, e.y, e.fout() * 0.2f + 2f, 5f + 30f * e.fout(), e.rotation + 155f * i); + } + + for(int s = 0; s < rand.random(1, 5); s++){ + float stroke = rand.random(0.5f * e.fin(), e.fin()); + float angle = rand.random(e.rotation - 20f, e.rotation + 20f); + Tmp.v1.trns(angle, rand.random(2f, 40f) * e.fin()); + alpha(e.fout() * rand.random(0.4f, 2f)); + + color(Pal.surge, Color.white, e.fin() * 0.8f); + Lines.stroke(stroke * 1.5f * e.fin() + 0.2f); + Lines.lineAngle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, angle,rand.random(3f, 9f) + 1.5f * e.fin()); + } + + }).layer(Layer.bullet - 1f), + lightning = new Effect(10f, 500f, e -> { if(!(e.data instanceof Seq)) return; Seq lines = e.data(); @@ -1846,6 +1867,20 @@ public class Fx{ Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); }), + shootScepterSecondary = new Effect(4, e -> { + float w = 1.2f + 7 * e.fout(); + + for(int i : Mathf.signs){ + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.5f); + Drawf.tri(e.x, e.y, w, 10f + e.fout() * 2f, e.rotation + i * 90f); + } + + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 0.5f); + Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); + + }).layer(Layer.effect + 1f), + shootTitan = new Effect(10, e -> { color(Pal.lightOrange, e.color, e.fin()); float w = 1.3f + 10 * e.fout(); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d8c92a7947..8094474f20 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -14,7 +14,6 @@ import mindustry.entities.abilities.*; import mindustry.entities.bullet.*; import mindustry.entities.effect.*; import mindustry.entities.part.*; -import mindustry.entities.part.DrawPart.PartProgress; import mindustry.entities.pattern.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -220,40 +219,8 @@ public class UnitTypes{ trailColor = Pal.bulletYellowBack; trailEffect = Fx.bulletSparkSmokeTrailSmall; trailSpread = 12f; - shootEffect = new Effect(4, e -> { - float w = 1.2f + 7 * e.fout(); - - for(int i : Mathf.signs){ - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.5f); - Drawf.tri(e.x, e.y, w, 10f + e.fout() * 2f, e.rotation + i * 90f); - } - - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 0.5f); - Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); - Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); - - }).layer(Layer.effect + 1f); - - hitEffect = new Effect(8, e -> { - Fx.rand.setSeed(e.id); - - for(int i : Mathf.signs){ - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.2f); - Drawf.tri(e.x, e.y, e.fout() * 0.2f + 2f, 5f + 30f * e.fout(), e.rotation + 155f * i); - } - - for(int s = 0; s < Fx.rand.random(1, 5); s++){ - float rand = Fx.rand.random(0.5f * e.fin(), e.fin()); - float angle = Fx.rand.random(e.rotation - 20f, e.rotation + 20f); - Tmp.v1.trns(angle, Fx.rand.random(2f, 40f) * e.fin()); - alpha(e.fout() * Fx.rand.random(0.4f, 2f)); - - color(Pal.surge, Color.white, e.fin() * 0.8f); - Lines.stroke(rand * 1.5f * e.fin() + 0.2f); - Lines.lineAngle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, angle, Fx.rand.random(3f, 9f) + 1.5f * e.fin()); - } - - }).layer(Layer.bullet - 1f); + shootEffect = Fx.shootScepterSecondary; + hitEffect = Fx.hitScepterSecondary; }}; weapons.add( @@ -307,6 +274,8 @@ public class UnitTypes{ rotate = true; ejectEffect = Fx.casing1; bullet = smallBullet; + shootSound = Sounds.shootScepterSecondary; + rotateSpeed = 3f; }}, new Weapon("scepter-mount"){{ reload = 15f; @@ -315,6 +284,8 @@ public class UnitTypes{ rotate = true; ejectEffect = Fx.casing1; bullet = smallBullet; + shootSound = Sounds.shootScepterSecondary; + rotateSpeed = 3f; }} ); }}; diff --git a/gradle.properties b/gradle.properties index ec30b14b41..56c98db055 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=bba30e2f12 +archash=46c0956944