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.

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

Medical Treatment - Settings cleanup #7345

Merged
merged 1 commit into from
Jan 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 29 additions & 33 deletions addons/medical_treatment/initSettings.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

// todo: this setting just disables some treatment options, remove?
[
QGVAR(advancedDiagnose),
"CHECKBOX",
Expand All @@ -18,32 +16,32 @@
true
] call CBA_settings_fnc_init;

// todo: verify that this setting does not require a restart
// todo: this setting requires advanced bandages to be enabled, they should be independent
[
QGVAR(woundReopening),
QGVAR(advancedMedication),
"CHECKBOX",
[LSTRING(WoundReopening_DisplayName), LSTRING(WoundReopening_Description)],
[LSTRING(AdvancedMedication_DisplayName), LSTRING(AdvancedMedication_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
false,
true,
true
] call CBA_settings_fnc_init;

// todo: verify that this setting does not require a restart
// todo: this setting requires advanced bandages to be enabled, they should be independent
[
QGVAR(clearTraumaAfterBandage),
QGVAR(woundReopening),
"CHECKBOX",
[LSTRING(clearTraumaAfterBandage_DisplayName), LSTRING(clearTraumaAfterBandage_Description)],
[LSTRING(WoundReopening_DisplayName), LSTRING(WoundReopening_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
false,
true
] call CBA_settings_fnc_init;

[
QGVAR(advancedMedication),
QGVAR(clearTraumaAfterBandage),
"CHECKBOX",
[LSTRING(AdvancedMedication_DisplayName), LSTRING(AdvancedMedication_Description)],
[LSTRING(ClearTraumaAfterBandage_DisplayName), LSTRING(ClearTraumaAfterBandage_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
true,
false,
true
] call CBA_settings_fnc_init;

Expand All @@ -57,15 +55,6 @@
true
] call CBA_settings_fnc_init;

[
QGVAR(allowSelfIV),
"LIST",
[LSTRING(AllowSelfIV_DisplayName), LSTRING(AllowSelfIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 1],
true
] call CBA_settings_fnc_init;

[
QGVAR(allowSharedEquipment),
"LIST",
Expand Down Expand Up @@ -174,15 +163,33 @@
true
] call CBA_settings_fnc_init;

[
QGVAR(allowSelfIV),
"LIST",
[LSTRING(AllowSelfIV_DisplayName), LSTRING(AllowSelfIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 1],
true
] call CBA_settings_fnc_init;

[
QGVAR(cprSuccessChance),
"SLIDER",
[LSTRING(cprSuccessChance_DisplayName), LSTRING(cprSuccessChance_Description)],
[LSTRING(CPRSuccessChance_DisplayName), LSTRING(CPRSuccessChance_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[0, 1, 0.4, 2],
true
] call CBA_settings_fnc_init;

[
QGVAR(holsterRequired),
"LIST",
[LSTRING(HolsterRequired_DisplayName), LSTRING(HolsterRequired_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[[0, 1, 2, 3, 4], [ELSTRING(common,Disabled), LSTRING(HolsterRequired_Lowered), LSTRING(HolsterRequired_LoweredExam), LSTRING(HolsterRequired_Holstered), LSTRING(HolsterRequired_HolsteredExam)], 0],
true
] call CBA_settings_fnc_init;

[
QGVAR(allowLitterCreation),
"CHECKBOX",
Expand All @@ -209,14 +216,3 @@
[-1, 3600, 600, 0],
true
] call CBA_settings_fnc_init;

[
QGVAR(holsterRequired),
"LIST",
[LSTRING(HolsterRequired_DisplayName), LSTRING(HolsterRequired_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
[[0, 1, 2, 3, 4], [ELSTRING(common,Disabled), LSTRING(HolsterRequired_Lowered), LSTRING(HolsterRequired_LoweredExam), LSTRING(HolsterRequired_Holstered), LSTRING(HolsterRequired_HolsteredExam)], 0],
true
] call CBA_settings_fnc_init;


Loading