Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More sounds

Browse Source
This commit is contained in:
Anuken
2025-11-16 23:18:19 -05:00
parent 98b6ac2d94
commit d4d2a5e54c
10 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/audio/SoundPriority.java
View File

@@ -47,6 +47,8 @@ public class SoundPriority{
//very loud
laser.setMaxConcurrent(5);
sameGroup(flame, flamePlasma);
//sameGroup(hit1, hit2, hit3);
//max(4, hit1, hit2, hit3);

8
core/src/mindustry/content/Fx.java
View File

@@ -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);

13
core/src/mindustry/content/UnitTypes.java
View File

@@ -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){{