diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index 94df1e5a9c..fb5d4d4b04 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -120,10 +120,10 @@ public class AssetsProcess extends BaseProcessor{ names.add(name); } - if(SourceVersion.isKeyword(name)) name += "s"; + if(SourceVersion.isKeyword(name)) name += "s"; String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname; - String filename = "\"" + filepath + "\""; + String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3") + "\""; loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3")); diff --git a/core/assets/sounds/artillery.mp3 b/core/assets/sounds/artillery.mp3 deleted file mode 100644 index 640b133984..0000000000 Binary files a/core/assets/sounds/artillery.mp3 and /dev/null differ diff --git a/core/assets/sounds/artillery.ogg b/core/assets/sounds/artillery.ogg new file mode 100644 index 0000000000..d9f8b74d75 Binary files /dev/null and b/core/assets/sounds/artillery.ogg differ diff --git a/core/assets/sounds/back.mp3 b/core/assets/sounds/back.mp3 deleted file mode 100644 index dc47bc9ac5..0000000000 Binary files a/core/assets/sounds/back.mp3 and /dev/null differ diff --git a/core/assets/sounds/back.ogg b/core/assets/sounds/back.ogg new file mode 100644 index 0000000000..381cf83079 Binary files /dev/null and b/core/assets/sounds/back.ogg differ diff --git a/core/assets/sounds/bang.mp3 b/core/assets/sounds/bang.mp3 deleted file mode 100644 index ebe5ffe987..0000000000 Binary files a/core/assets/sounds/bang.mp3 and /dev/null differ diff --git a/core/assets/sounds/bang.ogg b/core/assets/sounds/bang.ogg new file mode 100644 index 0000000000..29cde62552 Binary files /dev/null and b/core/assets/sounds/bang.ogg differ diff --git a/core/assets/sounds/beam.mp3 b/core/assets/sounds/beam.mp3 deleted file mode 100644 index 9d0a0805f0..0000000000 Binary files a/core/assets/sounds/beam.mp3 and /dev/null differ diff --git a/core/assets/sounds/beam.ogg b/core/assets/sounds/beam.ogg new file mode 100644 index 0000000000..9b39f2363c Binary files /dev/null and b/core/assets/sounds/beam.ogg differ diff --git a/core/assets/sounds/bigshot.mp3 b/core/assets/sounds/bigshot.mp3 deleted file mode 100644 index eb47fd470e..0000000000 Binary files a/core/assets/sounds/bigshot.mp3 and /dev/null differ diff --git a/core/assets/sounds/bigshot.ogg b/core/assets/sounds/bigshot.ogg new file mode 100644 index 0000000000..3218eec651 Binary files /dev/null and b/core/assets/sounds/bigshot.ogg differ diff --git a/core/assets/sounds/boom.mp3 b/core/assets/sounds/boom.mp3 deleted file mode 100644 index 1b12d3bc7b..0000000000 Binary files a/core/assets/sounds/boom.mp3 and /dev/null differ diff --git a/core/assets/sounds/boom.ogg b/core/assets/sounds/boom.ogg new file mode 100644 index 0000000000..19f41d80b2 Binary files /dev/null and b/core/assets/sounds/boom.ogg differ diff --git a/core/assets/sounds/break.mp3 b/core/assets/sounds/break.mp3 deleted file mode 100644 index 3abc129cdf..0000000000 Binary files a/core/assets/sounds/break.mp3 and /dev/null differ diff --git a/core/assets/sounds/break.ogg b/core/assets/sounds/break.ogg new file mode 100644 index 0000000000..30ca95aea2 Binary files /dev/null and b/core/assets/sounds/break.ogg differ diff --git a/core/assets/sounds/build.mp3 b/core/assets/sounds/build.mp3 deleted file mode 100644 index 3754346c3a..0000000000 Binary files a/core/assets/sounds/build.mp3 and /dev/null differ diff --git a/core/assets/sounds/build.ogg b/core/assets/sounds/build.ogg new file mode 100644 index 0000000000..8235d41eb9 Binary files /dev/null and b/core/assets/sounds/build.ogg differ diff --git a/core/assets/sounds/buttonClick.mp3 b/core/assets/sounds/buttonClick.mp3 deleted file mode 100644 index c9afb61ca6..0000000000 Binary files a/core/assets/sounds/buttonClick.mp3 and /dev/null differ diff --git a/core/assets/sounds/buttonClick.ogg b/core/assets/sounds/buttonClick.ogg new file mode 100644 index 0000000000..5f225eadcc Binary files /dev/null and b/core/assets/sounds/buttonClick.ogg differ diff --git a/core/assets/sounds/click.mp3 b/core/assets/sounds/click.mp3 deleted file mode 100644 index ff1a219497..0000000000 Binary files a/core/assets/sounds/click.mp3 and /dev/null differ diff --git a/core/assets/sounds/click.ogg b/core/assets/sounds/click.ogg new file mode 100644 index 0000000000..4960f9098f Binary files /dev/null and b/core/assets/sounds/click.ogg differ diff --git a/core/assets/sounds/combustion.mp3 b/core/assets/sounds/combustion.mp3 deleted file mode 100644 index affec20fbc..0000000000 Binary files a/core/assets/sounds/combustion.mp3 and /dev/null differ diff --git a/core/assets/sounds/combustion.ogg b/core/assets/sounds/combustion.ogg new file mode 100644 index 0000000000..6aab153a47 Binary files /dev/null and b/core/assets/sounds/combustion.ogg differ diff --git a/core/assets/sounds/conveyor.mp3 b/core/assets/sounds/conveyor.mp3 deleted file mode 100644 index 0d11430a16..0000000000 Binary files a/core/assets/sounds/conveyor.mp3 and /dev/null differ diff --git a/core/assets/sounds/conveyor.ogg b/core/assets/sounds/conveyor.ogg new file mode 100644 index 0000000000..67576b44a4 Binary files /dev/null and b/core/assets/sounds/conveyor.ogg differ diff --git a/core/assets/sounds/corexplode.mp3 b/core/assets/sounds/corexplode.mp3 deleted file mode 100644 index 80b8317f95..0000000000 Binary files a/core/assets/sounds/corexplode.mp3 and /dev/null differ diff --git a/core/assets/sounds/corexplode.ogg b/core/assets/sounds/corexplode.ogg new file mode 100644 index 0000000000..b26ff4a64c Binary files /dev/null and b/core/assets/sounds/corexplode.ogg differ diff --git a/core/assets/sounds/cutter.mp3 b/core/assets/sounds/cutter.mp3 deleted file mode 100644 index 052f8cec95..0000000000 Binary files a/core/assets/sounds/cutter.mp3 and /dev/null differ diff --git a/core/assets/sounds/cutter.ogg b/core/assets/sounds/cutter.ogg new file mode 100644 index 0000000000..313159006e Binary files /dev/null and b/core/assets/sounds/cutter.ogg differ diff --git a/core/assets/sounds/door.mp3 b/core/assets/sounds/door.mp3 deleted file mode 100644 index 3a1936db22..0000000000 Binary files a/core/assets/sounds/door.mp3 and /dev/null differ diff --git a/core/assets/sounds/door.ogg b/core/assets/sounds/door.ogg new file mode 100644 index 0000000000..121b3c3037 Binary files /dev/null and b/core/assets/sounds/door.ogg differ diff --git a/core/assets/sounds/drill.mp3 b/core/assets/sounds/drill.mp3 deleted file mode 100644 index 784db23ce9..0000000000 Binary files a/core/assets/sounds/drill.mp3 and /dev/null differ diff --git a/core/assets/sounds/drill.ogg b/core/assets/sounds/drill.ogg new file mode 100644 index 0000000000..f21898b646 Binary files /dev/null and b/core/assets/sounds/drill.ogg differ diff --git a/core/assets/sounds/explosion.mp3 b/core/assets/sounds/explosion.mp3 deleted file mode 100644 index 65a122307b..0000000000 Binary files a/core/assets/sounds/explosion.mp3 and /dev/null differ diff --git a/core/assets/sounds/explosion.ogg b/core/assets/sounds/explosion.ogg new file mode 100644 index 0000000000..5f4a69281d Binary files /dev/null and b/core/assets/sounds/explosion.ogg differ diff --git a/core/assets/sounds/explosionbig.mp3 b/core/assets/sounds/explosionbig.mp3 deleted file mode 100644 index 869079ea61..0000000000 Binary files a/core/assets/sounds/explosionbig.mp3 and /dev/null differ diff --git a/core/assets/sounds/explosionbig.ogg b/core/assets/sounds/explosionbig.ogg new file mode 100644 index 0000000000..30cb7933f0 Binary files /dev/null and b/core/assets/sounds/explosionbig.ogg differ diff --git a/core/assets/sounds/fire.mp3 b/core/assets/sounds/fire.mp3 deleted file mode 100644 index d00468b5c4..0000000000 Binary files a/core/assets/sounds/fire.mp3 and /dev/null differ diff --git a/core/assets/sounds/fire.ogg b/core/assets/sounds/fire.ogg new file mode 100644 index 0000000000..0201ee8ea4 Binary files /dev/null and b/core/assets/sounds/fire.ogg differ diff --git a/core/assets/sounds/flame.mp3 b/core/assets/sounds/flame.mp3 deleted file mode 100644 index e1ffbb0c10..0000000000 Binary files a/core/assets/sounds/flame.mp3 and /dev/null differ diff --git a/core/assets/sounds/flame.ogg b/core/assets/sounds/flame.ogg new file mode 100644 index 0000000000..ef203e0524 Binary files /dev/null and b/core/assets/sounds/flame.ogg differ diff --git a/core/assets/sounds/flame2.mp3 b/core/assets/sounds/flame2.mp3 deleted file mode 100644 index 6e61ef2d9c..0000000000 Binary files a/core/assets/sounds/flame2.mp3 and /dev/null differ diff --git a/core/assets/sounds/flame2.ogg b/core/assets/sounds/flame2.ogg new file mode 100644 index 0000000000..812774a6e6 Binary files /dev/null and b/core/assets/sounds/flame2.ogg differ diff --git a/core/assets/sounds/grinding.mp3 b/core/assets/sounds/grinding.mp3 deleted file mode 100644 index 102e0b462e..0000000000 Binary files a/core/assets/sounds/grinding.mp3 and /dev/null differ diff --git a/core/assets/sounds/grinding.ogg b/core/assets/sounds/grinding.ogg new file mode 100644 index 0000000000..f78d2c4e67 Binary files /dev/null and b/core/assets/sounds/grinding.ogg differ diff --git a/core/assets/sounds/hum.mp3 b/core/assets/sounds/hum.mp3 deleted file mode 100644 index 55d477dca5..0000000000 Binary files a/core/assets/sounds/hum.mp3 and /dev/null differ diff --git a/core/assets/sounds/hum.ogg b/core/assets/sounds/hum.ogg new file mode 100644 index 0000000000..184504f3dd Binary files /dev/null and b/core/assets/sounds/hum.ogg differ diff --git a/core/assets/sounds/laser.mp3 b/core/assets/sounds/laser.mp3 deleted file mode 100644 index 63decc2696..0000000000 Binary files a/core/assets/sounds/laser.mp3 and /dev/null differ diff --git a/core/assets/sounds/laser.ogg b/core/assets/sounds/laser.ogg new file mode 100644 index 0000000000..3a727c5053 Binary files /dev/null and b/core/assets/sounds/laser.ogg differ diff --git a/core/assets/sounds/laserbig.mp3 b/core/assets/sounds/laserbig.mp3 deleted file mode 100644 index a95bf7908d..0000000000 Binary files a/core/assets/sounds/laserbig.mp3 and /dev/null differ diff --git a/core/assets/sounds/laserbig.ogg b/core/assets/sounds/laserbig.ogg new file mode 100644 index 0000000000..4aa6658cf6 Binary files /dev/null and b/core/assets/sounds/laserbig.ogg differ diff --git a/core/assets/sounds/laserblast.mp3 b/core/assets/sounds/laserblast.mp3 deleted file mode 100644 index a19fdf379d..0000000000 Binary files a/core/assets/sounds/laserblast.mp3 and /dev/null differ diff --git a/core/assets/sounds/laserblast.ogg b/core/assets/sounds/laserblast.ogg new file mode 100644 index 0000000000..6df3b14284 Binary files /dev/null and b/core/assets/sounds/laserblast.ogg differ diff --git a/core/assets/sounds/lasercharge.mp3 b/core/assets/sounds/lasercharge.mp3 deleted file mode 100644 index 5f325c8e99..0000000000 Binary files a/core/assets/sounds/lasercharge.mp3 and /dev/null differ diff --git a/core/assets/sounds/lasercharge.ogg b/core/assets/sounds/lasercharge.ogg new file mode 100644 index 0000000000..7e50df3661 Binary files /dev/null and b/core/assets/sounds/lasercharge.ogg differ diff --git a/core/assets/sounds/lasercharge2.mp3 b/core/assets/sounds/lasercharge2.mp3 deleted file mode 100644 index ae31defa98..0000000000 Binary files a/core/assets/sounds/lasercharge2.mp3 and /dev/null differ diff --git a/core/assets/sounds/lasercharge2.ogg b/core/assets/sounds/lasercharge2.ogg new file mode 100644 index 0000000000..2a737e5f63 Binary files /dev/null and b/core/assets/sounds/lasercharge2.ogg differ diff --git a/core/assets/sounds/lasershoot.mp3 b/core/assets/sounds/lasershoot.mp3 deleted file mode 100644 index a63664ac3d..0000000000 Binary files a/core/assets/sounds/lasershoot.mp3 and /dev/null differ diff --git a/core/assets/sounds/lasershoot.ogg b/core/assets/sounds/lasershoot.ogg new file mode 100644 index 0000000000..d25c17a4cb Binary files /dev/null and b/core/assets/sounds/lasershoot.ogg differ diff --git a/core/assets/sounds/machine.mp3 b/core/assets/sounds/machine.mp3 deleted file mode 100644 index a30f8672b2..0000000000 Binary files a/core/assets/sounds/machine.mp3 and /dev/null differ diff --git a/core/assets/sounds/machine.ogg b/core/assets/sounds/machine.ogg new file mode 100644 index 0000000000..42429721a0 Binary files /dev/null and b/core/assets/sounds/machine.ogg differ diff --git a/core/assets/sounds/message.mp3 b/core/assets/sounds/message.mp3 deleted file mode 100644 index 63d436e806..0000000000 Binary files a/core/assets/sounds/message.mp3 and /dev/null differ diff --git a/core/assets/sounds/message.ogg b/core/assets/sounds/message.ogg new file mode 100644 index 0000000000..2db223d24e Binary files /dev/null and b/core/assets/sounds/message.ogg differ diff --git a/core/assets/sounds/minebeam.mp3 b/core/assets/sounds/minebeam.mp3 deleted file mode 100644 index dceaca8b6a..0000000000 Binary files a/core/assets/sounds/minebeam.mp3 and /dev/null differ diff --git a/core/assets/sounds/minebeam.ogg b/core/assets/sounds/minebeam.ogg new file mode 100644 index 0000000000..27f75a8531 Binary files /dev/null and b/core/assets/sounds/minebeam.ogg differ diff --git a/core/assets/sounds/missile.mp3 b/core/assets/sounds/missile.mp3 deleted file mode 100644 index 45b3a6519d..0000000000 Binary files a/core/assets/sounds/missile.mp3 and /dev/null differ diff --git a/core/assets/sounds/missile.ogg b/core/assets/sounds/missile.ogg new file mode 100644 index 0000000000..eb13976d87 Binary files /dev/null and b/core/assets/sounds/missile.ogg differ diff --git a/core/assets/sounds/mud.mp3 b/core/assets/sounds/mud.mp3 deleted file mode 100644 index 73d726b53f..0000000000 Binary files a/core/assets/sounds/mud.mp3 and /dev/null differ diff --git a/core/assets/sounds/mud.ogg b/core/assets/sounds/mud.ogg new file mode 100644 index 0000000000..8eb75cb67e Binary files /dev/null and b/core/assets/sounds/mud.ogg differ diff --git a/core/assets/sounds/pew.mp3 b/core/assets/sounds/pew.mp3 deleted file mode 100644 index 5e70e5e7a1..0000000000 Binary files a/core/assets/sounds/pew.mp3 and /dev/null differ diff --git a/core/assets/sounds/pew.ogg b/core/assets/sounds/pew.ogg new file mode 100644 index 0000000000..6a15b963e3 Binary files /dev/null and b/core/assets/sounds/pew.ogg differ diff --git a/core/assets/sounds/pew_.mp3 b/core/assets/sounds/pew_.mp3 deleted file mode 100644 index d7e610f4a6..0000000000 Binary files a/core/assets/sounds/pew_.mp3 and /dev/null differ diff --git a/core/assets/sounds/pew_.ogg b/core/assets/sounds/pew_.ogg new file mode 100644 index 0000000000..0c1df7f711 Binary files /dev/null and b/core/assets/sounds/pew_.ogg differ diff --git a/core/assets/sounds/place.mp3 b/core/assets/sounds/place.mp3 deleted file mode 100644 index 6cae487e8e..0000000000 Binary files a/core/assets/sounds/place.mp3 and /dev/null differ diff --git a/core/assets/sounds/place.ogg b/core/assets/sounds/place.ogg new file mode 100644 index 0000000000..ff1d05c211 Binary files /dev/null and b/core/assets/sounds/place.ogg differ diff --git a/core/assets/sounds/press.mp3 b/core/assets/sounds/press.mp3 deleted file mode 100644 index 871d9cd07c..0000000000 Binary files a/core/assets/sounds/press.mp3 and /dev/null differ diff --git a/core/assets/sounds/press.ogg b/core/assets/sounds/press.ogg new file mode 100644 index 0000000000..7085dc00a0 Binary files /dev/null and b/core/assets/sounds/press.ogg differ diff --git a/core/assets/sounds/pulse.mp3 b/core/assets/sounds/pulse.mp3 deleted file mode 100644 index fdc28e2517..0000000000 Binary files a/core/assets/sounds/pulse.mp3 and /dev/null differ diff --git a/core/assets/sounds/pulse.ogg b/core/assets/sounds/pulse.ogg new file mode 100644 index 0000000000..6c135c8a07 Binary files /dev/null and b/core/assets/sounds/pulse.ogg differ diff --git a/core/assets/sounds/railgun.mp3 b/core/assets/sounds/railgun.mp3 deleted file mode 100644 index 813f4f17cf..0000000000 Binary files a/core/assets/sounds/railgun.mp3 and /dev/null differ diff --git a/core/assets/sounds/railgun.ogg b/core/assets/sounds/railgun.ogg new file mode 100644 index 0000000000..d8de298916 Binary files /dev/null and b/core/assets/sounds/railgun.ogg differ diff --git a/core/assets/sounds/rain.mp3 b/core/assets/sounds/rain.mp3 deleted file mode 100644 index 35ce7f2554..0000000000 Binary files a/core/assets/sounds/rain.mp3 and /dev/null differ diff --git a/core/assets/sounds/rain.ogg b/core/assets/sounds/rain.ogg new file mode 100644 index 0000000000..ecf90ea73d Binary files /dev/null and b/core/assets/sounds/rain.ogg differ diff --git a/core/assets/sounds/release.mp3 b/core/assets/sounds/release.mp3 deleted file mode 100644 index e2941e1485..0000000000 Binary files a/core/assets/sounds/release.mp3 and /dev/null differ diff --git a/core/assets/sounds/release.ogg b/core/assets/sounds/release.ogg new file mode 100644 index 0000000000..89efd2ca2e Binary files /dev/null and b/core/assets/sounds/release.ogg differ diff --git a/core/assets/sounds/respawn.mp3 b/core/assets/sounds/respawn.mp3 deleted file mode 100644 index b26350b487..0000000000 Binary files a/core/assets/sounds/respawn.mp3 and /dev/null differ diff --git a/core/assets/sounds/respawn.ogg b/core/assets/sounds/respawn.ogg new file mode 100644 index 0000000000..b194989ebf Binary files /dev/null and b/core/assets/sounds/respawn.ogg differ diff --git a/core/assets/sounds/respawning.mp3 b/core/assets/sounds/respawning.mp3 deleted file mode 100644 index b4ec328980..0000000000 Binary files a/core/assets/sounds/respawning.mp3 and /dev/null differ diff --git a/core/assets/sounds/respawning.ogg b/core/assets/sounds/respawning.ogg new file mode 100644 index 0000000000..cc0e4332f8 Binary files /dev/null and b/core/assets/sounds/respawning.ogg differ diff --git a/core/assets/sounds/sap.mp3 b/core/assets/sounds/sap.mp3 deleted file mode 100644 index 3469e73b5f..0000000000 Binary files a/core/assets/sounds/sap.mp3 and /dev/null differ diff --git a/core/assets/sounds/sap.ogg b/core/assets/sounds/sap.ogg new file mode 100644 index 0000000000..d84c282d02 Binary files /dev/null and b/core/assets/sounds/sap.ogg differ diff --git a/core/assets/sounds/shield.mp3 b/core/assets/sounds/shield.mp3 deleted file mode 100644 index 560a8b181e..0000000000 Binary files a/core/assets/sounds/shield.mp3 and /dev/null differ diff --git a/core/assets/sounds/shield.ogg b/core/assets/sounds/shield.ogg new file mode 100644 index 0000000000..b427a07286 Binary files /dev/null and b/core/assets/sounds/shield.ogg differ diff --git a/core/assets/sounds/shoot.mp3 b/core/assets/sounds/shoot.mp3 deleted file mode 100644 index c026c002ed..0000000000 Binary files a/core/assets/sounds/shoot.mp3 and /dev/null differ diff --git a/core/assets/sounds/shoot.ogg b/core/assets/sounds/shoot.ogg new file mode 100644 index 0000000000..d4b1c791c6 Binary files /dev/null and b/core/assets/sounds/shoot.ogg differ diff --git a/core/assets/sounds/shootBig.mp3 b/core/assets/sounds/shootBig.mp3 deleted file mode 100644 index 2164a6c1d4..0000000000 Binary files a/core/assets/sounds/shootBig.mp3 and /dev/null differ diff --git a/core/assets/sounds/shootBig.ogg b/core/assets/sounds/shootBig.ogg new file mode 100644 index 0000000000..9bc3bf055d Binary files /dev/null and b/core/assets/sounds/shootBig.ogg differ diff --git a/core/assets/sounds/shootSnap.mp3 b/core/assets/sounds/shootSnap.mp3 deleted file mode 100644 index 0b66067f98..0000000000 Binary files a/core/assets/sounds/shootSnap.mp3 and /dev/null differ diff --git a/core/assets/sounds/shootSnap.ogg b/core/assets/sounds/shootSnap.ogg new file mode 100644 index 0000000000..17826bb5c0 Binary files /dev/null and b/core/assets/sounds/shootSnap.ogg differ diff --git a/core/assets/sounds/shotgun.mp3 b/core/assets/sounds/shotgun.mp3 deleted file mode 100644 index 3cd876ec0e..0000000000 Binary files a/core/assets/sounds/shotgun.mp3 and /dev/null differ diff --git a/core/assets/sounds/shotgun.ogg b/core/assets/sounds/shotgun.ogg new file mode 100644 index 0000000000..47d5213579 Binary files /dev/null and b/core/assets/sounds/shotgun.ogg differ diff --git a/core/assets/sounds/smelter.mp3 b/core/assets/sounds/smelter.mp3 deleted file mode 100644 index b902624932..0000000000 Binary files a/core/assets/sounds/smelter.mp3 and /dev/null differ diff --git a/core/assets/sounds/smelter.ogg b/core/assets/sounds/smelter.ogg new file mode 100644 index 0000000000..86bbaf63de Binary files /dev/null and b/core/assets/sounds/smelter.ogg differ diff --git a/core/assets/sounds/spark.mp3 b/core/assets/sounds/spark.mp3 deleted file mode 100644 index bf30b670a6..0000000000 Binary files a/core/assets/sounds/spark.mp3 and /dev/null differ diff --git a/core/assets/sounds/spark.ogg b/core/assets/sounds/spark.ogg new file mode 100644 index 0000000000..ac61a476de Binary files /dev/null and b/core/assets/sounds/spark.ogg differ diff --git a/core/assets/sounds/splash.mp3 b/core/assets/sounds/splash.mp3 deleted file mode 100644 index 69b79e154d..0000000000 Binary files a/core/assets/sounds/splash.mp3 and /dev/null differ diff --git a/core/assets/sounds/splash.ogg b/core/assets/sounds/splash.ogg new file mode 100644 index 0000000000..59a77836c4 Binary files /dev/null and b/core/assets/sounds/splash.ogg differ diff --git a/core/assets/sounds/spray.mp3 b/core/assets/sounds/spray.mp3 deleted file mode 100644 index f8e01f3690..0000000000 Binary files a/core/assets/sounds/spray.mp3 and /dev/null differ diff --git a/core/assets/sounds/spray.ogg b/core/assets/sounds/spray.ogg new file mode 100644 index 0000000000..50a2049596 Binary files /dev/null and b/core/assets/sounds/spray.ogg differ diff --git a/core/assets/sounds/steam.mp3 b/core/assets/sounds/steam.mp3 deleted file mode 100644 index 3e19d755b5..0000000000 Binary files a/core/assets/sounds/steam.mp3 and /dev/null differ diff --git a/core/assets/sounds/steam.ogg b/core/assets/sounds/steam.ogg new file mode 100644 index 0000000000..9b65bac938 Binary files /dev/null and b/core/assets/sounds/steam.ogg differ diff --git a/core/assets/sounds/swish.mp3 b/core/assets/sounds/swish.mp3 deleted file mode 100644 index 5d29b3c422..0000000000 Binary files a/core/assets/sounds/swish.mp3 and /dev/null differ diff --git a/core/assets/sounds/swish.ogg b/core/assets/sounds/swish.ogg new file mode 100644 index 0000000000..4b6e5eec53 Binary files /dev/null and b/core/assets/sounds/swish.ogg differ diff --git a/core/assets/sounds/techloop.mp3 b/core/assets/sounds/techloop.mp3 deleted file mode 100644 index d52ef2b73d..0000000000 Binary files a/core/assets/sounds/techloop.mp3 and /dev/null differ diff --git a/core/assets/sounds/techloop.ogg b/core/assets/sounds/techloop.ogg new file mode 100644 index 0000000000..125ac36718 Binary files /dev/null and b/core/assets/sounds/techloop.ogg differ diff --git a/core/assets/sounds/thruster.mp3 b/core/assets/sounds/thruster.mp3 deleted file mode 100644 index 059711d30b..0000000000 Binary files a/core/assets/sounds/thruster.mp3 and /dev/null differ diff --git a/core/assets/sounds/thruster.ogg b/core/assets/sounds/thruster.ogg new file mode 100644 index 0000000000..cba59f95ab Binary files /dev/null and b/core/assets/sounds/thruster.ogg differ diff --git a/core/assets/sounds/tractorbeam.mp3 b/core/assets/sounds/tractorbeam.mp3 deleted file mode 100644 index cdf60a0a48..0000000000 Binary files a/core/assets/sounds/tractorbeam.mp3 and /dev/null differ diff --git a/core/assets/sounds/tractorbeam.ogg b/core/assets/sounds/tractorbeam.ogg new file mode 100644 index 0000000000..4c307c4e08 Binary files /dev/null and b/core/assets/sounds/tractorbeam.ogg differ diff --git a/core/assets/sounds/unlock.mp3 b/core/assets/sounds/unlock.mp3 deleted file mode 100644 index 7549ce044e..0000000000 Binary files a/core/assets/sounds/unlock.mp3 and /dev/null differ diff --git a/core/assets/sounds/unlock.ogg b/core/assets/sounds/unlock.ogg new file mode 100644 index 0000000000..7149b695be Binary files /dev/null and b/core/assets/sounds/unlock.ogg differ diff --git a/core/assets/sounds/wave.mp3 b/core/assets/sounds/wave.mp3 deleted file mode 100644 index 2b6819ce92..0000000000 Binary files a/core/assets/sounds/wave.mp3 and /dev/null differ diff --git a/core/assets/sounds/wave.ogg b/core/assets/sounds/wave.ogg new file mode 100644 index 0000000000..bf74702474 Binary files /dev/null and b/core/assets/sounds/wave.ogg differ diff --git a/core/assets/sounds/wind.mp3 b/core/assets/sounds/wind.mp3 deleted file mode 100644 index 9328f354b4..0000000000 Binary files a/core/assets/sounds/wind.mp3 and /dev/null differ diff --git a/core/assets/sounds/wind.ogg b/core/assets/sounds/wind.ogg new file mode 100644 index 0000000000..aeabe4802b Binary files /dev/null and b/core/assets/sounds/wind.ogg differ diff --git a/core/assets/sounds/wind2.mp3 b/core/assets/sounds/wind2.mp3 deleted file mode 100644 index 7b7381b900..0000000000 Binary files a/core/assets/sounds/wind2.mp3 and /dev/null differ diff --git a/core/assets/sounds/wind2.ogg b/core/assets/sounds/wind2.ogg new file mode 100644 index 0000000000..3900ba35a1 Binary files /dev/null and b/core/assets/sounds/wind2.ogg differ diff --git a/core/assets/sounds/windhowl.mp3 b/core/assets/sounds/windhowl.mp3 deleted file mode 100644 index aa67453a7b..0000000000 Binary files a/core/assets/sounds/windhowl.mp3 and /dev/null differ diff --git a/core/assets/sounds/windhowl.ogg b/core/assets/sounds/windhowl.ogg new file mode 100644 index 0000000000..de7526a616 Binary files /dev/null and b/core/assets/sounds/windhowl.ogg differ diff --git a/core/assets/sounds/windowHide.mp3 b/core/assets/sounds/windowHide.mp3 deleted file mode 100644 index 6778aa0e8a..0000000000 Binary files a/core/assets/sounds/windowHide.mp3 and /dev/null differ diff --git a/core/assets/sounds/windowHide.ogg b/core/assets/sounds/windowHide.ogg new file mode 100644 index 0000000000..9039d4e3b4 Binary files /dev/null and b/core/assets/sounds/windowHide.ogg differ diff --git a/core/src/mindustry/audio/MusicControl.java b/core/src/mindustry/audio/MusicControl.java index 33fd752d48..1b60bf29e5 100644 --- a/core/src/mindustry/audio/MusicControl.java +++ b/core/src/mindustry/audio/MusicControl.java @@ -102,7 +102,7 @@ public class MusicControl{ } /** Plays a random track.*/ - protected void playRandom(){ + public void playRandom(){ if(isDark()){ playOnce(darkMusic.random(lastRandomPlayed)); }else{ diff --git a/core/src/mindustry/mod/ModLoadingMusic.java b/core/src/mindustry/mod/ModLoadingMusic.java index 9b51031783..65ed5e9f48 100644 --- a/core/src/mindustry/mod/ModLoadingMusic.java +++ b/core/src/mindustry/mod/ModLoadingMusic.java @@ -2,6 +2,7 @@ package mindustry.mod; import arc.audio.*; import arc.mock.*; +import arc.util.*; public class ModLoadingMusic implements Music{ public Music music = new MockMusic(); @@ -71,6 +72,11 @@ public class ModLoadingMusic implements Music{ music.setCompletionListener(listener); } + @Override + public void setFilter(int index, @Nullable AudioFilter filter){ + music.setFilter(index, filter); + } + @Override public boolean isDisposed(){ return music.isDisposed(); diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java index 6cf65b1d30..6604c2b361 100644 --- a/core/src/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -3,6 +3,7 @@ package mindustry.mod; import arc.audio.*; import arc.math.geom.*; import arc.mock.*; +import arc.util.*; public class ModLoadingSound implements Sound{ public Sound sound = new MockSound(); @@ -121,4 +122,19 @@ public class ModLoadingSound implements Sound{ public boolean isDisposed(){ return sound.isDisposed(); } + + @Override + public int play(float volume, float pitch, float pan, boolean loop){ + return sound.play(volume, pitch, pan, loop); + } + + @Override + public void setFilter(int index, @Nullable AudioFilter filter){ + sound.setFilter(index, filter); + } + + @Override + public boolean isPlaying(int soundId){ + return sound.isPlaying(soundId); + } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 80771f0001..0420ca35eb 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -26,6 +26,7 @@ public class LiquidTurret extends Turret{ acceptCoolant = false; hasLiquids = true; loopSound = Sounds.spray; + shootSound = Sounds.none; } /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */ @@ -75,7 +76,7 @@ public class LiquidTurret extends Turret{ @Override public boolean shouldActiveSound(){ - return target != null && hasAmmo(); + return wasShooting; } @Override diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 07f3b3ea8e..0a7777daa5 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -136,6 +136,7 @@ public abstract class Turret extends ReloadTurret{ public @Nullable Posc target; public Vec2 targetPos = new Vec2(); public BlockUnitc unit = Nulls.blockUnit; + public boolean wasShooting; @Override public void created(){ @@ -176,11 +177,15 @@ public abstract class Turret extends ReloadTurret{ case rotation -> rotation; case shootX -> World.conv(targetPos.x); case shootY -> World.conv(targetPos.y); - case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0; + case shooting -> isShooting() ? 1 : 0; default -> super.sense(sensor); }; } + public boolean isShooting(){ + return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : target != null); + } + @Override public Unit unit(){ return (Unit)unit; @@ -228,6 +233,8 @@ public abstract class Turret extends ReloadTurret{ public void updateTile(){ if(!validateTarget()) target = null; + wasShooting = false; + recoil = Mathf.lerpDelta(recoil, 0f, restitution); heat = Mathf.lerpDelta(heat, 0f, cooldown); @@ -269,6 +276,7 @@ public abstract class Turret extends ReloadTurret{ } if(Angles.angleDist(rotation, targetRot) < shootCone && canShoot){ + wasShooting = true; updateShooting(); } } diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 4a0f88cd84..514599ce53 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -42,7 +42,7 @@ public class Conveyor extends Block implements Autotiler{ conveyorPlacement = true; ambientSound = Sounds.conveyor; - ambientSoundVolume = 0.0015f; + ambientSoundVolume = 0.0022f; unloadable = false; noUpdateDisabled = false; } diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 34d663b70f..eb4bb4588e 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -67,7 +67,7 @@ public class Drill extends Block{ liquidCapacity = 5f; hasItems = true; ambientSound = Sounds.drill; - ambientSoundVolume = 0.016f; + ambientSoundVolume = 0.015f; } @Override diff --git a/ios/build.gradle b/ios/build.gradle index afd306a656..c3a34b63b6 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -14,6 +14,22 @@ task copyAssets(){ from "../core/assets" into "assets/" } + + exec{ + ignoreExitValue true + commandLine "sh", "./convert_audio.sh", "assets/sounds" + } + + exec{ + ignoreExitValue true + commandLine "sh", "./convert_audio.sh", "assets/music" + } + + delete{ + delete fileTree('assets'){ + include '**/*.ogg' + } + } } }