Merge branch 'ambient-sound-change' into unstable

SilenceIsFatto · Nov 2, 2024 · 9bb7c70 · 9bb7c70
2 parents 1e94ef9 + 94b7256
commit 9bb7c70
Show file tree

Hide file tree

Showing 30 changed files with 423 additions and 91 deletions.
diff --git a/A3A/addons/core/Params.hpp b/A3A/addons/core/Params.hpp
@@ -253,6 +253,13 @@ class Params
         texts[] = {$STR_antistasi_dialogs_generic_button_no_text,$STR_antistasi_dialogs_generic_button_yes_text};
         default = 0;
     };
+    class createAmbientSounds
+    {
+        title = $STR_A3AU_ambient_sounds;
+        values[] = {0,1};
+        texts[] = {$STR_antistasi_dialogs_generic_button_no_text,$STR_antistasi_dialogs_generic_button_yes_text};
+        default = 1;
+    };
     class hideEnemyMarkersReconPlaneDistance
     {
         title = $STR_A3AU_hide_enemy_markers_recon_plane_distance;

diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml
@@ -5817,6 +5817,23 @@
                 <Korean>지원 요청자</Korean>
                 <French>Appel de soutien</French>
             </Key>
+            <Key ID="STR_A3AU_ambient_sounds">
+                <Original>Enable Ambient Sounds</Original>
+                <English>Enable Ambient Sounds</English>
+                <Russian>Включить фоновые звуки</Russian>
+                <German>Ambientegeräusche aktivieren</German>
+                <Italian>Abilita suoni ambientali</Italian>
+                <Spanish>Habilitar sonidos ambientales</Spanish>
+                <French>Activer les sons d'ambiance</French>
+                <Korean>환경 소리 활성화</Korean>
+                <Japanese>環境音を有効にする</Japanese>
+                <Chineseimp>启用环境声音</Chineseimp>
+                <Chinese>啟用環境聲音</Chinese>
+                <Polish>Włącz dźwięki otoczenia</Polish>
+                <Czech>Povolit ambientní zvuky</Czech>
+                <Portuguese>Ativar sons ambientais</Portuguese>
+                <Turkish>Ortam Seslerini Etkinleştir</Turkish>
+            </Key>
             <Key ID="STR_A3AU_hide_enemy_markers">
                 <Original>Hide Enemy Zone Markers</Original>
                 <English>Hide Enemy Zone Markers</English>

diff --git a/A3A/addons/core/functions/Base/fn_initPetros.sqf b/A3A/addons/core/functions/Base/fn_initPetros.sqf
@@ -24,6 +24,8 @@ if (petros == leader group petros) then {
 	petros setBehaviour "SAFE";
 };
 
+call A3A_fnc_unitAmbient; // adds ambient sounds to petros
+
 // Install both moving and static actions
 [petros,"petros"] remoteExec ["A3A_fnc_flagaction", 0, petros];
 

diff --git a/A3A/addons/hals/Addons/money/config.hpp b/A3A/addons/hals/Addons/money/config.hpp
@@ -1,5 +1,5 @@
 class cfgHALsMoney {
 	debug = 0;
 	startingFunds = 0;
-	oldManItemsPrice[] = {50, 150, 300, 600};
+	oldManItemsPrice[] = {150, 500, 1000, 10000};
 };
diff --git a/A3A/addons/patcom/CfgFunctions.hpp b/A3A/addons/patcom/CfgFunctions.hpp
@@ -20,6 +20,7 @@ class CfgFunctions {
             class createResourceCiv {};
             class createRoomLight {};
             class getDayState {};
+            class unitAmbient {};
         };
 
         class Patcom {