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

Sound file reorganization

Browse Source
This commit is contained in:
Anuken
2025-12-09 14:59:40 -05:00
parent 58eee2b61a
commit e77a1e2f2a
221 changed files with 192 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -24,7 +24,7 @@ public class EnergyFieldAbility extends Ability{
public float damage = 1, reload = 100, range = 60;
public Effect healEffect = Fx.heal, hitEffect = Fx.hitLaserBlast, damageEffect = Fx.chainLightning;
public StatusEffect status = StatusEffects.electrified;
public Sound shootSound = Sounds.spark;
public Sound shootSound = Sounds.shootEnergyField;
public float statusDuration = 60f * 6f;
public float x, y;
public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true;
@@ -185,7 +185,7 @@ public class EnergyFieldAbility extends Ability{
}
if(anyNearby){
shootSound.at(unit);
shootSound.at(unit, 1f + Mathf.range(0.1f), 1f);
if(useAmmo && state.rules.unitAmmo){
unit.ammo --;

12
core/src/mindustry/entities/abilities/MoveLightningAbility.java
View File

@@ -37,15 +37,15 @@ public class MoveLightningAbility extends Ability{
public @Nullable BulletType bullet;
/** Bullet angle parameters */
public float bulletAngle = 0f, bulletSpread = 0f;
public Effect shootEffect = Fx.sparkShoot;
public boolean parentizeEffects;
public Sound shootSound = Sounds.spark;
public Sound shootSound = Sounds.shootArc;
protected float side = 1f;
MoveLightningAbility(){}
public MoveLightningAbility(float damage, int length, float chance, float y, float minSpeed, float maxSpeed, Color color, String heatRegion){
this.damage = damage;
this.length = length;
@@ -56,7 +56,7 @@ public class MoveLightningAbility extends Ability{
this.color = color;
this.heatRegion = heatRegion;
}
public MoveLightningAbility(float damage, int length, float chance, float y, float minSpeed, float maxSpeed, Color color){
this.damage = damage;
this.length = length;
@@ -95,7 +95,7 @@ public class MoveLightningAbility extends Ability{
if(alternate) side *= -1f;
}
}
@Override
public void draw(Unit unit){
float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed));

2
core/src/mindustry/entities/abilities/RepairFieldAbility.java
View File

@@ -15,7 +15,7 @@ public class RepairFieldAbility extends Ability{
public float amount = 1, reload = 100, range = 60, healPercent = 0f;
public Effect healEffect = Fx.heal;
public Effect activeEffect = Fx.healWaveDynamic;
public Sound sound = Sounds.healAbility;
public Sound sound = Sounds.healWave;
public float soundVolume = 0.5f;
public boolean parentizeEffects = false;
/** Multiplies healing to units of the same type by this amount. */

2
core/src/mindustry/entities/comp/BuilderComp.java
View File

@@ -155,7 +155,7 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
if(!within(tile, finalPlaceDst)) continue;
if(!headless){
Vars.control.sound.loop(Sounds.build, tile, 0.15f);
Vars.control.sound.loop(Sounds.loopBuild, tile, 0.15f);
}
if(!(tile.build instanceof ConstructBuild cb)){

2
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1489,7 +1489,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
playDestroySound();
if(explosiveness > 40f){
Sounds.blockExplodeExplosive.at(tile, Mathf.random(block.destroyPitchMin, block.destroyPitchMax), block.destroySoundVolume);
(Mathf.chance(0.5) ? Sounds.blockExplodeExplosive : Sounds.blockExplodeExplosiveAlt).at(tile, Mathf.random(block.destroyPitchMin, block.destroyPitchMax), block.destroySoundVolume);
}else if(flammability > 5f){
Sounds.blockExplodeFlammable.at(tile, Mathf.random(block.destroyPitchMin, block.destroyPitchMax), block.destroySoundVolume);
}

2
core/src/mindustry/entities/comp/FireComp.java
View File

@@ -44,7 +44,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
animation %= frames;
if(!headless){
control.sound.loop(Sounds.fire, this, 0.07f);
control.sound.loop(Sounds.loopFire, this, 0.07f);
}
//faster updates -> disappears more quickly