[PORT] Port TargetObjectiveImmuneComponent from DeltaV#862
[PORT] Port TargetObjectiveImmuneComponent from DeltaV#862CliveOcelot wants to merge 1 commit intoProjectOmu:masterfrom
Conversation
github-actions
Bot
added
S: Untriaged
|
does this apply to teach a lesson too? i understand prevent because You pretty much cant prevent them from getting to cc |
Since teach a lesson uses the same underlying shit to pick people, i'm pretty sure it prevents the "teach a lesson" objs as well (Granted i don't think you could complete those either since they would lifeline before they are fully dead, and you need someone to fully die once for teach a lesson to work) |
i mean as long as the ntr doesnt get on the shuttle prevent from reaching cc is a greentext,, the objective doesnt make any sense tho |
It would be possible to do it on specific objs if filters were actually working consistently (they don't currently) |
feistyfedora
added
Note: Port
|
Do Heretic targets also use the same system? Because I was about to bounty something similar to this because its impossible to get the NTR or BSO to not lifeline out if you drag them anywhere near a rune. |
BSO and NTR can't use their lifeline if they're mansus grasped. |
NotActuallyMarty
left a comment
NotActuallyMarty
left a comment
There was a problem hiding this comment.
half of this PR is adding things that we already have, see if you can redo the changes you need with our current systems instead of duplicating things for no reason.
| namespace Content.Shared._DV.Implants.AddComponentsImplant; | ||
|
|
||
| public sealed class AddComponentsImplantSystem : EntitySystem | ||
| { |
There was a problem hiding this comment.
kill this we already have it as ComponentsImplantSystem
| public sealed partial class AddComponentsImplantComponent : Component | ||
| { |
| if (!TryComp<MindComponent>(targetComp.Target, out var targetMind)) | ||
| { | ||
| args.Cancelled = true; | ||
| return; | ||
| } | ||
| if (targetMind.OwnedEntity == null) | ||
| { | ||
| args.Cancelled = true; | ||
| return; | ||
| } | ||
| if (HasComp<TargetObjectiveImmuneComponent>(targetMind.OwnedEntity.Value)) | ||
| { | ||
| args.Cancelled = true; | ||
| return; | ||
| } | ||
| // END Omu |
There was a problem hiding this comment.
merge into one if and don't just assume the entity is the mind entity use TryGetMind at least, HasComp handles nullable var you don't need to pass by value.
| public sealed partial class BodyMindBlacklistFilter : MindFilter | ||
| { | ||
| [DataField(required: true)] | ||
| public EntityWhitelist Blacklist = new(); | ||
|
|
||
| protected override bool ShouldRemove(Entity<MindComponent> ent, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys) | ||
| { | ||
| if (ent.Comp.OwnedEntity is not {} mob) | ||
| return true; | ||
|
|
||
| var sys = entMan.System<EntityWhitelistSystem>(); | ||
| return sys.IsBlacklistPassOrNull(Blacklist, mob); | ||
| } |
There was a problem hiding this comment.
we have BodyMindFilter? Its a whitelist instead of a blacklist which are the same thing if you use them. You can even check this method leading to the same thing. Use !type: BodyMindFilter with inverted: true instead if you want a real blacklist.
7 participants
About the PR
Ports TargetObjectiveImmuneComponent from DeltaV, makes two new variants of the mindshield implant (One also adds TargetObjectiveImmuneComponent, the other adds TargetObjectiveImmuneComponent and AntagImmune), with the one that adds TargetObjectiveImmuneComponent being given to BSO, NTR, ERT and other CC related roles.
Why / Balance
People with a lifeline shouldn't be valid targets.
Technical details
This contains a few things, including a system for implants to add components to whoever they are implanted into, two new filters which work in addition to edits to PickObjectiveTargetSystem to make people with TargetObjectiveImmuneComponent invalid targets.
Now are all of the filters needed alongside the edits to the system? I'm not sure. the it took a while of messing with them to get it to work, as filters seem entirely broken at the moment.
And before someone asks why
Content.Shared/_Omu/Mind/Filters/BodyMindBlacklistFilter.csis not in Omumod or the omu namespace, The filters system throws a decent few errors if it is not done the way it is. Why? Not a clue, but it does.Requirements
Changelog
🆑