Sfx overhaul

assets/bundles/bundle.properties

@@ -45,10 +45,10 @@ block.uaw-pulsometer-pump.name = Pulsometer Pump
 block.uaw-pulsometer-pump.description = Pumps and outputs lots of liquid using high-pressure steam.
 
 block.uaw-steam-bore.name = Steam Bore
-block.uaw-steam-bore.description = A steam-powered bore that can gather softer materials at increased efficiency. Also capable of drilling Titanium.
+block.uaw-steam-bore.description = A steam-powered bore, designed to collect softer materials with greater efficiency. Also capable of drilling Titanium.
 
 block.uaw-advanced-steam-bore.name = Advanced Steam Bore
-block.uaw-advanced-steam-bore.description = Bigger, faster, and better than a regular Steam Drill, capable of mining much harder material. \nOil can be used for lubrication, increasing the efficiency.
+block.uaw-advanced-steam-bore.description = Bigger, faster, and better than it predecessor, possessing a remarkable efficiency in excavating vast quantities of softer materials.
 
 block.uaw-steam-thumper.name = Steam Thumper
 block.uaw-steam-thumper.description = Injects high-pressure steam beneath surface coal veins, unearthing a highly potent fuel called anthracite.
@@ -433,6 +433,9 @@ ability.razorrotor = [royal]Razor Rotors[]
 # endregion
 
 # region Stats
+stat.hardness-tresh = + Bore Density
+stat.hardness-upper-tresh = + Denser Ore Bore Speed
+stat.hardness-lower-tresh = + Lighter Ore Bore Speed
 stat.shield = Shield
 # endregion Stats
 

src/UAW/audiovisual/Sfx.java

