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- Tweak Wound Blood Loss and generation #10528

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a38767b
initial commit
Cplhardcore Nov 5, 2024
4f03f3c
Update CfgVehicles.hpp
Cplhardcore Nov 5, 2024
2d0f1a9
Merge branch 'master' into Damage-Rework
Cplhardcore Nov 5, 2024
71daaa7
Missing curly bracket
Cplhardcore Nov 5, 2024
434f709
another one
Cplhardcore Nov 5, 2024
9243175
small fix
Cplhardcore Nov 5, 2024
c6effc9
Small fixes
Cplhardcore Nov 5, 2024
305654d
Update addons/medical_engine/functions/fnc_handleDamage.sqf
Cplhardcore Nov 5, 2024
822019f
Multiple fixes
Cplhardcore Nov 5, 2024
97c9fd4
Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…
Cplhardcore Nov 5, 2024
f4f3905
Fixing stringtables
Cplhardcore Nov 5, 2024
7c78535
Update addons/medical_gui/functions/fnc_updateBodyImage.sqf
Cplhardcore Nov 5, 2024
2aeda77
Update addons/medical_engine/functions/fnc_handleDamage.sqf
Cplhardcore Nov 5, 2024
0737077
Fixes
Cplhardcore Nov 5, 2024
799c794
Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…
Cplhardcore Nov 5, 2024
b6b1225
Adds switching to keypresses
Cplhardcore Nov 5, 2024
5b8e144
Adds a GET_BODYPART_DAMAGE macro, i think
Cplhardcore Nov 5, 2024
6fbea5a
small fix
Cplhardcore Nov 5, 2024
fd4c4cd
Fixing fractures
Cplhardcore Nov 5, 2024
9961493
GUI update
Cplhardcore Nov 6, 2024
1810f08
Hemtt suggestions
Cplhardcore Nov 8, 2024
7270e8d
Update fnc_updateBodyImage.sqf
Cplhardcore Nov 15, 2024
ac42769
Update script_component.hpp
Cplhardcore Nov 15, 2024
4b119bf
Update addons/medical_engine/functions/fnc_handleDamage.sqf
Cplhardcore Nov 16, 2024
263fbca
Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…
Cplhardcore Nov 16, 2024
ef08054
Update fnc_woundsHandlerBase.sqf
Cplhardcore Nov 16, 2024
3c906ce
GUI fixes
Cplhardcore Nov 17, 2024
09db653
Update fnc_woundsHandlerBase.sqf
Cplhardcore Nov 17, 2024
2b93099
Small fixed
Cplhardcore Nov 30, 2024
02e526b
Damage Handlers
Cplhardcore Nov 30, 2024
f7427fa
Small changes
Cplhardcore Dec 1, 2024
0f0cf3d
Update fnc_woundsHandlerBase.sqf
Cplhardcore Dec 2, 2024
e8c6bf4
Update fnc_updateDamageEffects.sqf
Cplhardcore Jan 15, 2025
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
Prev Previous commit
Next Next commit
Update addons/medical_engine/functions/fnc_handleDamage.sqf
Co-authored-by: Jouni Järvinen <[email protected]>
Cplhardcore and rautamiekka authored Nov 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4b119bfb5a5c1e1f8408d2fbd1dbea19c8c68c45
2 changes: 1 addition & 1 deletion addons/medical_engine/functions/fnc_handleDamage.sqf
Original file line number Diff line number Diff line change
@@ -158,7 +158,7 @@ if (_context == 2) then {
private _allDamages = [
[_damageHead select 0, PRIORITY_HEAD, _damageHead select 1, "Head"],
[_damageNeck select 0, PRIORITY_NECK, _damageNeck select 1, "Neck"],
[_damageChest select 0, PRIORITY_CHEST, _damageChest select 1, "Chest"],
[_damageChest select 0, PRIORITY_CHEST, _damageChest select 1, "Chest"],
[_damageBody select 0, PRIORITY_BODY, _damageBody select 1, "Body"],
[_damageLeftArm select 0, PRIORITY_LEFT_ARM, _damageLeftArm select 1, "LeftArm"],
[_damageRightArm select 0, PRIORITY_RIGHT_ARM, _damageRightArm select 1, "RightArm"],

Unchanged files with check annotations Beta

[IDC_BODY_CHEST, IDC_BODY_CHEST_S],
[IDC_BODY_TORSO, IDC_BODY_TORSO_S],
[IDC_BODY_ARMLEFT, IDC_BODY_ARMLEFT_S, IDC_BODY_ARMLEFT_T, IDC_BODY_ARMLEFT_B],
[IDC_BODY_ARMUPPERLEFT, IDC_BODY_ARMUPPERLEFT_S, IDC_BODY_ARMUPPERLEFT_T, IDC_BODY_ARMUPPERLEFT_B],

Check notice on line 116 in addons/medical_gui/functions/fnc_updateBodyImage.sqf

GitHub Actions / windows

Variable should not be all caps: IDC_BODY_ARMLUPPEREFT_B

all caps variable
[IDC_BODY_ARMRIGHT, IDC_BODY_ARMRIGHT_S, IDC_BODY_ARMRIGHT_T, IDC_BODY_ARMRIGHT_B],
[IDC_BODY_ARMUPPERRIGHT, IDC_BODY_ARMUPPERRIGHT_S, IDC_BODY_ARMUPPERRIGHT_T, IDC_BODY_ARMUPPERRIGHT_B],
[IDC_BODY_LEGLEFT, IDC_BODY_LEGLEFT_S, IDC_BODY_LEGLEFT_T, IDC_BODY_LEGLEFT_B],