uas-medical port #214
Merged
uas-medical port #214
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
The following is all the commits from the experimental branch of uas-medical: (command used: git log --pretty="[%h] %s") [e0332a3] menudef: Update keybinds [8ff7833] bandage: Add strip button [5e83c4d] wound: clamp pressure to max 8 [6a85593] bandage: Don't add more pressure if wound isn't properly bandaged yet [a6ad614] bandage: Change grid colour to match the patient's [907764d] bandage: Add hudscale cvar [2ccb7fc] wheel: Check owner [6954137] bandage: show different symbol if sealed [cea6832] Update readme.md [5c68962] traumakit: adjust toolList position [86866ce] wound: increase pressure loss rate [8679588] bandage: suck a bit more [948703c] wounds: reset pressure if not patched [bc5997c] bandage: overhaul ui a bit [fc71558] bandage: replace lorem ipsum [062acc5] bandage: Improve flavour text a bit more [53001d2] bandage: Actually add proper helptext [c84843f] bandage: be more lenient with ismoving [8a36030] bandage: clean up drawwound [b6d12bb] bandage: clamp pressure percentage [ab447da] woundhandler: Fix UpdateWound not updating currentWound correctly [ac64a1d] wound: init oldPatched [cf6a1ef] bandage: don't try to use bandage if holding firemode [b482006] bandage: Check if fully covered [c440007] wound: Allow incap bandaging [219cf9f] wound: handle patched wounds and properly inherit source [d957176] bandage: Can't bandage and move at the same time [3842870] bandage: Apply effects on the correct target [ecb973c] bandage: Use dark gray for flavour text [82d378b] bandage: Show patient name [df8d791] bandage: show flavour text :] [b66fae0] bandage: oops [2f40f90] bandage: clamp wound position [7c03bb8] bandage: Add option to rip bloodbag [0fbd86c] bandage: Separate bandage action into its own module [44b5e63] bandage: Add base tool info and a bit of helptext [68ca59e] traumakit: don't colour the "but" [fcb4855] woundhandler: Better currentWound updater [6edefb0] woundhandler: Unify wound cycling logic [c40df82] Synchronise currentWound across all tools [607cb18] Indicate how open the wound is, even when bandaged [04b6a22] traumakit: properly offset text when bandaged [bbcb35d] bandage: Use GetStatusColor [b436e6d] traumakit: Hide wound info when bandaged and show wound stability [2378472] bandage: properly position wounds [ed0b572] bandage: Show how stable the wound is [6dec9ea] bandage: Adjust colours [9bcfe1d] wound: Override ComeUndone [f396171] bandage: add more hud info [8435f5b] bandage: Adjust hud positions [848f5f7] wound: Make pressure loss based on how fast you're moving [7549cf6] wound: Properly check for IsMoving [128e6e4] bandage: Tint wounds depending on pressure [001048e] bandage: Separate hud function [3fb1b50] Sort files [7a4f179] traumakit: Prevent operating on a bandaged wound [06a42d2] traumakit: Formatting [38f8258] move HandleStrip back to traumakit [6b13fca] bandage: slightly reduce max pressure applied [118d14f] bandage: Reset action if you switched wounds [af9f6ad] Remove stabilizer [a72dc07] bandage: Add option to rip bandage [75a090c] bandage: fix crash [24fb8c6] bandage: Try to make it more obvious which wound is selected [c37bcc5] bandage: Fix effects not triggering [5ba14a2] wounds: Stability affects bleeding [13f56fd] wound: decrease pressure faster if you're moving [d5dc8af] Update stabilisation formula and make pressure less annoying to maintain [23db6b2] bandage: Attempt to fix audio [ca742c5] bandage: debug hud [21acfea] bandage: Fix bandage progression being wrong and tweak effect [da3f603] bandage: Restore effects [0f87802] bandage: Tidy up some stuff and fix selected wound layering issue [d1d07cd] bandage: Tidy up grid code a bit [87cf432] bandage: Allow wound selection [c35fdb1] bandage: Inherit UaS_MedicalTool [3317e8b] Update zscript.zsc [0e0ded6] rename bandage file [01681a5] traumakit: use parent's DoEffect to init some stuff [5a6cebd] Create a base class for medical tools that behave like the trauma kit [a42b6e0] bandage: Implement rough hud [32e2886] wound: add comments and make bandage come undone if pressure is too low [d3d870a] [WIP] pressure and stabilisation changes [bf82e55] Semi-working bandage [ea43cab] unfinished commit [1549e04] wheel: Better scaling and configurable options [1e755bb] Wheel: remove pointless variables [c37b8e1] Better item wheel controls and better collision detection [37a157e] traumakit: Add inverted cycling [f3acb57] menudef: actually use the correct cvar for altcontrols [b56a43c] Update readme.md [e30fef8] traumakit: Adjust cavity status values [3b39d55] stabilize: Show whether you have open wounds on the HUD [dd20b15] traumakit: Allow switching to Mag. Manager [610aab7] wound: Nerf regenrate [0364725] traumakit: Actually fix alt controls [13c9e88] Revert "traumakit: Better alt controls logic check" [d39f4a1] wheel: Clean up some unused stuff [a761a70] scalpel: Don't use painkiller for getting wound size [f759c87] Update menudef.txt [23d7353] traumakit: Better alt controls logic check [787b1a0] traumakit: Fix some oversights with tool switching [4b33836] trk: Update helptext [4970b1e] traumakit: Add alternative control scheme for wheel [b7b63df] Update readme.md [f3a8617] traumakit: Add item wheel [b2c96e9] traumakit: Make staplers not so effective [0da32fc] traumakit: Fix sutures not working [8e7428a] wound: Less harsh cavities [12a2fc7] wounds: Only heal tissue damage if the wound was in good condition [9f517bd] Update readme.md [65f70ad] scalpel: fix oversight [e578340] scalpel: less harsh tissue damage [abd2ef0] scalpel: Deal tissue damage as well [c299986] wounds: Heal a random amount of tissue damage when healed [e7699d9] traumakit: Add options to quick swap [a7c75ad] Update readme.md [f8b7785] traumakit: Actually use the correct icons [06d9177] traumakit: Add icons to tool list [c969a43] Update readme.md [7e821c8] traumakit: Add tool list to HUD [89815bf] sutures: Seal, not bandage [383295c] WoundHandler: Only tell new wounds if debug is true [405e482] Use HDBleedingWound and refactor some stuff [19cb6af] Add debug hud cvar [bec4bdf] forceps: Deal less cavity damage [c419d73] readme: remove false fact [e612b7b] debug: More fancy info [da32eb0] traumakit: Actually cause pain [bff73e9] stabilize: Add null check [01cf0fb] scalpel: Create harsher wounds [b25f9fa] readme: add more info [f5c143b] scalpel: Randomise wound damage [3bd55c0] Adjust heal amount [c7703b4] Adjust cavity related stuff [2d51b9a] Add disclaimer [201047b] Initial commit
might need some more balancing (currently a bit slow)
also tries to sync up with other medical tools
should be a bit more faster now at least
Instead of trying to update other tools, just use a single class to store all tool's wound related info. "Composition over inheritance" as they say.
|
i think that's most of the bugs fixed... should be fine to merge now? |
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.
To be specific, this is a port over of uas-medical experimental branch (aka the branch with the new bandage stuff) with some additional fixes and cleanups added on top.
Changes
Technical changes
UaS_WoundInfonow replacesHDBleedingWound.UaS_WoundInfotoUaS_Wound.regenrateis now affected byavgstat(basically ifavgstat <= 15, the wound will start sealing itself up, somewhat similar to what the second flesh does to your wounds)Regenerate()rewritten to be not extremely fast.Bandage changes