@@ -7,25 +7,51 @@
 import mindustry.Vars;
 
 public class Sfx {
-	public static Sound
-		cannonShoot1 = new Sound(),
-		cannonShoot2 = new Sound(),
-		cannonShootBig1 = new Sound(),
-		cannonShootBig2 = new Sound(),
-		explosionHuge1 = new Sound(),
-		gunShoot1 = new Sound(),
-		gunShoot2 = new Sound(),
-		gunShoot3 = new Sound(),
-		gunShoot4 = new Sound(),
-		gunShoot5 = new Sound(),
-		launcherShoot1 = new Sound(),
-		mineDetonate1 = new Sound(),
-		missileShootBig1 = new Sound(),
-		missileShootBig2 = new Sound(),
-		shellWhistle = new Sound(),
-		shotgunShoot1 = new Sound(),
-		suppressedShoot1 = new Sound(),
-		torpedoShoot1 = new Sound();
+	public static Sound placeholder,
+
+	// Explosion
+	exp_n_impactHuge_1 = new Sound(),
+
+	// Cannons
+	wp_k_cannonShoot_1 = new Sound(),
+		wp_k_cannonShoot_2 = new Sound(),
+
+	// Gun
+	wp_k_gunShootSmall_1 = new Sound(),
+		wp_k_gunShootSmall_2 = new Sound(),
+
+	wp_k_gunShoot_1 = new Sound(),
+		wp_k_gunShoot_2 = new Sound(),
+		wp_k_gunShoot_3 = new Sound(),
+		wp_k_gunShoot_4 = new Sound(),
+		wp_k_gunShoot_5 = new Sound(),
+		wp_k_gunShoot_6 = new Sound(),
+		wp_k_gunShoot_7 = new Sound(),
+
+	wp_k_gunShootBig_1 = new Sound(),
+		wp_k_gunShootBig_2 = new Sound(),
+
+	// Shotgun
+	wp_k_shotgunShoot_1 = new Sound(),
+		wp_k_shotgunShoot_2 = new Sound(),
+
+	// Launchers
+	wp_lnch_springShoot_1 = new Sound(),
+		wp_lnch_springShoot_2 = new Sound(),
+		wp_lnch_springShoot_3 = new Sound(),
+
+	wp_lnch_energyShoot_1 = new Sound(),
+
+	// Mines
+	wp_mine_detonateSound_1 = new Sound(),
+
+	// Missiles
+	wp_msl_missileLaunch_1_big = new Sound(),
+		wp_msl_missileLaunch_2_big = new Sound(),
+
+	// Torpedoes
+	wp_torp_torpedoLaunch_1 = new Sound();
+
 
 	protected static Sound loadSound(String fileName) {
 		String name = "sounds/" + fileName;
@@ -41,23 +67,42 @@ protected static Sound loadSound(String fileName) {
 
 	public static void load() {
 		if (Vars.headless) return;
-		cannonShoot1 = loadSound("cannon_shoot_1");
-		cannonShoot2 = loadSound("cannon_shoot_2");
-		cannonShootBig1 = loadSound("cannon_shoot_big_1");
-		cannonShootBig2 = loadSound("cannon_shoot_big_2");
-		explosionHuge1 = loadSound("explosion_huge_1");
-		gunShoot1 = loadSound("gun_shoot_1");
-		gunShoot2 = loadSound("gun_shoot_2");
-		gunShoot3 = loadSound("gun_shoot_3");
-		gunShoot4 = loadSound("gun_shoot_4");
-		gunShoot5 = loadSound("gun_shoot_5");
-		launcherShoot1 = loadSound("launcher_shoot_1");
-		mineDetonate1 = loadSound("mine_detonate_1");
-		missileShootBig1 = loadSound("missile_shoot_big_1");
-		missileShootBig2 = loadSound("missile_shoot_big_2");
-		shellWhistle = loadSound("shell-whistle");
-		shotgunShoot1 = loadSound("shotgun_shoot_1");
-		suppressedShoot1 = loadSound("suppressed_shoot_1");
-		torpedoShoot1 = loadSound("torpedo_shoot_1");
+
+		exp_n_impactHuge_1 = loadSound("exp_n_impactHuge_1");
+
+		wp_k_cannonShoot_1 = loadSound("wp_k_cannonShoot_1");
+		wp_k_cannonShoot_2 = loadSound("wp_k_cannonShoot_2");
+
+		wp_k_gunShootSmall_1 = loadSound("wp_k_gunShootSmall_1");
+		wp_k_gunShootSmall_2 = loadSound("wp_k_gunShootSmall_2");
+
+		wp_k_gunShoot_1 = loadSound("wp_k_gunShoot_1");
+		wp_k_gunShoot_2 = loadSound("wp_k_gunShoot_2");
+		wp_k_gunShoot_3 = loadSound("wp_k_gunShoot_3");
+		wp_k_gunShoot_4 = loadSound("wp_k_gunShoot_4");
+		wp_k_gunShoot_5 = loadSound("wp_k_gunShoot_5");
+		wp_k_gunShoot_6 = loadSound("wp_k_gunShoot_6");
+		wp_k_gunShoot_7 = loadSound("wp_k_gunShoot_7");
+
+		wp_k_gunShootBig_1 = loadSound("wp_k_gunShootBig_1");
+		wp_k_gunShootBig_2 = loadSound("wp_k_gunShootBig_2");
+
+		wp_k_shotgunShoot_1 = loadSound("wp_k_shotgunShoot_1");
+		wp_k_shotgunShoot_2 = loadSound("wp_k_shotgunShoot_2");
+
+		wp_lnch_springShoot_1 = loadSound("wp_lnch_springShoot_1");
+		wp_lnch_springShoot_2 = loadSound("wp_lnch_springShoot_2");
+		wp_lnch_springShoot_3 = loadSound("wp_lnch_springShoot_3");
+
+		wp_lnch_energyShoot_1 = loadSound("wp_lnch_energyShoot_1");
+
+		wp_mine_detonateSound_1 = loadSound("wp_mine_detonateSound_1");
+
+		wp_msl_missileLaunch_1_big = loadSound("wp_msl_missileLaunch_1_big");
+		wp_msl_missileLaunch_2_big = loadSound("wp_msl_missileLaunch_2_big");
+
+		wp_torp_torpedoLaunch_1 = loadSound("wp_torp_torpedoLaunch_1");
 	}
+
+
 }

src/UAW/content/UAWTechTree.java

@@ -51,7 +51,7 @@ public static void load() {
 				});
 
 				node(steamBore, () -> {
-					node(advancedSteamDrill);
+					node(advancedSteamBore);
 					node(ironcladCompressor, Seq.with(new Research(multiPress)), () -> {
 					});
 					node(steamThumper, () -> {

src/UAW/content/UAWUnitTypes.java

@@ -190,7 +190,7 @@ public static void load() {
 				x = 8f;
 				y = 4.5f;
 				reload = 4f;
-				shootSound = Sfx.gunShoot3;
+				shootSound = Sfx.wp_k_gunShootSmall_2;
 				ejectEffect = Fx.casing1;
 				bullet = new TrailBulletType(6f, 15) {{
 					height = 8f;
@@ -250,7 +250,7 @@ public static void load() {
 				y = 11f;
 				reload = 4;
 				recoil = 0f;
-				shootSound = Sfx.gunShoot3;
+				shootSound = Sfx.wp_k_gunShootSmall_1;
 				ejectEffect = Fx.casing1;
 				bullet = new TrailBulletType(10f, 24) {{
 					trailLengthScale = 1;
@@ -313,7 +313,7 @@ public static void load() {
 				y = 3.5f;
 				maxRange = unitRange;
 				reload = 2f * 60;
-				shootSound = Sfx.missileShootBig1;
+				shootSound = Sfx.wp_msl_missileLaunch_1_big;
 
 				bullet = new BulletType() {{
 					hitColor = Pal.lightPyraFlame;
@@ -415,7 +415,7 @@ public static void load() {
 				x = 20 * px;
 				y = 80 * px;
 				reload = 2.5f;
-				shootSound = Sfx.gunShoot3;
+				shootSound = Sfx.wp_k_gunShoot_2;
 				ejectEffect = Fx.casing1;
 				bullet = new BasicBulletType(7f, 12) {{
 					height = 12f;
@@ -438,7 +438,7 @@ public static void load() {
 				x = 40 * px;
 				y = 52 * px;
 				reload = 8;
-				shootSound = Sounds.shootBig;
+				shootSound = Sfx.wp_k_gunShoot_7;
 				ejectEffect = Fx.casing2;
 				bullet = new TrailBulletType(5f, 35) {{
 					trailLengthScale = 0.8f;
@@ -471,7 +471,7 @@ public static void load() {
 				x = 40 * px;
 				y = -26 * px;
 				reload = 5 * tick;
-				shootSound = Sfx.missileShootBig1;
+				shootSound = Sfx.wp_msl_missileLaunch_2_big;
 				bullet = new BulletType() {{
 					hitColor = UAWPal.cryoFront;
 					shootEffect = Fx.shootBigColor;
@@ -561,7 +561,7 @@ public static void load() {
 				y = 15 * px;
 				reload = 60f;
 				recoil = 6 * px;
-				shootSound = Sfx.gunShoot5;
+				shootSound = Sfx.wp_lnch_springShoot_2;
 				ejectEffect = Fx.casing3;
 				bullet = new StatusEffectBulletType(UAWStatusEffects.cryoBurn, 3 * tick) {{
 					lifetime = unitRange / speed;
@@ -664,7 +664,7 @@ public static void load() {
 				x = y = 0;
 				reload = 3f * tick;
 				recoil = 0;
-				shootSound = Sfx.cannonShoot1;
+				shootSound = Sfx.wp_lnch_springShoot_2;
 				ejectEffect = Fx.casing3;
 				shootY = 82 * px;
 				shoot = new ShootAlternate() {{
@@ -1149,7 +1149,7 @@ public static void load() {
 				inaccuracy = 10f;
 				reload = 5f * 60;
 				recoil = 2f;
-				shootSound = Sfx.cannonShootBig1;
+				shootSound = Sfx.wp_k_cannonShoot_1;
 				shake = 16;
 				shootStatusDuration = reload * 1.5f;
 				shootStatus = StatusEffects.slow;
@@ -1164,7 +1164,7 @@ public static void load() {
 					incendChance = 0.8f;
 					incendSpread = 16f;
 					makeFire = true;
-					hitSound = Sfx.explosionHuge1;
+					hitSound = Sfx.exp_n_impactHuge_1;
 					trailInterval = 18;
 					trailChance = -1;
 					trailEffect = new MultiEffect(
@@ -1247,7 +1247,7 @@ public static void load() {
 				x = 28f * px;
 				y = -12f * px;
 				reload = 5f;
-				shootSound = Sfx.gunShoot3;
+				shootSound = Sfx.wp_k_gunShootSmall_2;
 				ejectEffect = Fx.casing1;
 				bullet = new TrailBulletType(6f, 2) {{
 					height = 8f;
@@ -1269,7 +1269,7 @@ public static void load() {
 				ammoType = new ItemAmmoType(Items.thorium);
 				targetAir = false;
 
-				shootSound = Sfx.torpedoShoot1;
+				shootSound = Sfx.wp_torp_torpedoLaunch_1;
 
 				bullet = new TorpedoBulletType(1.8f, 550) {{
 					shootEffect = new MultiEffect(
@@ -1334,7 +1334,7 @@ public static void load() {
 				inaccuracy = 1f;
 				targetAir = false;
 
-				shootSound = Sfx.torpedoShoot1;
+				shootSound = Sfx.wp_torp_torpedoLaunch_1;
 
 				bullet = new TorpedoBulletType(1.8f, 650) {{
 					shootEffect = new MultiEffect(
@@ -1375,7 +1375,7 @@ public static void load() {
 				y = -5f;
 				reload = 7;
 				recoil = 1f;
-				shootSound = Sounds.shoot;
+				shootSound = Sfx.wp_k_gunShootSmall_2;
 				ejectEffect = Fx.casing2;
 				bullet = new BasicBulletType(7f, 25) {{
 					height = 10f;
@@ -1532,7 +1532,7 @@ public static void load() {
 					recoil = 1f;
 					inaccuracy = 12f;
 
-					shootSound = Sfx.gunShoot3;
+					shootSound = Sfx.wp_k_gunShoot_6;
 					ejectEffect = Fx.casing1;
 
 					bullet = new BasicBulletType(6f, 10) {{
@@ -1613,7 +1613,7 @@ public static void load() {
 					shootY = 117f * px;
 					shake = 18f;
 
-					shootSound = Sfx.cannonShoot1;
+					shootSound = Sfx.wp_k_gunShoot_7;
 					ejectEffect = UAWFx.casing3Long;
 					bullet = new HighVelocityShellBulletType(15f, 355) {{
 						shootEffect = new MultiEffect(
@@ -1813,7 +1813,7 @@ public static void load() {
 					shootY = 165f * px;
 					shake = 25f;
 
-					shootSound = Sfx.cannonShoot2;
+					shootSound = Sfx.wp_k_shotgunShoot_2;
 					ejectEffect = UAWFx.casing4Long;
 					bullet = new HighVelocityShellBulletType(15f, 600) {{
 						frontColor = Pal.bulletYellow;