Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Update Medical Setting CBA Presets #127

Merged
merged 3 commits into from
Oct 16, 2022
Merged

[Chore] Update Medical Setting CBA Presets #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e56ed3
Consolidate Advanced Medical CBA Settings
dgibso29 Oct 11, 2022
bd6cd1f
Update medical_basic.sqf
dgibso29 Oct 11, 2022
850ab42
Update medical_advanced.sqf
dgibso29 Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ...nents/cbaSettings/medical_advanced_80.sqf → components/cbaSettings/medical_advanced.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -35,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;
Expand All @@ -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;
53 changes: 0 additions & 53 deletions components/cbaSettings/medical_advanced_95.sqf
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions components/cbaSettings/medical_basic.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
12 changes: 2 additions & 10 deletions components/cbaSettings/settings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions configuration/cbaSettings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down