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

Medical - Move treatment settings to a separate category #10460

Merged
merged 7 commits into from
Oct 29, 2024
+59 −42
Merged

Medical - Move treatment settings to a separate category #10460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e8dede
Update stringtable.xml
OverlordZorn Oct 28, 2024
f175582
Update stringtable.xml
OverlordZorn Oct 28, 2024
ec9e324
Update initSettings.inc.sqf
OverlordZorn Oct 28, 2024
da3f507
Update stringtable.xml
OverlordZorn Oct 28, 2024
3b9cd5f
relocate STR_ACE_Medical_Treatment_Category
OverlordZorn Oct 29, 2024
5084f4c
manually merge category and subcategory
OverlordZorn Oct 29, 2024
a7f583c
remove double category
LinkIsGrim Oct 29, 2024
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
84 changes: 42 additions & 42 deletions addons/medical_treatment/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
QGVAR(advancedDiagnose),
"LIST",
[LSTRING(AdvancedDiagnose_DisplayName), LSTRING(AdvancedDiagnose_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), LSTRING(AdvancedDiagnose_DiagnoseCardiacArrest), LSTRING(AdvancedDiagnose_DiagnoseCardiacArrestDirect)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -11,7 +11,7 @@
QGVAR(advancedMedication),
"CHECKBOX",
[LSTRING(AdvancedMedication_DisplayName), LSTRING(AdvancedMedication_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
true,
true
] call CBA_fnc_addSetting;
Expand All @@ -20,7 +20,7 @@
QGVAR(advancedBandages),
"LIST",
[LSTRING(AdvancedBandages_DisplayName), LSTRING(AdvancedBandages_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), LSTRING(AdvancedBandages_EnabledCanReopen)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -29,7 +29,7 @@
QGVAR(bandageRollover),
"CHECKBOX",
[LSTRING(bandageRollover_DisplayName), LSTRING(bandageRollover_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
true,
false // server can force if necessary, otherwise client decides
] call CBA_fnc_addSetting;
Expand All @@ -38,7 +38,7 @@
QGVAR(bandageEffectiveness),
"SLIDER",
[LSTRING(bandageEffectiveness_DisplayName), LSTRING(bandageEffectiveness_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 5, 1, 2],
true
] call CBA_fnc_addSetting;
Expand All @@ -47,7 +47,7 @@
QGVAR(woundReopenChance),
"SLIDER",
[LSTRING(WoundReopenChance_DisplayName), LSTRING(WoundReopenChance_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 5, 1, 2],
true
] call CBA_fnc_addSetting;
Expand All @@ -56,7 +56,7 @@
QGVAR(clearTrauma),
"LIST",
[LSTRING(ClearTrauma_DisplayName), LSTRING(ClearTrauma_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [ELSTRING(common,Never), LSTRING(ClearTrauma_AfterStitch), LSTRING(ClearTrauma_AfterBandage)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -66,7 +66,7 @@
QGVAR(locationsBoostTraining),
"CHECKBOX",
[ELSTRING(common,LocationsBoostTraining_DisplayName), LSTRING(LocationsBoostTraining_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
false,
true
] call CBA_fnc_addSetting;
Expand All @@ -75,7 +75,7 @@
QGVAR(allowSharedEquipment),
"LIST",
[LSTRING(AllowSharedEquipment_DisplayName), LSTRING(AllowSharedEquipment_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(AllowSharedEquipment_PriorityPatient), LSTRING(AllowSharedEquipment_PriorityMedic), ELSTRING(common,No)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -84,7 +84,7 @@
QGVAR(convertItems),
"LIST",
[LSTRING(ConvertItems_DisplayName), LSTRING(ConvertItems_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [ELSTRING(common,Enabled), LSTRING(ConvertItems_RemoveOnly), ELSTRING(common,Disabled)], 0],
1,
{[QGVAR(convertItems), _this] call EFUNC(common,cbaSettings_settingChanged)},
Expand All @@ -95,7 +95,7 @@
QGVAR(treatmentTimeAutoinjector),
"SLIDER",
[LSTRING(TreatmentTimeAutoinjector_DisplayName), LSTRING(TreatmentTimeAutoinjector_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 5, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -104,7 +104,7 @@
QGVAR(treatmentTimeTourniquet),
"SLIDER",
[LSTRING(TreatmentTimeTourniquet_DisplayName), LSTRING(TreatmentTimeTourniquet_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 7, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -113,7 +113,7 @@
QGVAR(treatmentTimeSplint),
"SLIDER",
[LSTRING(TreatmentTimeSplint_DisplayName), LSTRING(TreatmentTimeSplint_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 7, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -122,7 +122,7 @@
QGVAR(treatmentTimeBodyBag),
"SLIDER",
[LSTRING(TreatmentTimeBodyBag_DisplayName), LSTRING(TreatmentTimeBodyBag_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 15, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -131,7 +131,7 @@
QGVAR(treatmentTimeGrave),
"SLIDER",
[LSTRING(TreatmentTimeGrave_DisplayName), LSTRING(TreatmentTimeGrave_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 120, 30, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -140,7 +140,7 @@
QGVAR(medicEpinephrine),
"LIST",
[LSTRING(MedicEpinephrine_DisplayName), LSTRING(MedicEpinephrine_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -149,7 +149,7 @@
QGVAR(locationEpinephrine),
"LIST",
[LSTRING(LocationEpinephrine_DisplayName), LSTRING(LocationEpinephrine_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -158,7 +158,7 @@
QGVAR(medicPAK),
"LIST",
[LSTRING(MedicPAK_DisplayName), LSTRING(MedicPAK_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -167,7 +167,7 @@
QGVAR(locationPAK),
"LIST",
[LSTRING(LocationPAK_DisplayName), LSTRING(LocationPAK_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 3],
true
] call CBA_fnc_addSetting;
Expand All @@ -176,7 +176,7 @@
QGVAR(consumePAK),
"LIST",
[LSTRING(ConsumePAK_DisplayName), LSTRING(ConsumePAK_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -185,7 +185,7 @@
QGVAR(allowSelfPAK),
"LIST",
[LSTRING(AllowSelfPAK_DisplayName), LSTRING(AllowSelfPAK_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -194,7 +194,7 @@
QGVAR(timeCoefficientPAK),
"SLIDER",
[LSTRING(TimeCoefficientPAK_DisplayName), LSTRING(TimeCoefficientPAK_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 5, 1, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -203,7 +203,7 @@
QGVAR(medicSurgicalKit),
"LIST",
[LSTRING(MedicSurgicalKit_DisplayName), LSTRING(MedicSurgicalKit_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -212,7 +212,7 @@
QGVAR(locationSurgicalKit),
"LIST",
[LSTRING(LocationSurgicalKit_DisplayName), LSTRING(LocationSurgicalKit_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 2],
true
] call CBA_fnc_addSetting;
Expand All @@ -221,7 +221,7 @@
QGVAR(consumeSurgicalKit),
"LIST",
[LSTRING(ConsumeSurgicalKit_DisplayName), LSTRING(ConsumeSurgicalKit_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], ["str_eval_typenothing", LSTRING(SurgicalKit_Display), LSTRING(Suture_Display)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -230,7 +230,7 @@
QGVAR(allowSelfStitch),
"LIST",
[LSTRING(AllowSelfStitch_DisplayName), LSTRING(AllowSelfStitch_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -239,7 +239,7 @@
QGVAR(woundStitchTime),
"SLIDER",
[LSTRING(WoundStitchTime_DisplayName), LSTRING(WoundStitchTime_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 5, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -248,7 +248,7 @@
QGVAR(medicIV),
"LIST",
[LSTRING(MedicIV_DisplayName), LSTRING(MedicIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -257,7 +257,7 @@
QGVAR(locationIV),
"LIST",
[LSTRING(LocationIV_DisplayName), LSTRING(LocationIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
1
] call CBA_fnc_addSetting;
Expand All @@ -266,7 +266,7 @@
QGVAR(allowSelfIV),
"LIST",
[LSTRING(AllowSelfIV_DisplayName), LSTRING(AllowSelfIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -275,7 +275,7 @@
QGVAR(treatmentTimeIV),
"SLIDER",
[LSTRING(TreatmentTimeIV_DisplayName), LSTRING(TreatmentTimeIV_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 12, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -284,7 +284,7 @@
QGVAR(cprSuccessChanceMin),
"SLIDER",
[LSTRING(CPRSuccessChanceMin_DisplayName), LSTRING(CPRSuccessChanceMin_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 1, 0.4, 2, true],
true
] call CBA_fnc_addSetting;
Expand All @@ -293,7 +293,7 @@
QGVAR(cprSuccessChanceMax),
"SLIDER",
[LSTRING(CPRSuccessChanceMax_DisplayName), LSTRING(CPRSuccessChanceMax_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 1, 0.4, 2, true],
true
] call CBA_fnc_addSetting;
Expand All @@ -302,7 +302,7 @@
QGVAR(treatmentTimeCPR),
"SLIDER",
[LSTRING(TreatmentTimeCPR_DisplayName), LSTRING(TreatmentTimeCPR_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0.1, 60, 15, 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -311,15 +311,15 @@
QGVAR(treatmentTimeCoeffZeus),
"SLIDER",
[LSTRING(TreatmentTimeCoeffZeus_DisplayName), LSTRING(TreatmentTimeCoeffZeus_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[0, 10, 1, 2]
] call CBA_fnc_addSetting;

[
QGVAR(allowBodyBagUnconscious),
"CHECKBOX",
[LSTRING(AllowBodyBagUnconscious_DisplayName), LSTRING(AllowBodyBagUnconscious_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
false,
true
] call CBA_fnc_addSetting;
Expand All @@ -328,7 +328,7 @@
QGVAR(allowGraveDigging),
"LIST",
[LSTRING(AllowGraveDigging_DisplayName), LSTRING(AllowGraveDigging_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2], [ELSTRING(common,Disabled), LSTRING(AllowGraveDigging_graveOnlyDead), ELSTRING(common,Yes)], 1],
true
] call CBA_fnc_addSetting;
Expand All @@ -337,7 +337,7 @@
QGVAR(graveDiggingMarker),
"CHECKBOX",
[LSTRING(GraveDiggingMarker_DisplayName), LSTRING(GraveDiggingMarker_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
true,
true
] call CBA_fnc_addSetting;
Expand All @@ -346,7 +346,7 @@
QGVAR(holsterRequired),
"LIST",
[LSTRING(HolsterRequired_DisplayName), LSTRING(HolsterRequired_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
LSTRING(Category),
[[0, 1, 2, 3, 4], [ELSTRING(common,Disabled), LSTRING(HolsterRequired_Lowered), LSTRING(HolsterRequired_LoweredExam), LSTRING(HolsterRequired_Holstered), LSTRING(HolsterRequired_HolsteredExam)], 0],
true
] call CBA_fnc_addSetting;
Expand All @@ -355,7 +355,7 @@
QGVAR(allowLitterCreation),
"CHECKBOX",
[LSTRING(AllowLitterCreation_DisplayName), LSTRING(AllowLitterCreation_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
[LSTRING(Category), LSTRING(SubCategory_Litter)],
true,
true
] call CBA_fnc_addSetting;
Expand All @@ -364,7 +364,7 @@
QGVAR(maxLitterObjects),
"LIST",
[LSTRING(MaxLitterObjects_DisplayName), LSTRING(MaxLitterObjects_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
[LSTRING(Category), LSTRING(SubCategory_Litter)],
[[50, 100, 200, 300, 400, 500, 1000, 2000, 3000, 4000, 5000], [/* settings function will auto create names */], 5],
true
] call CBA_fnc_addSetting;
Expand All @@ -373,7 +373,7 @@
QGVAR(litterCleanupDelay),
"SLIDER",
[LSTRING(LitterCleanupDelay_DisplayName), LSTRING(LitterCleanupDelay_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
[LSTRING(Category), LSTRING(SubCategory_Litter)],
[-1, 3600, 600, 0],
true
] call CBA_fnc_addSetting;
Loading
Loading