Damage propagation for stock_parts and SMES overload (fixes #3457) #3460
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
code/game/objects/item_damage.dm
Outdated
| @@ -18,9 +18,11 @@ | |||
| return 0 //must return a number | |||
|
|
|||
| //Apply damage | |||
| var/damage_taken = health // Initialize with current health value... | |||
There was a problem hiding this comment.
This doesn't seem right to me - I feel like just doing damage = min(health, damage) and otherwise leaving the logic unchanged would do the job.
There was a problem hiding this comment.
The proc claims to return the damage taken by the object, not the amount of health left after taking damage.
There was a problem hiding this comment.
Yeah, that's what I'm doing here, but the min is definitely more elegant.
On the other side, since we're already removed the <0 cases, even clamp could be removed? But alright.
| for(var/obj/machinery/power/terminal/T in powernet.nodes) | ||
| var/obj/machinery/power/apc/A = T.master_machine() | ||
| if(istype(A)) | ||
| if (prob(overload_chance)) | ||
| A.overload_lighting() | ||
| if (prob(failure_chance)) | ||
| A.set_broken(TRUE) | ||
| if (!(A in apcs)) |
There was a problem hiding this comment.
apcs |= A will do a non-duplicating add, for reference.
MistakeNot4892
added
the
awaiting author
cyberillithid
force-pushed
the
smesfailure
branch
from
e4fed76
to
f7710a0
Compare
MistakeNot4892
approved these changes
Oct 21, 2023
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.
Description of changes
Changed APCs failure from plain
set_broken(TRUE)to getting dealt electrocute damage in SMES failure procedures.To allow that to break more than a singular
stock_part, damage returned fromtake_damageshould be changed from being reduced only by armor (unapplicable to stock parts) to keeping track of the health the item had before damage; thus, sufficient amount of damage to machinery will dismantle it in one hit.Why and what will this PR improve
Will make APCs repairable after SMES failures.
Authorship
Myself
Changelog
🆑
tweak: changed the SMES overloading APC failure damage
bugfix: fixed APCs being stuck irrepairable on overloading
bugfix: fixed clamping any machinery damage to one part per hit
/:cl: