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

17
core/src/mindustry/world/Block.java
View File

@@ -311,7 +311,7 @@ public class Block extends UnlockableContent implements Senseable{
/** Sound made when this block is built. */
public Sound placeSound = Sounds.unset;
/** Sound made when this block is deconstructed. */
public Sound breakSound = Sounds.breaks;
public Sound breakSound = Sounds.unset;
/** Sounds made when this block is destroyed.*/
public Sound destroySound = Sounds.unset;
/** Volume of destruction sound. */
@@ -1264,14 +1264,21 @@ public class Block extends UnlockableContent implements Senseable{
destroySound =
size >= 3 ? Sounds.blockExplode3 :
size >= 2 ? Sounds.blockExplode2 :
Sounds.blockExplode1;
new RandomSound(Sounds.blockExplode1, Sounds.blockExplode1Alt);
}
if(placeSound == Sounds.unset){
placeSound =
size >= 3 ? Sounds.place3 :
size >= 2 ? Sounds.place2 :
Sounds.place1;
size >= 3 ? Sounds.blockPlace3 :
size >= 2 ? Sounds.blockPlace2 :
Sounds.blockPlace1;
}
if(breakSound == Sounds.unset){
breakSound =
size >= 3 ? Sounds.blockBreak3 :
size >= 2 ? Sounds.blockBreak2 :
Sounds.blockBreak1;
}
//disable standard shadow

2
core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java
View File

@@ -65,7 +65,7 @@ public class DirectionalForceProjector extends Block{
solid = true;
group = BlockGroup.projectors;
envEnabled |= Env.space;
ambientSound = Sounds.shield;
ambientSound = Sounds.loopShield;
ambientSoundVolume = 0.08f;
}

2
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -77,7 +77,7 @@ public class ForceProjector extends Block{
hasLiquids = true;
hasItems = true;
envEnabled |= Env.space;
ambientSound = Sounds.shield;
ambientSound = Sounds.loopShield;
ambientSoundVolume = 0.08f;
flags = EnumSet.of(BlockFlag.shield);

2
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -29,7 +29,7 @@ public class MendProjector extends Block{
public float phaseBoost = 12f;
public float phaseRangeBoost = 50f;
public float useTime = 400f;
public Sound mendSound = Sounds.healAbility;
public Sound mendSound = Sounds.healWave;
public float mendSoundVolume = 0.5f;
private boolean any = false;

2
core/src/mindustry/world/blocks/defense/Wall.java
View File

@@ -20,7 +20,7 @@ public class Wall extends Block{
public float lightningDamage = 20f;
public int lightningLength = 17;
public Color lightningColor = Pal.surge;
public Sound lightningSound = Sounds.spark;
public Sound lightningSound = Sounds.shootArc;
/** Bullet deflection chance. -1 to disable */
public float chanceDeflect = -1f;

2
core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
View File

@@ -17,7 +17,7 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
super(name);
hasLiquids = true;
//TODO
loopSound = Sounds.minebeam;
loopSound = Sounds.loopMineBeam;
shootSound = Sounds.none;
smokeEffect = Fx.none;
shootEffect = Fx.none;

2
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -21,7 +21,7 @@ public class LiquidTurret extends Turret{
public LiquidTurret(String name){
super(name);
hasLiquids = true;
loopSound = Sounds.spray;
loopSound = Sounds.loopSpray;
shootSound = Sounds.none;
smokeEffect = Fx.none;
shootEffect = Fx.none;

2
core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
View File

@@ -31,7 +31,7 @@ public class TractorBeamTurret extends BaseTurret{
public StatusEffect status = StatusEffects.none;
public float statusDuration = 300;
public Sound shootSound = Sounds.tractorbeam;
public Sound shootSound = Sounds.beamParallax;
public float shootSoundVolume = 0.9f;
public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -118,7 +118,7 @@ public class Turret extends ReloadTurret{
/** Effect created when ammo is used. Not optional. */
public Effect ammoUseEffect = Fx.none;
/** Sound emitted when a single bullet is shot. */
public Sound shootSound = Sounds.shoot;
public Sound shootSound = Sounds.shootDuo;
/** Volume of shooting sound. */
public float shootSoundVolume = 1f;
/** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */

4
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -46,7 +46,7 @@ public class Conveyor extends Block implements Autotiler{
conveyorPlacement = true;
underBullets = true;
ambientSound = Sounds.conveyor;
ambientSound = Sounds.loopConveyor;
ambientSoundVolume = 0.0022f;
unloadable = false;
noUpdateDisabled = false;
@@ -55,7 +55,7 @@ public class Conveyor extends Block implements Autotiler{
@Override
public void setStats(){
super.setStats();
//have to add a custom calculated speed, since the actual movement speed is apparently not linear
stats.add(Stat.itemsMoved, displayedSpeed, StatUnit.itemsSecond);
}

2
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -54,7 +54,7 @@ public class StackConveyor extends Block implements Autotiler{
underBullets = true;
priority = TargetPriority.transport;
ambientSound = Sounds.conveyor;
ambientSound = Sounds.loopConveyor;
ambientSoundVolume = 0.004f;
}

2
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -196,7 +196,7 @@ public class Floor extends Block{
}
if(isLiquid && walkSound == Sounds.none){
walkSound = Sounds.splash;
walkSound = Sounds.stepWater;
}
}

2
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -71,7 +71,7 @@ public class BeamDrill extends Block{
regionRotated1 = 1;
ignoreLineRotation = true;
ambientSoundVolume = 0.05f;
ambientSound = Sounds.minebeam;
ambientSound = Sounds.loopMineBeam;
envEnabled |= Env.space;
flags = EnumSet.of(BlockFlag.drill);

2
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -81,7 +81,7 @@ public class Drill extends Block{
hasLiquids = true;
liquidCapacity = 5f;
hasItems = true;
ambientSound = Sounds.drill;
ambientSound = Sounds.loopDrill;
ambientSoundVolume = 0.019f;
//drills work in space I guess
envEnabled |= Env.space;

2
core/src/mindustry/world/blocks/production/Fracker.java
View File

@@ -10,7 +10,7 @@ public class Fracker extends SolidPump{
public Fracker(String name){
super(name);
hasItems = true;
ambientSound = Sounds.drill;
ambientSound = Sounds.loopDrill;
ambientSoundVolume = 0.03f;
envRequired |= Env.groundOil;
}

2
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@@ -54,7 +54,7 @@ public class GenericCrafter extends Block{
update = true;
solid = true;
hasItems = true;
ambientSound = Sounds.machine;
ambientSound = Sounds.loopMachine;
sync = true;
ambientSoundVolume = 0.03f;
flags = EnumSet.of(BlockFlag.factory);

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -43,7 +43,7 @@ public class Reconstructor extends UnitBlock{
regionRotated1 = 1;
regionRotated2 = 2;
commandable = true;
ambientSound = Sounds.respawning;
ambientSound = Sounds.loopUnitBuilding;
configurable = true;
config(UnitCommand.class, (ReconstructorBuild build, UnitCommand command) -> build.command = command);
configClear((ReconstructorBuild build) -> build.command = null);

2
core/src/mindustry/world/blocks/units/RepairTurret.java
View File

@@ -63,7 +63,7 @@ public class RepairTurret extends Block{
group = BlockGroup.projectors;
envEnabled |= Env.space;
ambientSound = Sounds.healBeam;
ambientSound = Sounds.beamHeal;
ambientSoundVolume = 1f;
}

2
core/src/mindustry/world/blocks/units/UnitAssembler.java
View File

@@ -64,7 +64,7 @@ public class UnitAssembler extends PayloadBlock{
group = BlockGroup.units;
commandable = true;
quickRotate = false;
ambientSound = Sounds.respawning;
ambientSound = Sounds.loopUnitBuilding;
ambientSoundVolume = 0.13f;
}

2
core/src/mindustry/world/blocks/units/UnitCargoLoader.java
View File

@@ -36,7 +36,7 @@ public class UnitCargoLoader extends Block{
update = true;
hasItems = true;
itemCapacity = 200;
ambientSound = Sounds.respawning;
ambientSound = Sounds.loopUnitBuilding;
}
@Override

2
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -50,7 +50,7 @@ public class UnitFactory extends UnitBlock{
rotate = true;
regionRotated1 = 1;
commandable = true;
ambientSound = Sounds.respawning;
ambientSound = Sounds.loopUnitBuilding;
config(Integer.class, (UnitFactoryBuild build, Integer i) -> {
if(!configurable) return;