Limping / Splint Treatment #6947
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix func descriptions Calc wound blood loss on events reorder includes so scritpmacroMed has global effect trivial optimization for getCardiacOutput Fix var Fix wounds not reopening (nil _category) Fix surgical kit inherting canBandage conditional debug hitpoints Update ACE_Medical_Treatment_Actions.hpp Use woundBleeding for IS_BLEEDING macro rework medication vars comments Reset var in init / fullHeal Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
Drop unique id and merge classId and category
|
From what I can see fracture isn't directly influencing pain levels, is that something we want to implement or is the pain from the wound itself enough? |
TheMagnetar
reviewed
Apr 24, 2019
mharis001
reviewed
Apr 27, 2019
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
mharis001
reviewed
Apr 27, 2019
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
TheMagnetar
requested changes
May 1, 2019
|
|
||
| private _data = (_namespace getVariable _setID) param [2, []]; | ||
|
|
||
| switch (_op) do { | ||
| case ("max"): { | ||
| private _result = -1e99; |
There was a problem hiding this comment.
If data ends up empty, can this cause issues in other scripts? Would it be better to initialise to another value?
There was a problem hiding this comment.
This is called relatively often, I think it's better to leave out the safety checks and just assume the user has added at least one entry.
The only real change I made in this func is moving "max" to the top of the switch block as that's the only one we use so far
* Medical - Transfer state machine state on locality * Fix feedback isUnconscious var * Exclude AI
mharis001
reviewed
May 11, 2019
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
* Improve adjustment calcs / wound blood loss / medications fix func descriptions Calc wound blood loss on events reorder includes so scritpmacroMed has global effect trivial optimization for getCardiacOutput Fix var Fix wounds not reopening (nil _category) Fix surgical kit inherting canBandage conditional debug hitpoints Update ACE_Medical_Treatment_Actions.hpp Use woundBleeding for IS_BLEEDING macro rework medication vars comments Reset var in init / fullHeal Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * Change wound data array Drop unique id and merge classId and category * Splinting and treatment and gui * Add arm fractures and aim effects * localizations and event * fix * cleanup * Apply suggestions from code review Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * formating, rename bone images * Apply suggestions from code review Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * disable calls to extension * Update fnc_onMedicationUsage.sqf * Medical - Skip unneeded setVars on initUnit (#6949) * Medical - Transfer state machine state on locality (#6950) * Medical - Transfer state machine state on locality * Fix feedback isUnconscious var * Exclude AI * Make UAV excludes consistant, formating * Update fnc_treatmentFullHealLocal.sqf * reset fractures on respawn
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
based on PR #6910
I changed settings slightly to be two 3 option settings
Limping:
"Disabled", "Limp on open wound", "Limp on open or bandaged wound"Fractures:
"Disabled", "Splints fully heal", "Splints heal (but cannot sprint)On damage that can cause fracture we set fracture array
[0,0,0,0,0,0]index to 1on splint it gets set to -1 to indicate splint
rough example of gui display
TODO: