Mopping and puddle tweaks (#13238)

fix undefined
Fixes https://github.com/space-wizards/space-station-14/issues/11830
This commit is contained in:
Leon Friedrich
2023-01-01 19:03:26 +13:00
committed by GitHub
parent 8a02f81c13
commit bce1f9fe89
10 changed files with 322 additions and 334 deletions

View File

@@ -15,11 +15,11 @@
path: /Audio/Effects/Fluids/splat.ogg
recolor: true
- type: Clickable
- type: Evaporation
- type: Physics
- type: Fixtures
fixtures:
- shape:
- id: slipFixture
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
mask:
@@ -29,6 +29,16 @@
hard: false
- type: Appearance
- type: PuddleVisualizer
wetFloorEffectThreshold: 0 # non-evaporating puddles don't become sparkles.
- type: entity
id: EvaporatingPuddle
parent: PuddleBase
abstract: true
components:
- type: Evaporation
- type: PuddleVisualizer
wetFloorEffectThreshold: 5
- type: entity
name: gibblets
@@ -40,16 +50,12 @@
sprite: Fluids/gibblet.rsi # Placeholder
state: gibblet-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
reagents:
- ReagentId: Water
Quantity: 10
- type: Appearance
- type: PuddleVisualizer
- type: Slippery
launchForwardsMultiplier: 2.0
- type: StepTrigger
@@ -57,7 +63,7 @@
- type: entity
name: puddle
id: PuddleSmear
parent: PuddleBase
parent: EvaporatingPuddle
description: A puddle of liquid.
components:
- type: Sprite
@@ -75,7 +81,7 @@
- type: entity
name: puddle
id: PuddleSplatter
parent: PuddleBase
parent: EvaporatingPuddle
description: A puddle of liquid.
components:
- type: Sprite
@@ -103,11 +109,6 @@
- type: Puddle
overflowVolume: 50
opacityModifier: 8
- type: Evaporation
evaporateTime: 400 # very slow
- type: Appearance
- type: PuddleVisualizer
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: entity
name: vomit
@@ -117,11 +118,11 @@
- type: Transform
anchored: true
- type: Clickable
- type: Evaporation
- type: Physics
- type: Fixtures
fixtures:
- shape:
- id: slipFixture
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
mask:
@@ -188,6 +189,7 @@
state: writing-0
netsync: false
- type: Puddle
- type: Evaporation
evaporateTime: 10
- type: Appearance
- type: PuddleVisualizer

View File

@@ -78,17 +78,12 @@
sprite: Fluids/egg_splat.rsi
state: egg-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
reagents:
- ReagentId: Egg
Quantity: 2
- type: Evaporation
- type: Appearance
- type: PuddleVisualizer
- type: entity
name: eggshells

View File

@@ -20,7 +20,6 @@
reagents:
- ReagentId: Flour
Quantity: 10
- type: Evaporation
- type: Appearance
- type: PuddleVisualizer

View File

@@ -407,18 +407,12 @@
sprite: Fluids/tomato_splat.rsi
state: puddle-0
netsync: false
- type: Puddle
wetFloorEffectThreshold: 0 # No wet floor sparkles
- type: SolutionContainerManager
solutions:
puddle:
reagents:
- ReagentId: JuiceTomato
Quantity: 10
- type: Evaporation
lowerLimit: 0 # todo: reimplement stain behaviour, ideally in a way that doesn't use evaporation lowerLimit
- type: Appearance
- type: PuddleVisualizer
- type: entity
name: eggplant