akarnokd · akarnokd · Jun 3, 2024 · Jun 3, 2024
diff --git a/audio/generic/groundwar/acknowledge_1.wav b/audio/generic/groundwar/acknowledge_1.wav
diff --git a/audio/generic/groundwar/acknowledge_2.wav b/audio/generic/groundwar/acknowledge_2.wav
diff --git a/audio/generic/groundwar/explosion_long.wav b/audio/generic/groundwar/explosion_long.wav
diff --git a/audio/generic/groundwar/explosion_medium.wav b/audio/generic/groundwar/explosion_medium.wav
diff --git a/audio/generic/groundwar/explosion_short.wav b/audio/generic/groundwar/explosion_short.wav
diff --git a/audio/generic/groundwar/fire_1.wav b/audio/generic/groundwar/fire_1.wav
diff --git a/audio/generic/groundwar/fire_2.wav b/audio/generic/groundwar/fire_2.wav
diff --git a/audio/generic/groundwar/fire_3.wav b/audio/generic/groundwar/fire_3.wav
diff --git a/audio/generic/groundwar/fire_4.wav b/audio/generic/groundwar/fire_4.wav
diff --git a/audio/generic/groundwar/fire_5.wav b/audio/generic/groundwar/fire_5.wav
diff --git a/audio/generic/groundwar/fire_6.wav b/audio/generic/groundwar/fire_6.wav
diff --git a/audio/generic/groundwar/fire_7.wav b/audio/generic/groundwar/fire_7.wav
diff --git a/audio/generic/groundwar/fire_rocket.wav b/audio/generic/groundwar/fire_rocket.wav
diff --git a/audio/generic/groundwar/ground_rocket_hit.wav b/audio/generic/groundwar/ground_rocket_hit.wav
diff --git a/audio/generic/groundwar/groundwar_prepare.wav b/audio/generic/groundwar/groundwar_prepare.wav
diff --git a/audio/generic/groundwar/toggle_panel.wav b/audio/generic/groundwar/toggle_panel.wav
diff --git a/audio/generic/interlude/colony_ship_arrival.wav b/audio/generic/interlude/colony_ship_arrival.wav
diff --git a/audio/generic/interlude/colony_ship_arrival_2.wav b/audio/generic/interlude/colony_ship_arrival_2.wav
diff --git a/audio/generic/interlude/deploy_hubble.wav b/audio/generic/interlude/deploy_hubble.wav
diff --git a/audio/generic/interlude/deploy_hubble_2.wav b/audio/generic/interlude/deploy_hubble_2.wav
diff --git a/audio/generic/interlude/deploy_satellite.wav b/audio/generic/interlude/deploy_satellite.wav
diff --git a/audio/generic/interlude/deploy_spy_satellite_1.wav b/audio/generic/interlude/deploy_spy_satellite_1.wav
diff --git a/audio/generic/interlude/deploy_spy_satellite_2.wav b/audio/generic/interlude/deploy_spy_satellite_2.wav
diff --git a/audio/generic/interlude/flagship_arrival.wav b/audio/generic/interlude/flagship_arrival.wav
diff --git a/audio/generic/interlude/merchant_attacked.wav b/audio/generic/interlude/merchant_attacked.wav
diff --git a/audio/generic/interlude/merchant_destroyed.wav b/audio/generic/interlude/merchant_destroyed.wav
diff --git a/audio/generic/interlude/merchant_in.wav b/audio/generic/interlude/merchant_in.wav
diff --git a/audio/generic/intro/gt_interactive_intro.wav b/audio/generic/intro/gt_interactive_intro.wav
diff --git a/audio/generic/lose/destroyed_level_1.wav b/audio/generic/lose/destroyed_level_1.wav
diff --git a/audio/generic/lose/destroyed_level_2.wav b/audio/generic/lose/destroyed_level_2.wav
diff --git a/audio/generic/lose/destroyed_level_3.wav b/audio/generic/lose/destroyed_level_3.wav
diff --git a/audio/generic/lose/fired_level_1.wav b/audio/generic/lose/fired_level_1.wav
diff --git a/audio/generic/lose/fired_level_2.wav b/audio/generic/lose/fired_level_2.wav
diff --git a/audio/generic/lose/fired_level_3.wav b/audio/generic/lose/fired_level_3.wav
diff --git a/audio/generic/music/Music1.ogg b/audio/generic/music/Music1.ogg
diff --git a/audio/generic/music/Music2.ogg b/audio/generic/music/Music2.ogg
diff --git a/audio/generic/music/Music3.ogg b/audio/generic/music/Music3.ogg
diff --git a/audio/generic/music/War.ogg b/audio/generic/music/War.ogg
diff --git a/audio/generic/spacewar/acknowledge_1.wav b/audio/generic/spacewar/acknowledge_1.wav
diff --git a/audio/generic/spacewar/click_1.wav b/audio/generic/spacewar/click_1.wav
diff --git a/audio/generic/spacewar/explosion_long.wav b/audio/generic/spacewar/explosion_long.wav
diff --git a/audio/generic/spacewar/explosion_medium.wav b/audio/generic/spacewar/explosion_medium.wav
diff --git a/audio/generic/spacewar/explosion_short.wav b/audio/generic/spacewar/explosion_short.wav
diff --git a/audio/generic/spacewar/fire_1.wav b/audio/generic/spacewar/fire_1.wav
diff --git a/audio/generic/spacewar/fire_2.wav b/audio/generic/spacewar/fire_2.wav
diff --git a/audio/generic/spacewar/fire_laser1.wav b/audio/generic/spacewar/fire_laser1.wav
diff --git a/audio/generic/spacewar/fire_laser2.wav b/audio/generic/spacewar/fire_laser2.wav
diff --git a/audio/generic/spacewar/fire_laser3.wav b/audio/generic/spacewar/fire_laser3.wav
diff --git a/audio/generic/spacewar/fire_laser4.wav b/audio/generic/spacewar/fire_laser4.wav
diff --git a/audio/generic/spacewar/fire_meson.wav b/audio/generic/spacewar/fire_meson.wav
diff --git a/audio/generic/spacewar/fire_particle.wav b/audio/generic/spacewar/fire_particle.wav
diff --git a/audio/generic/spacewar/fire_rocket_1.wav b/audio/generic/spacewar/fire_rocket_1.wav
diff --git a/audio/generic/spacewar/fire_rocket_2.wav b/audio/generic/spacewar/fire_rocket_2.wav
diff --git a/audio/generic/spacewar/hit.wav b/audio/generic/spacewar/hit.wav
diff --git a/audio/generic/ui/achievement.wav b/audio/generic/ui/achievement.wav
diff --git a/audio/generic/ui/acknowledge_1.wav b/audio/generic/ui/acknowledge_1.wav
diff --git a/audio/generic/ui/acknowledge_2.wav b/audio/generic/ui/acknowledge_2.wav
diff --git a/audio/generic/ui/click_high_1.wav b/audio/generic/ui/click_high_1.wav
diff --git a/audio/generic/ui/click_high_2.wav b/audio/generic/ui/click_high_2.wav
diff --git a/audio/generic/ui/click_high_3.wav b/audio/generic/ui/click_high_3.wav
diff --git a/audio/generic/ui/click_low_1.wav b/audio/generic/ui/click_low_1.wav
diff --git a/audio/generic/ui/click_medium_1.wav b/audio/generic/ui/click_medium_1.wav
diff --git a/audio/generic/ui/click_medium_2.wav b/audio/generic/ui/click_medium_2.wav
diff --git a/audio/generic/ui/comm_deploy.wav b/audio/generic/ui/comm_deploy.wav
diff --git a/audio/generic/ui/demolish_building.wav b/audio/generic/ui/demolish_building.wav
diff --git a/audio/generic/ui/deploy_building.wav b/audio/generic/ui/deploy_building.wav
diff --git a/audio/generic/ui/fail.wav b/audio/generic/ui/fail.wav
diff --git a/audio/generic/ui/good_bye.wav b/audio/generic/ui/good_bye.wav
diff --git a/audio/generic/ui/hologram_off.wav b/audio/generic/ui/hologram_off.wav
diff --git a/audio/generic/ui/hologram_on.wav b/audio/generic/ui/hologram_on.wav
diff --git a/audio/generic/ui/messages_deploy.wav b/audio/generic/ui/messages_deploy.wav
diff --git a/audio/generic/ui/new_task.wav b/audio/generic/ui/new_task.wav
diff --git a/audio/generic/ui/pause.wav b/audio/generic/ui/pause.wav
diff --git a/audio/generic/ui/rain.wav b/audio/generic/ui/rain.wav
diff --git a/audio/generic/ui/success.wav b/audio/generic/ui/success.wav
diff --git a/audio/generic/ui/thunder.wav b/audio/generic/ui/thunder.wav
diff --git a/data/generic/campaign/main/battle.xml b/data/generic/campaign/main/battle.xml
@@ -3,8 +3,8 @@
 	<projectiles>
 		<projectile id="Laser1" matrix="inventions/weapons/lasers/laser_1_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_TINY" damage="5" delay="1000" range="180" mode="BEAM" movement-speed="6"/>
 		<projectile id="Laser2" matrix="inventions/weapons/lasers/laser_2_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_TINY" damage="10" delay="900" range="200" mode="BEAM" movement-speed="5"/>
