Cleanup ExecutionSystem #24382
Merged
Cleanup ExecutionSystem #24382
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
… ActiveExecution Component. Transferred the Execution system into shared. Heavily re-wrote the system in order to reduce duplication, and remove gun code from the system. The melee weapon modifier which was dependant on swing rate was removed. The ActiveExecutionComponent was created in order to apply the damage modifier to the shot from a gun execution. It is added just before the gun fires and removed after an attempt is made.
Currently the gun system does not have a way to alter hitscan damage like it does with projectiles.
This reverts commit a46da64.
Everything about the shot goes through the gun system now. The Damage multiplier is only applied when a projectile impacts the target so people that get in the way don't get hit with 9 times damage for no reason. In order to make suicides work I needed to create fake EntityCoordinates because the gun system and the projectile system do not play well with a projectile that has the same start and end position.
The OnAmmoShotEvent is only raised on the server.
Veritius
reviewed
Jan 21, 2024
Veritius
reviewed
Jan 21, 2024
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Outdated
Show resolved
Hide resolved
Addressed reviews on overriding messages. Now I actually mark doafters as handled. Return normal cooldown to some meleeweapons I forgot on the previous commit.
metalgearsloth
requested changes
Jan 22, 2024
Remove duplication
I'll check tomorrow if it can even be integrated into the SuicideSystem. |
Remove evil null coercion that I was sure I removed a while ago
github-actions
bot
added
the
S: Needs Review
|
Gonna suss this one out over the weekend sorry on the delay. |
All good thanks. If you know how I could get around the hack of having to create fake entity coordinated to use the gun system for shooting yourself that'd be amazing. |
The collision layer check doesn't work and I don't have time to fix it.
github-actions
bot
added
the
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Content.Shared/Projectiles/SharedProjectileSystem.cs
github-actions
bot
removed
the
S: Merge Conflict
metalgearsloth
approved these changes
Feb 25, 2024
metalgearsloth
added a commit
to metalgearsloth/space-station-14
that referenced
this pull request
Feb 25, 2024
This reverts commit bcbe2ec.
metalgearsloth
added a commit
that referenced
this pull request
Feb 25, 2024
Erisfiregamer1
pushed a commit
to The-Arcadis-Team/arc-station-14
that referenced
this pull request
Jan 9, 2025
* Creat Execution Component and add to sharp items * Kill Server ExecutionSystem. Create ExecutionSystem in shared. Create ActiveExecution Component. Transferred the Execution system into shared. Heavily re-wrote the system in order to reduce duplication, and remove gun code from the system. The melee weapon modifier which was dependant on swing rate was removed. The ActiveExecutionComponent was created in order to apply the damage modifier to the shot from a gun execution. It is added just before the gun fires and removed after an attempt is made. * Fix bugs The execution completed text will now only show up if the gun fires. The client also no longer crashes because I forgot to network the component. * Remove clumsy text * Make BaseSword abstract * Add ExecutionComponent to every weapon * Fix bug * Remove execution comp from battery weapons Currently the gun system does not have a way to alter hitscan damage like it does with projectiles. * Cleanup * Revert "Remove clumsy text" This reverts commit a46da64. * Actually fix the ExecutionSystem Everything about the shot goes through the gun system now. The Damage multiplier is only applied when a projectile impacts the target so people that get in the way don't get hit with 9 times damage for no reason. In order to make suicides work I needed to create fake EntityCoordinates because the gun system and the projectile system do not play well with a projectile that has the same start and end position. * Make launchers able to execute * Fix prediction bug The OnAmmoShotEvent is only raised on the server. * Readd ability for clowns to accidentally shoot themselves while executing * Cleanup * Reset melee cooldown to initial value * Address reviews fix bug Addressed reviews on overriding messages. Now I actually mark doafters as handled. Return normal cooldown to some meleeweapons I forgot on the previous commit. * Address Reviews Remove duplication * Exorcise codebase Remove evil null coercion that I was sure I removed a while ago * Address reviews again * Remove melee weapon attack logic and rely on the system. Remove gun and melee checks. * Make system functional again and cleanup * Remove code I forgot to remove * Cleanup * stalled * Selectively revert gun penetration The collision layer check doesn't work and I don't have time to fix it. * Fixes --------- Co-authored-by: metalgearsloth <[email protected]>
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.
Resolves #24180
About the PR
This prs cleans up the ExecutionSystem.
Additionally it has the following differences functionally from the current one:
Why / Balance
On the no extra damage modifier, I do not think that melee weapons should get a doafter modifier considering in an execution they will do 9 times damage. This can be altered back to its original condition if needed.
Technical details
The system was moved to Shared and as much as possible is now predicted.
Some functions were generalized or removed to reduce duplication.
All gun code is gone. It now just listen to some events made by the gun system.
All melee code gone. It now just listens to an event made by the melee system.
The ExecutionComponent is now added to all weapons that can execute. Using it you can modify values for the doafter, damage modifier, and the many different messages that may be shown on executions.
Swords got a base type as to not put the component on every single sword individually.
The ActiveExecutionComponent is added to guns just before they fire and removed right after in order to display the correct messages if the gun fires and to adjust the projectile if the person is shooting themselves so it can collide with them. Similar use for melee weapons.
The ExecutionProjectileComponent is added to projectiles as they fire. This is later used to make sure that people in the way of an execution don't get 9 times damage as well as to make sure that a clumsy clown shooting their foot doesn't either.
Note on strange thing: In order for me to get shooting yourself to work properly, I create fake coordinates that are slightly offset from the person. This is because otherwise we would be trying to shoot a projectile to its own positions which doesn't work.
Media
Breaking changes
Changelog
no cl no fun.