From 7e56ed360bafa8ed4a89354a6a1a2c17698a5356 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Tue, 11 Oct 2022 18:52:50 -0400 Subject: [PATCH 1/3] Consolidate Advanced Medical CBA Settings --- ...l_advanced_80.sqf => medical_advanced.sqf} | 11 ++-- .../cbaSettings/medical_advanced_95.sqf | 53 ------------------- components/cbaSettings/settings.sqf | 12 +---- 3 files changed, 8 insertions(+), 68 deletions(-) rename components/cbaSettings/{medical_advanced_80.sqf => medical_advanced.sqf} (88%) delete mode 100644 components/cbaSettings/medical_advanced_95.sqf diff --git a/components/cbaSettings/medical_advanced_80.sqf b/components/cbaSettings/medical_advanced.sqf similarity index 88% rename from components/cbaSettings/medical_advanced_80.sqf rename to components/cbaSettings/medical_advanced.sqf index 2aab6da..5cfe69e 100644 --- a/components/cbaSettings/medical_advanced_80.sqf +++ b/components/cbaSettings/medical_advanced.sqf @@ -4,8 +4,8 @@ force ace_medical_AIDamageThreshold = 1; force ace_medical_bleedingCoefficient = 0.4; force ace_medical_blood_enabledFor = 2; force ace_medical_enableVehicleCrashes = false; -force ace_medical_fatalDamageSource = 2; -force ace_medical_fractureChance = 0.05; +force ace_medical_fatalDamageSource = 0; +force ace_medical_fractureChance = 0.15; force ace_medical_fractures = 1; force ace_medical_gui_enableMedicalMenu = 1; force ace_medical_gui_maxDistance = 3; @@ -14,9 +14,10 @@ force ace_medical_ivFlowRate = 3.5; force ace_medical_limping = 1; force ace_medical_painCoefficient = 0.5; force ace_medical_playerDamageThreshold = 2.5; +force ace_medical_AIDamageThreshold = 0.8; force ace_medical_spontaneousWakeUpChance = 0.9; force ace_medical_spontaneousWakeUpEpinephrineBoost = 1.5; -force ace_medical_statemachine_AIUnconsciousness = true; +force ace_medical_statemachine_AIUnconsciousness = false; force ace_medical_statemachine_cardiacArrestTime = 120; force ace_medical_statemachine_fatalInjuriesAI = 0; force ace_medical_statemachine_fatalInjuriesPlayer = 1; @@ -49,5 +50,5 @@ force ace_medical_treatment_treatmentTimeCPR = 12; force ace_medical_treatment_treatmentTimeIV = 8; force ace_medical_treatment_treatmentTimeSplint = 7; force ace_medical_treatment_treatmentTimeTourniquet = 3; -force ace_medical_treatment_woundReopenChance = 0.2; -force ace_medical_treatment_woundStitchTime = 2.5; +force ace_medical_treatment_woundReopenChance = 0.20; +force ace_medical_treatment_woundStitchTime = 2.5; \ No newline at end of file diff --git a/components/cbaSettings/medical_advanced_95.sqf b/components/cbaSettings/medical_advanced_95.sqf deleted file mode 100644 index 0773f6f..0000000 --- a/components/cbaSettings/medical_advanced_95.sqf +++ /dev/null @@ -1,53 +0,0 @@ -// ACE Medical -force ace_medical_ai_enabledFor = 2; -force ace_medical_AIDamageThreshold = 1; -force ace_medical_bleedingCoefficient = 0.4; -force ace_medical_blood_enabledFor = 2; -force ace_medical_enableVehicleCrashes = false; -force ace_medical_fatalDamageSource = 2; -force ace_medical_fractureChance = 0.05; -force ace_medical_fractures = 1; -force ace_medical_gui_enableMedicalMenu = 1; -force ace_medical_gui_maxDistance = 3; -force ace_medical_gui_openAfterTreatment = true; -force ace_medical_ivFlowRate = 3.5; -force ace_medical_limping = 1; -force ace_medical_painCoefficient = 0.5; -force ace_medical_playerDamageThreshold = 2.5; -force ace_medical_spontaneousWakeUpChance = 0.9; -force ace_medical_spontaneousWakeUpEpinephrineBoost = 1.5; -force ace_medical_statemachine_AIUnconsciousness = true; -force ace_medical_statemachine_cardiacArrestTime = 120; -force ace_medical_statemachine_fatalInjuriesAI = 0; -force ace_medical_statemachine_fatalInjuriesPlayer = 1; -force ace_medical_treatment_advancedBandages = 2; -force ace_medical_treatment_advancedDiagnose = 2; -force ace_medical_treatment_advancedMedication = true; -force ace_medical_treatment_allowBodyBagUnconscious = true; -force ace_medical_treatment_allowSelfIV = 1; -force ace_medical_treatment_allowSelfPAK = 1; -force ace_medical_treatment_allowSelfStitch = 1; -force ace_medical_treatment_allowSharedEquipment = 0; -force ace_medical_treatment_consumePAK = 0; -force ace_medical_treatment_consumeSurgicalKit = 0; -force ace_medical_treatment_convertItems = 0; -force ace_medical_treatment_cprSuccessChanceMax = 1; -force ace_medical_treatment_cprSuccessChanceMin = 0.9; -force ace_medical_treatment_holsterRequired = 0; -force ace_medical_treatment_locationEpinephrine = 0; -force ace_medical_treatment_locationPAK = 0; -force ace_medical_treatment_locationsBoostTraining = true; -force ace_medical_treatment_locationSurgicalKit = 3; -force ace_medical_treatment_medicEpinephrine = 1; -force ace_medical_treatment_medicIV = 1; -force ace_medical_treatment_medicPAK = 2; -force ace_medical_treatment_medicSurgicalKit = 1; -force ace_medical_treatment_timeCoefficientPAK = 0.5; -force ace_medical_treatment_treatmentTimeAutoinjector = 5; -force ace_medical_treatment_treatmentTimeBodyBag = 10; -force ace_medical_treatment_treatmentTimeCPR = 12; -force ace_medical_treatment_treatmentTimeIV = 8; -force ace_medical_treatment_treatmentTimeSplint = 7; -force ace_medical_treatment_treatmentTimeTourniquet = 3; -force ace_medical_treatment_woundReopenChance = 0.05; -force ace_medical_treatment_woundStitchTime = 2.5; diff --git a/components/cbaSettings/settings.sqf b/components/cbaSettings/settings.sqf index 3ea17e2..df08df7 100644 --- a/components/cbaSettings/settings.sqf +++ b/components/cbaSettings/settings.sqf @@ -10,17 +10,9 @@ //Advanced 80% slower reopening -#ifdef CA_MEDICAL_ADVANCED_80 +#ifdef CA_MEDICAL_ADVANCED - #include "medical_advanced_80.sqf" - -#endif - -//Advanced 95% reopening - -#ifdef CA_MEDICAL_ADVANCED_95 - - #include "medical_advanced_95.sqf" + #include "medical_advanced.sqf" #endif From bd6cd1f1fc2042349d321033e3149f93c6a51b0c Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Tue, 11 Oct 2022 18:56:22 -0400 Subject: [PATCH 2/3] Update medical_basic.sqf --- components/cbaSettings/medical_basic.sqf | 11 ++++++----- configuration/cbaSettings.hpp | 5 +---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/components/cbaSettings/medical_basic.sqf b/components/cbaSettings/medical_basic.sqf index 2b3d72a..fcab21e 100644 --- a/components/cbaSettings/medical_basic.sqf +++ b/components/cbaSettings/medical_basic.sqf @@ -4,8 +4,8 @@ force ace_medical_AIDamageThreshold = 1; force ace_medical_bleedingCoefficient = 0.4; force ace_medical_blood_enabledFor = 2; force ace_medical_enableVehicleCrashes = false; -force ace_medical_fatalDamageSource = 2; -force ace_medical_fractureChance = 0.05; +force ace_medical_fatalDamageSource = 0; +force ace_medical_fractureChance = 0.15; force ace_medical_fractures = 1; force ace_medical_gui_enableMedicalMenu = 1; force ace_medical_gui_maxDistance = 3; @@ -14,9 +14,10 @@ force ace_medical_ivFlowRate = 3.5; force ace_medical_limping = 1; force ace_medical_painCoefficient = 0.5; force ace_medical_playerDamageThreshold = 2.5; +force ace_medical_AIDamageThreshold = 0.8; force ace_medical_spontaneousWakeUpChance = 0.9; force ace_medical_spontaneousWakeUpEpinephrineBoost = 1.5; -force ace_medical_statemachine_AIUnconsciousness = true; +force ace_medical_statemachine_AIUnconsciousness = false; force ace_medical_statemachine_cardiacArrestTime = 120; force ace_medical_statemachine_fatalInjuriesAI = 0; force ace_medical_statemachine_fatalInjuriesPlayer = 1; @@ -49,5 +50,5 @@ force ace_medical_treatment_treatmentTimeCPR = 12; force ace_medical_treatment_treatmentTimeIV = 8; force ace_medical_treatment_treatmentTimeSplint = 7; force ace_medical_treatment_treatmentTimeTourniquet = 3; -force ace_medical_treatment_woundReopenChance = 0.05; -force ace_medical_treatment_woundStitchTime = 2.5; +force ace_medical_treatment_woundReopenChance = 0.20; +force ace_medical_treatment_woundStitchTime = 2.5; \ No newline at end of file diff --git a/configuration/cbaSettings.hpp b/configuration/cbaSettings.hpp index 8fed797..710e854 100644 --- a/configuration/cbaSettings.hpp +++ b/configuration/cbaSettings.hpp @@ -14,11 +14,8 @@ // CA Medical settings (Reopening ON, 80% slower reopening). // To enable this, uncomment the line below. -#define CA_MEDICAL_ADVANCED_80 +#define CA_MEDICAL_ADVANCED -// CA Medical settings (Reopening ON, 95% slower reopening). -// To enable this, uncomment the line below. -// #define CA_MEDICAL_ADVANCED_95 // CA Medical settings (Reopening OFF). // To enable this, uncomment the line below. From 850ab42450a05881f08ff79e901dc077bca63b7a Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Wed, 12 Oct 2022 14:14:12 -0400 Subject: [PATCH 3/3] Update medical_advanced.sqf --- components/cbaSettings/medical_advanced.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cbaSettings/medical_advanced.sqf b/components/cbaSettings/medical_advanced.sqf index 5cfe69e..dd5a735 100644 --- a/components/cbaSettings/medical_advanced.sqf +++ b/components/cbaSettings/medical_advanced.sqf @@ -36,7 +36,7 @@ force ace_medical_treatment_cprSuccessChanceMax = 1; force ace_medical_treatment_cprSuccessChanceMin = 0.9; force ace_medical_treatment_holsterRequired = 0; force ace_medical_treatment_locationEpinephrine = 0; -force ace_medical_treatment_locationPAK = 0; +force ace_medical_treatment_locationPAK = 3; force ace_medical_treatment_locationsBoostTraining = true; force ace_medical_treatment_locationSurgicalKit = 3; force ace_medical_treatment_medicEpinephrine = 1;