-		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER3" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
-		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER4" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
+		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
+		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
 		<projectile id="Ion" matrix="inventions/weapons/cannons/ion_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="20" delay="1200" range="300" mode="BEAM" movement-speed="9"/>
 		<projectile id="Plasma" matrix="inventions/weapons/cannons/plasma_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="25" delay="1100" range="320" mode="BEAM" movement-speed="10"/>
 		<projectile id="Particle" matrix="inventions/weapons/cannons/particle_projectile_matrix" width="1" height="12" sound="FIRE_MESON" explosion-anim="EXPLOSION_GREEN" damage="35" delay="1000" range="340" mode="BEAM" movement-speed="8"/>

diff --git a/data/generic/skirmish/human/battle.xml b/data/generic/skirmish/human/battle.xml
@@ -3,8 +3,8 @@
 	<projectiles>
 		<projectile id="Laser1" matrix="inventions/weapons/lasers/laser_1_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_TINY" damage="5" delay="1000" range="180" mode="BEAM" movement-speed="6"/>
 		<projectile id="Laser2" matrix="inventions/weapons/lasers/laser_2_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_TINY" damage="10" delay="900" range="200" mode="BEAM" movement-speed="5"/>
-		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER3" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
-		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER4" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
+		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
+		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
 		<projectile id="Ion" matrix="inventions/weapons/cannons/ion_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="20" delay="1200" range="300" mode="BEAM" movement-speed="9"/>
 		<projectile id="Plasma" matrix="inventions/weapons/cannons/plasma_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="25" delay="1100" range="320" mode="BEAM" movement-speed="10"/>
 		<projectile id="Particle" matrix="inventions/weapons/cannons/particle_projectile_matrix" width="1" height="12" sound="FIRE_MESON" explosion-anim="EXPLOSION_GREEN" damage="35" delay="1000" range="340" mode="BEAM" movement-speed="8"/>

