"Proper" "Softcrit" "Support" #1545

RedFoxIV · 2025-01-14T16:01:48Z

Description

Implements the softcrit functionality.
Similiar to critical state but spessmen will be able to communicate and crawl around, but not pick up items.
Also supports configuring what is and isn't allowed in different MobStates (per mob prototype): you can enable picking up items while in softcrit so people can pick up their lasgun and continue shooting after taking a 40x46mm to their ass cheeks from the guest nukies while being dragged to safety.

Technical details

New prototype type: "mobStateParams" (`MobStateParametersPrototype`) Used to specify what can and can't be done when in a certain mobstate. Of note that they are not actually bound to any `MobState` by themselves. To assign a params prototype to a mobstate, use `InitMobStateParams` in `MobStateComponent`. It has to be a prototype because if I just did something akin to `Dictionary>`, you'd have to check the parent and copy every flag besides the one you wish to modify. That is, if I understand how the prototype system works correctly, which I frankly doubt.

MobStateComponent now has:

Dictionary<string, string> InitMobStateParams, for storing "mobstate - parameter prototype" pairs. <string, string> because it has to be editable via mob prototypes. Named "mobStateParams" for mob prototypes.
public Dictionary<MobState, MobStateParametersPrototype> MobStateParams for actually storing the params for each state
public Dictionary<MobState, MobStateParametersOverride> MobStateParamsOverrides for storing overrides. MobStateParametersOverride is a struct which mirrors all MobStateParametersPrototype's fields, except they're all nullable. This is meant for code which wants to temporarily override some setting, like a spell which allows dead people to talk. This is not the best solution, but it should do at first. A better option would be tracking each change separately, instead of hoping different systems overriding the same flag will play nicely with eachother.
a shitton of getter methods

TraitModifyMobState now has:

public Dictionary<string, string> Params to specify a new prototype to use.
Important note: All values of MobStateParametersPrototype are nullable, which is a hack to support TraitModifyMobState. This trait takes one MobStateParametersPrototype per mobstate and applies all of its non-null values. This way, a params prototype can be created which will only have pointing: true and the trait can apply it (e.g. to critstate, so we can spam pointing while dying like it's a game of turbo dota)
The above is why that wall of getters exists: They check the relevant override struct, then the relevant prototype. If both are null, they default to false (0f for floats.) The only exception is OxyDamageOverlay, because it's used both for oxy damage overlay (if null) and as a vision-limiting black void in crit..

MobStateSystem now has:

a bunch of new "IsSomething"/"CanDoSomething" methods to check the various flags, alongside rewritten old ones.
lookin ahh predicate factory

---

TODO

done:

Make proper use of MobStateSystem.IsIncapacitated().
done: some checks were changed, some left as they did what was (more or less) intended.

Previous `IsIncapacitated()` implementation simply checked if person was in crit or dead. Now there is a `IsIncapacitated` flag in the parameters, but it's heavily underutilized. I may need some help on this one, since I don't know where would be a good place to check for it and I absolutely will not just scour the entire build in search for them.

Separate force-dropping items from being downed
done: dropItemsOnEntering bool field. If true, will drop items upon entering linked mobstate.
Don't drop items if ForceDown is true but PickingUp is also true.
done: dropItemsOnEntering bool field. If true, will drop items upon entering linked mobstate.
Actually check what are "conscious attempts" are used for
done: whether or not mob is conscious. Renamed the bool field accordingly.
Look into adding a way to make people choke "slowly" in softcrit as opposed to choking at "regular speed" in crit. Make that into a param option? Make that into a float so the speed can be finetuned?
done: BreathingMultiplier float field added.

1f is regular breathing, 0.25 is "quarter-breathing". Air taken is multiplied by `BreathingMultiplier` and suffocation damage taken (that is dealt by RespiratorSystem, not all oxy damage) is multiplied by `1-BreathingMultiplier`.

make sure the serializer actually does its job
done: it doesn't. Removed.
Make an option to prohibit using radio headsets while in softcrit
done: Requires Incapacitated parameter to be false to be able to use headset radio.
Make sure it at least compiles

not done:

probably move some other stuff to Params if it makes sense. Same thing as with IsIncapacitated though: I kinda don't want to, at least for now.

No media

:p

Changelog

🆑

add: Soft critical state. Crawl to safety, or to your doom - whatever is closer.

(cherry picked from commit 05759d916d03e77b4240e92b547e507e611d7258) # Conflicts: # Content.Client/Overlays/EntityHealthBarOverlay.cs # Content.Server/FootPrint/FootPrintsSystem.cs # Content.Shared/Mobs/Components/MobStateComponent.cs # Content.Shared/Mobs/MobState.cs # Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs # Content.Shared/Mobs/Systems/MobStateSystem.cs # Content.Shared/Shadowkin/SharedEtherealSystem.cs

# Conflicts: # Content.Server/Traits/TraitSystem.Functions.cs # Content.Shared/Mobs/Components/MobStateComponent.cs # Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs

(cherry picked from commit 898ae4e91ef2abd1c8d6fc9dc63f11eacd8fbdc3)

(cherry picked from commit e2f31775ce29c14dca7c622f183bc21ec57fa6db)

(cherry picked from commit 289a0ee00c071cbf1841120f70e08771badfcee4)

(cherry picked from commit 4bd639d70be6d69067d1e07dba4ec2fac09c0e28) # Conflicts: # Content.Client/Overlays/EntityHealthBarOverlay.cs # Content.Shared/Standing/SharedLayingDownSystem.cs

RedFoxIV · 2025-01-14T16:14:10Z

i probably should use ProtoId more, huh

bruhmogus · 2025-01-14T17:30:40Z

huh?? didnt we already have this???

RedFoxIV · 2025-01-15T13:28:44Z

now that i am reading this a day later, I can confidently say this PR is borderline incomprehensible
wow

BlueHNT · 2025-01-15T17:20:32Z

What the fuck happened here?

RedFoxIV · 2025-01-15T18:19:20Z

huh?? didnt we already have this???

MobState.SoftCritical was already present but went unused, as well as some other stuff relating to it. The closest thing to softcrit EE currently has is allowing people to crawl and/or talk while in crit.

What the fuck happened here?

lack of QA

Erisfiregamer1 · 2025-01-15T20:42:36Z

What the fuck happened here?

lack of QA

Nothing in SS14 has Quality Assurance, my friend

github-actions · 2025-01-17T03:17:01Z

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

Signed-off-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>

github-actions · 2025-01-18T18:32:25Z

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

# Conflicts: # Content.Shared/CCVar/CCVars.cs

RedFoxIV · 2025-01-19T17:43:18Z

It's as ready as I will ever get it to be without someone else looking at it.

…to go

VMSolidus

Holy shit this PR is amazing.

VMSolidus · 2025-01-25T16:02:10Z

Content.Server/Traits/TraitSystem.Functions.cs

+            current.MergeWith(mod);
+            //current.FillDefaults();
+        }
+        comp.Dirty(); // why is this deprecated? it's much better than manually resolving entitymanager with ioc


