Merge pull request SilenceIsFatto#283 from SilenceIsFatto/Maxx

-Added helmet loss sound + Parameter to disable -Added variable weapon sway options 0% 25% 50% 75% 100% -Changed mission images -Changed Arma 3 loading screen credits to show recent changes -Changed Discord Rich Presence for Mortain -Changed Helmet loss chance to only run when a there is a headgear item on victim
OrganisationToForkAntistasiUltimate · Aug 17, 2024 · bd353e4 · bd353e4
2 parents 94e8284 + 5951aed
commit bd353e4
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 34 deletions.
diff --git a/A3A/addons/core/CfgSounds.hpp b/A3A/addons/core/CfgSounds.hpp
@@ -77,8 +77,12 @@ class CfgSounds
         sound[] = {EQPATHTOFOLDER(core,Sounds\Misc\RadioIntercept.ogg), 1, 1, 100};
         titles[] = { 1, "" };
     };
-
-
+    class HelmetLoss
+    {
+        name = "HelmetLoss";
+        sound[] = {EQPATHTOFOLDER(core,Sounds\Misc\HelmetLoss.ogg), 5, 1, 100};
+        titles[] = { 1, "" };
+    };
     class Typing
     {
         name = "Typing";

diff --git a/A3A/addons/core/Params.hpp b/A3A/addons/core/Params.hpp
@@ -249,8 +249,8 @@ class Params
     class swayEnabled
     {
         title = $STR_A3AU_sway_enabled;
-        values[] = {0,1};
-        texts[] = {$STR_antistasi_dialogs_generic_button_no_text,$STR_antistasi_dialogs_generic_button_yes_text};
+        values[] = {0,0.25,0.5,0.75,1};
+        texts[] = {"0%","25%","50%","75%","100%"};
         default = 1;
     };
 
@@ -619,6 +619,13 @@ class Params
         texts[] = {$STR_params_helmetLossChance_0,$STR_params_helmetLossChance_1,$STR_params_helmetLossChance_2,$STR_params_helmetLossChance_3};
         default = 33;
     };