diff --git a/dlc/gump891202-racemod-0.1/generic/skirmish/racemod-0.1/battle.xml b/dlc/gump891202-racemod-0.1/generic/skirmish/racemod-0.1/battle.xml
@@ -3,8 +3,8 @@
 	<projectiles>
 		<projectile id="Laser1" matrix="inventions/weapons/lasers/laser_1_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_TINY"  damage="5" delay="1000" range="180" mode="BEAM" movement-speed="6"/>
 		<projectile id="Laser2" matrix="inventions/weapons/lasers/laser_2_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_TINY" damage="10" delay="900" range="200" mode="BEAM" movement-speed="5"/>
-		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER3" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
-		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER4" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
+		<projectile id="Laser3" matrix="inventions/weapons/lasers/laser_3_rotate" width="64" height="1" sound="FIRE_LASER1" explosion-anim="EXPLOSION_SMALL" damage="15" delay="700" range="220" mode="BEAM" movement-speed="3"/>
+		<projectile id="Laser4" matrix="inventions/weapons/lasers/laser_4_rotate" width="64" height="1" sound="FIRE_LASER2" explosion-anim="EXPLOSION_SMALL" damage="20" delay="800" range="240" mode="BEAM" movement-speed="4"/>
 		<projectile id="Ion" matrix="inventions/weapons/cannons/ion_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="20" delay="1200" range="300" mode="BEAM" movement-speed="9"/>
 		<projectile id="Plasma" matrix="inventions/weapons/cannons/plasma_projectile_rotate" width="64" height="1" sound="FIRE_PARTICLE" explosion-anim="EXPLOSION_MEDIUM" damage="25" delay="1100" range="320" mode="BEAM" movement-speed="10"/>
 		<projectile id="Particle" matrix="inventions/weapons/cannons/particle_projectile_matrix" width="1" height="12" sound="FIRE_MESON" explosion-anim="EXPLOSION_GREEN" damage="35" delay="1000" range="340" mode="BEAM" movement-speed="8"/>

diff --git a/src/hu/openig/screen/items/SpacewarScreen.java b/src/hu/openig/screen/items/SpacewarScreen.java
@@ -3524,8 +3524,11 @@ void fireRocketAt(SpacewarStructure target, RocketSelected r) {
         }
 
         structures.add(proj);
-
-        effectSound(r.port.projectile.sound);
+        if (commons.simulation.paused()) {
+            effectSound(r.port.projectile.sound);
+        } else {
+            soundsToPlay.add(r.port.projectile.sound);
+        }
     }
     /**
      * Set to attack the specified target.
@@ -4754,7 +4757,7 @@ void createBeam(SpacewarStructure source, SpacewarWeaponPort p, double ax, doubl
         }
 
         projectiles.add(sp);
-        effectSound(p.projectile.sound);
+        soundsToPlay.add(p.projectile.sound);
     }
     /**
      * Apply loss results back to the initial fleets and planets.