Suggested change

comp.Dirty(); // why is this deprecated? it's much better than manually resolving entitymanager with ioc

comp.Dirty(); // why is this deprecated? it's much better than manually resolving entitymanager with ioc

It's deprecated because it's been replaced with Dirty(uid, comp); instead of Dirty(comp). I think you might be able to get around the deprecated warning by doing comp.Dirty(uid);. The reason for the deprecation is because you're supposed to only dirty one component at a time, and if you dirty just the component, the system now has to dirty all of that component, so it needs UID + Component.

However we now have as an engine option, the ability to dirty individual datafields in components, feel free to take a look at that if you wish!

VMSolidus · 2025-01-25T16:04:13Z

Content.Server/Traits/TraitSystem.Functions.cs

-        if (AllowHandInteractWhileDead is not null)
-            mobStateComponent.AllowHandInteractWhileDead = AllowHandInteractWhileDead.Value;
+        foreach (var pair in Params) {
+            DebugTools.Assert(_reflection.TryParseEnumReference($"enum.MobState.{pair.Key}", out var e), $"MobState.{pair.Key} does not exist.");


Suggested change

DebugTools.Assert(_reflection.TryParseEnumReference($"enum.MobState.{pair.Key}", out var e), $"MobState.{pair.Key} does not exist.");

DebugTools.Assert(_reflection.TryParseEnumReference($"enum.MobState.{pair.Key}", out var e), $"MobState.{pair.Key} does not exist.");

You're not allowed to use e as a variable here because it straight up won't exist in Release configuration. Separate out TryParseEnumReference into an If Not {Assert; Continue;} statement to clear the error

VMSolidus · 2025-01-25T16:05:25Z

Content.Shared/Mobs/Components/MobStateComponent.cs

+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool CanEquipOther(MobState? State = null) => GetOverride(State).CanEquipOther ?? GetParams(State)?.CanEquipOther ?? false;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool CanUnequipOther(MobState? State = null) => GetOverride(State).CanUnequipOther ?? GetParams(State)?.CanUnequipOther ?? false;


Holy fuck this is amazing. I'm taking notes.

github-actions · 2025-01-25T20:17:55Z

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

RedFoxIV and others added 7 commits January 13, 2025 13:03

That was not enjoyable

58effdf

# Conflicts: # Content.Server/Traits/TraitSystem.Functions.cs # Content.Shared/Mobs/Components/MobStateComponent.cs # Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs

aaa

bf8769a

(cherry picked from commit 898ae4e91ef2abd1c8d6fc9dc63f11eacd8fbdc3)

two, four, one, ten

3d8b25c

(cherry picked from commit e2f31775ce29c14dca7c622f183bc21ec57fa6db)

am i transmitting

5c05c6c

(cherry picked from commit 289a0ee00c071cbf1841120f70e08771badfcee4)

is anyone listening

85dfcdb

(cherry picked from commit 4bd639d70be6d69067d1e07dba4ec2fac09c0e28) # Conflicts: # Content.Client/Overlays/EntityHealthBarOverlay.cs # Content.Shared/Standing/SharedLayingDownSystem.cs

unfuck the cherrypick and some minor touchups

2607623

github-actions bot added Changes: C# Changes any cs files Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Jan 14, 2025

SimpleStation14 changed the title ~~"Proper" "softcrit" "support"~~ "Proper" "Softcrit" "Support" Jan 14, 2025

forgor to push

840554d

RedFoxIV added 2 commits January 15, 2025 22:38

ref

77ea955

i was unable to get it working

9425dfd

RedFoxIV added 5 commits January 16, 2025 00:23

this was bad, but now it's a little bit less bad

7459027

groundhog commit

f132394

renamed ConsciousAttemptAllowed to IsConscious

c0d756f

Merge branch 'master' into pillow-export

837f5ff

unprofessional commit name №1184

5153336

RedFoxIV force-pushed the pillow-export branch from 377a449 to 5153336 Compare January 17, 2025 02:05

RedFoxIV added 2 commits January 17, 2025 05:13

god i hope this doesn't break anything

51a579e

🤷‍♂️

79c0c9b

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 17, 2025

Merge branch 'master' into pillow-export

2e311a2

Signed-off-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 17, 2025

Merge branch 'master' into pillow-export

d0aea1b

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 18, 2025

RedFoxIV added 5 commits January 19, 2025 20:01

Good Game Design was slain...

1b92ab9

oops

0b54b8a

Please enter commit message

9f3c14a

Merge branch 'master' into pillow-export

db499bf

# Conflicts: # Content.Shared/CCVar/CCVars.cs

unwhited the white

6de7ca3

RedFoxIV marked this pull request as ready for review January 19, 2025 17:42

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 19, 2025

RedFoxIV added 3 commits January 19, 2025 21:06

FUCK

9af7b69

doesn't work properly without being able to pick up stuff, so it has …

fedd36f

…to go

Merge remote-tracking branch 'upstream/master' into pillow-export

9e40595

RedFoxIV requested review from DEATHB4DEFEAT, sleepyyapril, VMSolidus and Remuchi as code owners January 20, 2025 08:27

github-actions bot added Status: Needs Review Someone please review this labels Jan 20, 2025

damn i feel dumb

f8d88bf

VMSolidus requested changes Jan 25, 2025

View reviewed changes

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

"Proper" "Softcrit" "Support" #1545

"Proper" "Softcrit" "Support" #1545

RedFoxIV commented Jan 14, 2025 •

edited

Loading

RedFoxIV commented Jan 14, 2025

bruhmogus commented Jan 14, 2025

RedFoxIV commented Jan 15, 2025

BlueHNT commented Jan 15, 2025

RedFoxIV commented Jan 15, 2025 •

edited

Loading

Erisfiregamer1 commented Jan 15, 2025

github-actions bot commented Jan 17, 2025

github-actions bot commented Jan 18, 2025

RedFoxIV commented Jan 19, 2025

VMSolidus left a comment

VMSolidus Jan 25, 2025

VMSolidus Jan 25, 2025

VMSolidus Jan 25, 2025

github-actions bot commented Jan 25, 2025

	comp.Dirty(); // why is this deprecated? it's much better than manually resolving entitymanager with ioc
	comp.Dirty(); // why is this deprecated? it's much better than manually resolving entitymanager with ioc

	DebugTools.Assert(_reflection.TryParseEnumReference($"enum.MobState.{pair.Key}", out var e), $"MobState.{pair.Key} does not exist.");
	DebugTools.Assert(_reflection.TryParseEnumReference($"enum.MobState.{pair.Key}", out var e), $"MobState.{pair.Key} does not exist.");

"Proper" "Softcrit" "Support" #1545

Are you sure you want to change the base?

"Proper" "Softcrit" "Support" #1545

Conversation

RedFoxIV commented Jan 14, 2025 • edited Loading

Description

Technical details

TODO

No media

Changelog

RedFoxIV commented Jan 14, 2025

bruhmogus commented Jan 14, 2025

RedFoxIV commented Jan 15, 2025

BlueHNT commented Jan 15, 2025

RedFoxIV commented Jan 15, 2025 • edited Loading

Erisfiregamer1 commented Jan 15, 2025

github-actions bot commented Jan 17, 2025

github-actions bot commented Jan 18, 2025

RedFoxIV commented Jan 19, 2025

VMSolidus left a comment

Choose a reason for hiding this comment

VMSolidus Jan 25, 2025

Choose a reason for hiding this comment

VMSolidus Jan 25, 2025

Choose a reason for hiding this comment

VMSolidus Jan 25, 2025

Choose a reason for hiding this comment

github-actions bot commented Jan 25, 2025

RedFoxIV commented Jan 14, 2025 •

edited

Loading

RedFoxIV commented Jan 15, 2025 •

edited

Loading