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 Treatment - Add Setting for Splints #10458

Merged
merged 11 commits into from
Nov 2, 2024
+32 −0
Merged

Medical Treatment - Add Setting for Splints #10458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89ff567
added Setting to control who can use a splint where
Andx667 Oct 28, 2024
92d913c
moved to new categegory https://github.com/acemod/ACE3/pull/10460
Andx667 Oct 29, 2024
b3c1753
Medical - Move treatment settings to a separate category (#10460)
OverlordZorn Oct 29, 2024
3768ea7
Microdagr - Fix microdagr cursor disappearing when deleting last wayp…
Fratee Oct 29, 2024
050da1b
Medical Treatment - Add settings for morphine and adenosine use (#10450)
Cplhardcore Oct 30, 2024
548cc88
Wiki - Remove dead link (#10466)
PabstMirror Oct 30, 2024
aaf138f
Frag - Filter remote projectiles from Explosion EH (#10467)
lambdatiger Oct 30, 2024
2a0299b
Spectator - Fix "Side" RPT spam (#10464)
johnb432 Oct 30, 2024
24b89b2
Medical Treatment - Fix `GET_FUNCTION` macro (#10453)
johnb432 Nov 1, 2024
5c466e8
Merge branch 'master' into Med-Settings-splints
LinkIsGrim Nov 2, 2024
1b57883
trailling ,
LinkIsGrim Nov 2, 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
2 changes: 2 additions & 0 deletions addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ class GVAR(actions) {
displayNameProgress = CSTRING(Applying_Splint);
category = "bandage";
icon = QPATHTOEF(medical_gui,ui\splint.paa);
medicRequired = QGVAR(medicSplint);
allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
items[] = {"ACE_splint"};
treatmentLocations = QGVAR(locationSplint);
treatmentTime = QGVAR(treatmentTimeSplint);
callbackSuccess = QFUNC(splint);
condition = QFUNC(canSplint);
Expand Down
18 changes: 18 additions & 0 deletions addons/medical_treatment/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,24 @@
true
] call CBA_fnc_addSetting;

[
QGVAR(medicSplint),
"LIST",
[LSTRING(MedicSplint_DisplayName), LSTRING(MedicSplint_Description)],
LSTRING(Category),
[[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
true
] call CBA_fnc_addSetting;


[
QGVAR(locationSplint),
"LIST",
[LSTRING(LocationSplint_DisplayName), LSTRING(LocationSplint_Description)],
[[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
true
] call CBA_fnc_addSetting;

[
QGVAR(medicAdenosine),
"LIST",
Expand Down
12 changes: 12 additions & 0 deletions addons/medical_treatment/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,18 @@
<Spanish>Controla donde puede sr usada la Epinefrina.</Spanish>
<Korean>에피네프린을 사용할 수 있는 장소를 정합니다.</Korean>
</Key>
<Key ID="STR_ACE_Medical_Treatment_MedicSplint_DisplayName">
<English>Allow Splint</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_MedicSplint_Description">
<English>Training level required to use Splint.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_LocationSplint_DisplayName">
<English>Locations Splint</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_LocationSplint_Description">
<English>Controls where Splints can be used.</English>
</Key>
<Key ID="STR_ACE_Medical_Treatment_MedicMorphine_DisplayName">
<English>Allow Morphine</English>
</Key>
Expand Down