+    class helmetLossSound
+    {
+        title = $STR_params_helmetLossSound;
+        values[] = {0,1};
+        texts[] = {$STR_antistasi_dialogs_generic_button_no_text,$STR_antistasi_dialogs_generic_button_yes_text};
+        default = 1;
+    };
     class reviveKitsEnabled
     {
         title = $STR_params_reviveKitsEnabled;

diff --git a/A3A/addons/core/Sounds/Misc/HelmetLoss.ogg b/A3A/addons/core/Sounds/Misc/HelmetLoss.ogg
diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml
@@ -5819,11 +5819,11 @@
                 <French>Activer la fatigue (Vanilla)</French>
             </Key>
             <Key ID="STR_A3AU_sway_enabled">
-                <Original>Enable Sway (Vanilla)</Original>
-                <English>Enable Sway (Vanilla)</English>
-                <Russian>Включить раскачку оружия (Vanilla)</Russian>
-                <Korean>무기 흔들림 활성화 (바닐라)</Korean>
-                <French>Activer l'oscillation (Vanilla)</French>
+                <Original>Weapon Sway % (Vanilla)</Original>
+                <English>Weapon Sway % (Vanilla)</English>
+                <Russian>раскачивание оружия % (Vanilla)</Russian>
+                <Korean>무기 흔들림 % (바닐라)</Korean>
+                <French>% de balancement de l'arme (Vanilla)</French>
             </Key>
         </Container>
     </Package>

diff --git a/A3A/addons/core/functions/REINF/fn_controlunit.sqf b/A3A/addons/core/functions/REINF/fn_controlunit.sqf
@@ -58,9 +58,7 @@ if (staminaEnabled isEqualTo false) then {
 	_unit enableStamina false;
 };
 
-if (swayEnabled isEqualTo false) then {
-	_unit setCustomAimCoef 0;
-};
+player setCustomAimCoef swayEnabled;
 
 private _timeX = aiControlTime;
 

diff --git a/A3A/addons/core/functions/Revive/fn_handleDamage.sqf b/A3A/addons/core/functions/Revive/fn_handleDamage.sqf
@@ -4,11 +4,19 @@ params ["_unit","_part","_damage","_injurer","_projectile","_hitIndex","_instiga
 
 // Functionality unrelated to Antistasi revive
 // Helmet popping: use _hitpoint rather than _part to work around ACE calling its fake hitpoint "head"
-if (_damage >= 1 && {_hitPoint == "hithead"}) then
+if (_damage >= 1 && {_hitPoint == "hithead"}) then 
 {
-	if (random 100 < helmetLossChance) then
+	if (headgear _unit isNotEqualTo "") then 
 	{
-		removeHeadgear _unit;
+		if (headgear _unit isNotEqualTo "" && {_unit getVariable ["A3U_hasHelmetPopped", false] isEqualTo false}) then 
+		{
+			_unit setVariable ["A3U_hasHelmetPopped", true, true];
+			removeHeadgear _unit;
+			if (helmetLossSound) then 
+			{
+				[_unit, ["HelmetLoss", 150, 1, 0, 0]] remoteExec ["say3D", 0];
+			};
+		};
 	};
 };
 

diff --git a/A3A/addons/core/functions/Revive/fn_handleDamageAAF.sqf b/A3A/addons/core/functions/Revive/fn_handleDamageAAF.sqf
@@ -6,11 +6,19 @@ params ["_unit","_part","_damage","_injurer","_projectile","_hitIndex","_instiga
 if (side group _injurer == teamPlayer) then
 {
 	// Helmet popping: use _hitpoint rather than _part to work around ACE calling its fake hitpoint "head"
-	if (_damage >= 1 && {_hitPoint == "hithead"}) then
+	if (_damage >= 1 && {_hitPoint == "hithead"}) then 
 	{
-		if (random 100 < helmetLossChance) then
+		if (headgear _unit isNotEqualTo "") then 
 		{
-			removeHeadgear _unit;
+			if (headgear _unit isNotEqualTo "" && {_unit getVariable ["A3U_hasHelmetPopped", false] isEqualTo false}) then 
+			{
+				_unit setVariable ["A3U_hasHelmetPopped", true, true];
+				removeHeadgear _unit;
+				if (helmetLossSound) then 
+				{
+					[_unit, ["HelmetLoss", 150, 1, 0, 0]] remoteExec ["say3D", 0];
+				};
+			};
 		};
 	};
 

diff --git a/A3A/addons/core/functions/UI/images/logo.paa b/A3A/addons/core/functions/UI/images/logo.paa
diff --git a/A3A/addons/core/functions/init/fn_initClient.sqf b/A3A/addons/core/functions/init/fn_initClient.sqf
@@ -660,7 +660,5 @@ if (fatigueEnabled isEqualTo false) then {
 if (staminaEnabled isEqualTo false) then { 
 	player enableStamina false; 
 }; 
-
-if (swayEnabled isEqualTo false) then { 
-	player setCustomAimCoef 0; 
-};
+
+player setCustomAimCoef swayEnabled;
diff --git a/A3A/addons/core/functions/proxy/fn_onPlayerRespawn.sqf b/A3A/addons/core/functions/proxy/fn_onPlayerRespawn.sqf
@@ -229,6 +229,4 @@ if (staminaEnabled isEqualTo false) then {
 	_newUnit enableStamina false; 
 }; 
 
-if (swayEnabled isEqualTo false) then { 
-	_newUnit setCustomAimCoef 0; 
-};
+player setCustomAimCoef swayEnabled;
diff --git a/A3A/addons/main_menu/data/backgrounds/LoadingScreen/AUC_Credits_co.jpg b/A3A/addons/main_menu/data/backgrounds/LoadingScreen/AUC_Credits_co.jpg
diff --git a/A3A/addons/maps/Antistasi_SPE_Mortain.SPE_Mortain/description.ext b/A3A/addons/maps/Antistasi_SPE_Mortain.SPE_Mortain/description.ext
@@ -9,16 +9,16 @@ overviewPicture = OVERVIEW_IMAGE;
 
 class CfgDiscordRichPresence 
 {
-    applicationID="819852407265034260";
-    defaultDetails="";
-    defaultState="";
-    defaultLargeImageKey="cherno";
-    defaultLargeImageText="Antistasi Ultimate - Mortain";
-    defaultSmallImageKey="arma_3_logo";
-    defaultSmallImageText="Arma 3 Custom Scenario";
+    applicationID="1270380812684230746";
+    defaultDetails="In campaign";
+    defaultState="Mortain";
+    defaultLargeImageKey="mortain";
+    defaultLargeImageText="Rebelling in Mortain";
+    defaultSmallImageKey="au-logo";
+    defaultSmallImageText="Antistasi Ultimate";
     useTimeElapsed=1;
 };
-
+//DLC: https://store.steampowered.com/app/1175380/Arma_3_Creator_DLC_Spearhead_1944/
 class CfgNotifications
 {
     #include "..\missionDescription\CfgNotificationsContents.hpp"

diff --git a/A3A/addons/maps/MissionDescription/master.hpp b/A3A/addons/maps/MissionDescription/master.hpp
@@ -30,7 +30,7 @@ missionGroup = "AntistasiUltimate";
 
 #ifndef LOAD_SCREEN_IMAGE
 	#define LOAD_SCREEN_IMAGE "\x\A3A\addons\maps\images_alt_co.jpg"
-	#define OVERVIEW_IMAGE "\x\A3A\addons\maps\images_alt_co.jpg"
+	#define OVERVIEW_IMAGE "\x\A3A\addons\maps\images_co.jpg"
 #endif
 
 #include "debug.hpp"

diff --git a/A3A/addons/maps/images_alt_co.jpg b/A3A/addons/maps/images_alt_co.jpg
diff --git a/A3A/addons/maps/images_co.jpg b/A3A/addons/maps/images_co.jpg
diff --git a/A3A/addons/scrt/Stringtable.xml b/A3A/addons/scrt/Stringtable.xml
@@ -4716,6 +4716,13 @@
                 <Korean>헤드샷 당할 시 헬멧을 잃을 확률</Korean>
                 <French>Risque de perte de casque lors des tirs à la tête</French>
             </Key>
+            <Key ID="STR_params_helmetLossSound">
+                <Original>Make sound on helmet loss</Original>
+                <Russian>Издать звук при потере шлема</Russian>
+                <Chinesesimp>头盔丢失时发出声音</Chinesesimp>
+                <Korean>헬멧 분실 시 소리 내기</Korean>
+                <French>Faites du bruit en cas de perte de casque</French>
+            </Key>
             <Key ID="STR_params_helmetLossChance_0">
                 <Original>Never</Original>
                 <Russian>Никогда</Russian>