Puddle Visuals: ECS/Refactor and fixes (#11941)

* Don't stop me now, cuz I'm havin' such a good time (I'm havin' a ball!)

* YEET

* No changes to intended behaviour at this point. Pretty much just a refactor + bugfixes.

* tweaks to RandomizeState, removing an error caused by setting the state after setting the RSI

* Comments cleanup and removed IsSlippery. To re-add soon for this PR.

* test

* We don't actually use this PuddleGeneric anywhere

* cheeky

* Uncheeky, and tweaks based on #8203

* Recheeky

* A small price to pay for `checks passed`

* Beauty, like ice, our footing does betray; Who can tread sure on the smooth, slippery way

* Undo Slippery Checks

* Begin smoothing. Need to fix the animation-not-playing bug again

* Cleanup

* animation bugfix

* IgnoredComponents tests fix
This commit is contained in:
Willhelm53
2022-12-19 20:40:53 -06:00
committed by GitHub
parent 3327c2998f
commit a1dcc500a8
12 changed files with 208 additions and 157 deletions

View File

@@ -28,14 +28,7 @@
- SlipLayer
hard: false
- type: Appearance
visuals:
- type: PuddleVisualizer
recolor: true
- type: entity
name: puddle
id: PuddleGeneric
parent: PuddleSmear
- type: PuddleVisualizer
- type: entity
name: gibblets
@@ -48,6 +41,7 @@
state: gibblet-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
@@ -55,8 +49,7 @@
- ReagentId: Water
Quantity: 10
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger
@@ -72,11 +65,9 @@
state: smear-0
netsync: false
- type: Puddle
slipThreshold: 5
slipThreshold: 3
- type: Appearance
visuals:
- type: PuddleVisualizer
recolor: true
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger
@@ -92,10 +83,9 @@
state: splatter-0
netsync: false
- type: Puddle
slipThreshold: 5
slipThreshold: 3
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger
@@ -113,16 +103,15 @@
- type: Puddle
overflowVolume: 50
opacityModifier: 8
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: Evaporation
evaporateTime: 400 # very slow
- type: Appearance
visuals:
- type: PuddleVisualizer
recolor: true
- type: PuddleVisualizer
- type: entity
name: vomit
id: PuddleVomit # No parent because we don't want the visualizer
id: PuddleVomit # No parent because we don't want the VisualizerSystem to behave in the standard way
description: Gross.
components:
- type: Transform
@@ -146,6 +135,7 @@
netsync: false
- type: Puddle
slipThreshold: 5
recolor: false
- type: SolutionContainerManager
solutions:
puddle:
@@ -158,9 +148,8 @@
launchForwardsMultiplier: 2.0
- type: StepTrigger
- type: Appearance
visuals:
- type: PuddleVisualizer
customPuddleSprite: true
- type: PuddleVisualizer
customPuddleSprite: true
- type: entity
name: toxins vomit
@@ -182,8 +171,8 @@
- ReagentId: Water
Quantity: 5
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
customPuddleSprite: true
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger
@@ -201,8 +190,7 @@
- type: Puddle
evaporateTime: 10
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger

View File

@@ -79,6 +79,7 @@
state: egg-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
@@ -87,8 +88,7 @@
Quantity: 2
- type: Evaporation
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
- type: entity
name: eggshells

View File

@@ -22,8 +22,7 @@
Quantity: 10
- type: Evaporation
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
# Reagent Containers

View File

@@ -408,6 +408,7 @@
state: puddle-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
@@ -417,8 +418,7 @@
- type: Evaporation
lowerLimit: 0 # todo: reimplement stain behaviour, ideally in a way that doesn't use evaporation lowerLimit
- type: Appearance
visuals:
- type: PuddleVisualizer
- type: PuddleVisualizer
- type: entity
name: eggplant