diff --git a/core/assets/contributors b/core/assets/contributors index 66689d8800..0b6b9cbed0 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -110,6 +110,7 @@ dsmolenaers (freesound.org) Headphaze (freesound.org) Michel Baradari (opengameart.org) Michael Klier (opengameart.org) +Lee Barkovich (opengameart.org) Neoqueto (Darktech LDR Font) Nikolass VolasYouKnow diff --git a/core/assets/sounds/bombDrop.ogg b/core/assets/sounds/bombDrop.ogg new file mode 100644 index 0000000000..a724d6a74a Binary files /dev/null and b/core/assets/sounds/bombDrop.ogg differ diff --git a/core/assets/sounds/flame.ogg b/core/assets/sounds/flame.ogg index ef203e0524..bfd1b06b3f 100644 Binary files a/core/assets/sounds/flame.ogg and b/core/assets/sounds/flame.ogg differ diff --git a/core/assets/sounds/flame2.ogg b/core/assets/sounds/flame2.ogg deleted file mode 100644 index 812774a6e6..0000000000 Binary files a/core/assets/sounds/flame2.ogg and /dev/null differ diff --git a/core/assets/sounds/flamePlasma.ogg b/core/assets/sounds/flamePlasma.ogg new file mode 100644 index 0000000000..bd5004c9ac Binary files /dev/null and b/core/assets/sounds/flamePlasma.ogg differ diff --git a/core/assets/sounds/laser.ogg b/core/assets/sounds/laser.ogg index dce9cf5d3c..8cedadca2d 100644 Binary files a/core/assets/sounds/laser.ogg and b/core/assets/sounds/laser.ogg differ diff --git a/core/assets/sounds/mechStep.ogg b/core/assets/sounds/mechStep.ogg index 1b02d1a496..3de7284a46 100644 Binary files a/core/assets/sounds/mechStep.ogg and b/core/assets/sounds/mechStep.ogg differ diff --git a/core/src/mindustry/audio/SoundPriority.java b/core/src/mindustry/audio/SoundPriority.java index b245a16368..fe8158925c 100644 --- a/core/src/mindustry/audio/SoundPriority.java +++ b/core/src/mindustry/audio/SoundPriority.java @@ -47,6 +47,8 @@ public class SoundPriority{ //very loud laser.setMaxConcurrent(5); + sameGroup(flame, flamePlasma); + //sameGroup(hit1, hit2, hit3); //max(4, hit1, hit2, hit3); diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 1fc55671ac..b1ff7d79a3 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -2023,18 +2023,18 @@ public class Fx{ shootSmallFlame = new Effect(32f, 80f, e -> { color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin()); - randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> { + randLenVectors(e.id, 12, e.finpow() * 60f, e.rotation, 10f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f); }); - }), + }).followParent(false), shootPyraFlame = new Effect(33f, 80f, e -> { color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin()); - randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> { + randLenVectors(e.id, 13, e.finpow() * 70f, e.rotation, 10f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.6f); }); - }), + }).followParent(false), shootLiquid = new Effect(15f, 80f, e -> { color(e.color); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 30804dbd10..0d01764af1 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -123,24 +123,23 @@ public class UnitTypes{ health = 550; armor = 4f; ammoType = new ItemAmmoType(Items.coal); - immunities.add(StatusEffects.burning); weapons.add(new Weapon("flamethrower"){{ top = false; shootSound = Sounds.flame; shootY = 2f; - reload = 11f; + reload = 22f; recoil = 1f; ejectEffect = Fx.none; - bullet = new BulletType(4.2f, 37f){{ + bullet = new BulletType(4.2f, 37f*2f){{ ammoMultiplier = 3f; hitSize = 7f; lifetime = 13f; pierce = true; pierceBuilding = true; pierceCap = 2; - statusDuration = 60f * 4; + statusDuration = 60f * 5; shootEffect = Fx.shootSmallFlame; hitEffect = Fx.hitFlameSmall; despawnEffect = Fx.none; @@ -1055,7 +1054,8 @@ public class UnitTypes{ ejectEffect = Fx.none; inaccuracy = 15f; ignoreRotation = true; - shootSound = Sounds.none; + shootSound = Sounds.bombDrop; + soundPitchMax = 1.2f; bullet = new BombBulletType(27f, 25f){{ width = 10f; height = 14f; @@ -1987,7 +1987,8 @@ public class UnitTypes{ rotateSpeed = 5f; inaccuracy = 10f; ejectEffect = Fx.casing1; - shootSound = Sounds.flame; + shootSound = Sounds.flamePlasma; + shootSoundVolume = 0.9f; shootCone = 30f; bullet = new BulletType(3.4f, 23f){{