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

Jump to bottom

Refactor/wounds #13917

Closed
wants to merge 187 commits into from
Closed

Refactor/wounds #13917

wants to merge 187 commits into from

Conversation

Jezithyr
Copy link
Contributor

@Jezithyr Jezithyr commented Feb 3, 2023 •
edited
Loading

About the PR

TODO before opening pr:

  • Wounds can be created on body parts from specified damage types
  • Wounds have severity that scales effects
  • Wounds heal over time and healing rate can be adjusted
  • When a wound is healed it may change to another wound (a scar)
  • Damage from a wound can overflow onto surrounding parts if it is destroyed
  • Implement trauma system. Traumas are lists of wounds that can be applied based on damage numbers.
  • Implement wound hp/integrity systems. (HP heals, integrity does not)
  • Implement pain, acts as a softcap on the number of wounds. If pain is above certain thresholds the entity enters crit or dies. Most wounds cause pain. Pain can be modified to increase or decrease it's affect.
  • Treatments can be applied to wound entities to modify their attributes.
  • Rewrite bleeding system to be per-wound based instead of just a hp buffer
  • Pain, and wound components can be modified by treatments
  • Implement consciousness and consciousness modifier system. With thresholds for crit and death.
  • Convert crit and death states to use consciousness to trigger instead of direct damage
  • Update defibrillator to provide a temporary consciousness buff instead of healing damage
  • Update medical scanner to list wounds and general health
  • Create easy to use API/Events for all wound-med features
  • Implementing blocking flag for consciousness if a player has been dead long enough to prevent consciousness changes/reviving if the player has been dead long enough
  • Implement critical parts for consciousness. If these parts gets damaged decrease consciousness, if they are destroyed kill the entity.
  • Hook up treatments to usable actions/doafters on items
  • Implement Icons/Screen effects for Pain
  • Implement Icons/Screen effects for Bloodloss
  • Implement Icons/Screen effects for Consciousness
  • When a part is destroyed, it amputates any connected parts and applies an amputation wound to the parent part.
  • Setup all medical items to use the new treatment system
  • Pain and wound components can be modified by reagents
  • Map all damage types to traumas
  • Balance medical items
  • Balance wounds and damage types
  • Rough rebalance of all weapons/attacks
  • Implement explosion damage logic
  • Implement wound cauterization (Heat damage has a chance to stop bleeding on parts)
  • Implement wound stacking/reopening
  • Implement medical inspection text logic
  • Implement medical inspection prompt (A right click option to get a medical description of an entity)
  • Add hotkey for medical inspect
  • Implement placeholder bodypart targeting. (Randomly select a bodypart with bias towards the torso or head)

Out of scope features that may come in a later pr (Do not ask for these or you get the slap)

  • Surgery
  • Broken bones
  • WoundPen (Wounds that get applied to organs that are inside of bodyparts)
  • Organ damage
  • Organ simulation
  • Bloodvessels
  • UI menus
  • Targeting

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 Jezithyr, DrSmugLeaf

  • add: Added fun!
  • remove: Removed fun!
  • tweak: Changed fun!
  • fix: Fixed fun!

Jezithyr and others added 30 commits November 5, 2022 01:51
@Jezithyr
started work on wound prototypes
6b0677a
@Jezithyr
implemented wound application and stacking
7f57303
@Jezithyr
implemented SKIN and created Bones!
bb6d320
@Jezithyr
implemented bone typing
d095766
@Jezithyr
fixing a stupid with damage specifier
3579d26
@Jezithyr
fixing some serialization fuckups and implementing per part damage caps
170ac18
@Jezithyr
updating
bdf11c4
@Jezithyr
interm commit
854b176
@Jezithyr
Merge remote-tracking branch 'upstream/master' into refactor/wounds
a4ba814
@Jezithyr
implemented wound table caching, updated wound tables to use severity
f8cf84f
@Jezithyr
Implemented Wounding :D
c983122
@Jezithyr
added listener for damage
31e290c
@Jezithyr
Merge branch 'master' into refactor/wounds
cbea569
@Jezithyr
Interm test
8d19e70
@DrSmugleaf
Fix errors
eb97064
@Jezithyr
Moved woundPools out of damagetype to their own prototype
7629390
@Jezithyr
Unfuck Csproj
ced971e
@Jezithyr
Converted to new trauma-damage based system
2db4d1e
@Jezithyr
Merge branch 'refactor/wounds'
6db19b3
@DrSmugleaf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
6bbcccb 
…on-14 into refactor/wounds
@DrSmugleaf
Use methods from merge
8476dd5
@DrSmugleaf
Cleanup
5bd8295
@DrSmugleaf
Cleanup
c0e8821
@DrSmugleaf
Default to traumaType if no penTraumaType
5bb7447
@DrSmugleaf
Remove infected
02a7376
@DrSmugleaf
Cleanup
1a215cf
@DrSmugleaf
Add health damage and integrity damage
d87d7d7
@DrSmugleaf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
37962b9 
…on-14 into refactor/wounds
@DrSmugleaf
Fix sandbox error
070a1c4
@DrSmugleaf
Add test injury crack
24df4b7
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 14, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

