Puddle refactor 2: Spillastic boogaloo (#4784)
* Refactor PuddleComponent * Move puddle effects into separate RSIs Basically egg/tomato/powder puddle will be moved into separate /Textures/Fluids RSIs * Fix YAML for puddles * Fix issues sloth pointed out. * Ensure Puddle Component are properly added when spawned * Remove unnecessary method init puddle with starting maxVolume * Addressed ElectroSr comments * Add Resolves * Try fix error in ensureSolution * Puddle unanchoring * Address some issues with puddles * Fix continue -> return
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
drawdepth: FloorObjects
|
||||
- type: SolutionContainerManager
|
||||
- type: Puddle
|
||||
spill_sound:
|
||||
spillSound:
|
||||
path: /Audio/Effects/Fluids/splat.ogg
|
||||
recolor: true
|
||||
- type: Clickable
|
||||
@@ -24,6 +24,10 @@
|
||||
mask:
|
||||
- SmallImpassable
|
||||
hard: false
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
recolor: true
|
||||
|
||||
- type: entity
|
||||
name: puddle
|
||||
@@ -39,9 +43,17 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/gibblet.rsi # Placeholder
|
||||
state: gibblet-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 5
|
||||
state: gibblet
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: Water
|
||||
Quantity: 10
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: puddle
|
||||
@@ -52,9 +64,13 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/smear.rsi # Placeholder
|
||||
state: smear-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 7
|
||||
state: smear
|
||||
- type: Evaporation
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
recolor: true
|
||||
|
||||
- type: entity
|
||||
name: puddle
|
||||
@@ -65,9 +81,12 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/splatter.rsi # Placeholder
|
||||
state: splatter-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 6
|
||||
state: splatter
|
||||
- type: Evaporation
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: vomit
|
||||
@@ -78,11 +97,19 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/vomit.rsi
|
||||
state: vomit-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 4
|
||||
recolor: false
|
||||
evaporate_threshold: -1
|
||||
state: vomit
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 5
|
||||
- ReagentId: Water
|
||||
Quantity: 5
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: toxins vomit
|
||||
@@ -93,10 +120,19 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/vomit_toxin.rsi
|
||||
state: vomit_toxin-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 4
|
||||
recolor: false
|
||||
state: vomit_toxin
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: Toxin
|
||||
Quantity: 5
|
||||
- ReagentId: Water
|
||||
Quantity: 5
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: writing
|
||||
@@ -107,6 +143,10 @@
|
||||
- type: Sprite
|
||||
sprite: Fluids/writing.rsi # Placeholder
|
||||
state: writing-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 5
|
||||
state: writing
|
||||
- type: Evaporation
|
||||
evaporateTime: 10
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
@@ -70,11 +70,20 @@
|
||||
description: If the floor was a little hotter this would fry.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Consumable/Food/egg.rsi
|
||||
sprite: Fluids/egg_splat.rsi
|
||||
state: egg-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 4
|
||||
state: egg
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: Egg
|
||||
Quantity: 2
|
||||
- type: Evaporation
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: eggshells
|
||||
|
||||
@@ -9,11 +9,21 @@
|
||||
description: Call the janitor.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Consumable/Food/ingredients.rsi
|
||||
state: powder-0
|
||||
color: white
|
||||
- type: Puddle
|
||||
sprite: Fluids/powder.rsi
|
||||
state: powder
|
||||
color: white
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: Flour
|
||||
Quantity: 10
|
||||
- type: Evaporation
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
# Reagent Containers
|
||||
|
||||
|
||||
@@ -313,10 +313,21 @@
|
||||
description: Splat.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Hydroponics/tomato.rsi
|
||||
sprite: Fluids/tomato_splat.rsi
|
||||
state: puddle-0
|
||||
netsync: false
|
||||
- type: Puddle
|
||||
variants: 3
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle:
|
||||
reagents:
|
||||
- ReagentId: JuiceTomato
|
||||
Quantity: 10
|
||||
- type: Evaporation
|
||||
lowerLimit: 2
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PuddleVisualizer
|
||||
|
||||
- type: entity
|
||||
name: eggplant
|
||||
|
||||
Reference in New Issue
Block a user