DrSmugleaf and others added 11 commits April 15, 2023 19:02
@DrSmugleaf
Fixed missing partial keyword for autogenerated components
fb480c0
@DrSmugleaf
Port MaterialCloth healing
c203e8c
@Jezithyr
Updating woundmed prototypes
5bb6c95
@Jezithyr
Merge remote-tracking branch 'origin/refactor/wounds' into refactor/w…
ca3f05b 
…ounds
@DrSmugleaf
Fix startup errors
7c5f5a1
@Jezithyr
started consciousness rewrite to use modifier stacks
0303967
@Jezithyr
Finished Consciousness rewrite. A lot simpler (Less math \o/)
465e703
@Jezithyr
Added support for modifier categories. (to allow more than 1 modifier…
87a95b1 
… from the same owner)
@Jezithyr
Merge pull request #2 from deltanedas/patch-3
b708fe0 
add null checks to server droppart
@metalgearsloth
Merge remote-tracking branch 'upstream/master' into refactor/wounds
21d33ef 
# Conflicts:
#	Content.Server/Body/Components/StomachComponent.cs
#	Content.Server/Disease/Cures/DiseaseReagentCure.cs
#	Content.Server/Disease/Effects/DiseaseAdjustReagent.cs
#	Content.Server/Medical/Bloodstream/Systems/BloodstreamSystem.cs
#	Content.Server/Medical/HealingSystem.cs
#	Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
#	Resources/Prototypes/Entities/Objects/Materials/materials.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@metalgearsloth
weh
424469a
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label May 20, 2023
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label May 23, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@metalgearsloth
Merge remote-tracking branch 'upstream/master' into refactor/wounds
e55524a 
# Conflicts:
#	Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs
#	Content.Server/Medical/Bloodstream/Components/BloodstreamComponent.cs
#	Content.Server/Medical/Components/HealingComponent.cs
#	Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
#	Pow3r/Program.UI.cs
#	Resources/Prototypes/Body/Parts/human.yml
#	Resources/Prototypes/Entities/Objects/Materials/materials.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 23, 2023
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 29, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@rene-descartes2021 rene-descartes2021 mentioned this pull request Jul 8, 2023
Closed
1 task
@deltanedas
Copy link
Contributor

:trollface: is this still being worked on

@deltanedas deltanedas mentioned this pull request Aug 13, 2023
Closed
1 task
@Jezithyr
Copy link
Contributor Author

Jezithyr commented Aug 21, 2023 •
edited
Loading

Closing this because I created a new branch for the medical refactor :^)
#19383

@Jezithyr Jezithyr closed this Aug 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth Awaiting requested review from metalgearsloth metalgearsloth will be requested when the pull request is marked ready for review metalgearsloth is a code owner

@EmoGarbage404 EmoGarbage404 Awaiting requested review from EmoGarbage404 EmoGarbage404 will be requested when the pull request is marked ready for review EmoGarbage404 is a code owner

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf will be requested when the pull request is marked ready for review DrSmugleaf is a code owner

@Chief-Engineer Chief-Engineer Awaiting requested review from Chief-Engineer Chief-Engineer will be requested when the pull request is marked ready for review Chief-Engineer is a code owner

Assignees
No one assigned
Labels
Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Merge Conflict This PR currently has conflicts that need to be addressed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Jezithyr @ZoldorfTheWizard @PixelTheKermit @deltanedas @Emisse @moonheart08 @DrSmugleaf @metalgearsloth