egg rework (#21606)
* egg and raw egg * add DamageEntity * boiling and exploding eggs --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
23
Content.Server/Construction/Completions/DamageEntity.cs
Normal file
23
Content.Server/Construction/Completions/DamageEntity.cs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
using Content.Shared.Construction;
|
||||||
|
using Content.Shared.Damage;
|
||||||
|
using Content.Shared.Damage.Systems;
|
||||||
|
|
||||||
|
namespace Content.Server.Construction.Completions;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Damage the entity on step completion.
|
||||||
|
/// </summary>
|
||||||
|
[DataDefinition]
|
||||||
|
public sealed partial class DamageEntity : IGraphAction
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Damage to deal to the entity.
|
||||||
|
/// </summary>
|
||||||
|
[DataField]
|
||||||
|
public DamageSpecifier Damage;
|
||||||
|
|
||||||
|
public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
|
||||||
|
{
|
||||||
|
entityManager.System<DamageableSystem>().TryChangeDamage(uid, Damage, origin: userUid);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -71,6 +71,7 @@ flavor-complex-bread = like bread
|
|||||||
flavor-complex-batter = like batter
|
flavor-complex-batter = like batter
|
||||||
flavor-complex-butter = like butter
|
flavor-complex-butter = like butter
|
||||||
flavor-complex-egg = like egg
|
flavor-complex-egg = like egg
|
||||||
|
flavor-complex-raw-egg = like raw egg
|
||||||
flavor-complex-bacon = like bacon
|
flavor-complex-bacon = like bacon
|
||||||
flavor-complex-chicken = like chicken
|
flavor-complex-chicken = like chicken
|
||||||
flavor-complex-duck = like duck
|
flavor-complex-duck = like duck
|
||||||
|
|||||||
@@ -11,7 +11,10 @@ reagent-name-enzyme = universal enzyme
|
|||||||
reagent-desc-enzyme = Used in cooking various dishes.
|
reagent-desc-enzyme = Used in cooking various dishes.
|
||||||
|
|
||||||
reagent-name-egg = egg
|
reagent-name-egg = egg
|
||||||
reagent-desc-egg = Used for baking.
|
reagent-desc-egg = Cooked chicken embryo, delicious.
|
||||||
|
|
||||||
|
reagent-name-raw-egg = raw egg
|
||||||
|
reagent-desc-raw-egg = Used for baking.
|
||||||
|
|
||||||
reagent-name-sugar = sugar
|
reagent-name-sugar = sugar
|
||||||
reagent-desc-sugar = Tasty spacey sugar!
|
reagent-desc-sugar = Tasty spacey sugar!
|
||||||
|
|||||||
@@ -89,3 +89,4 @@ reagent-physical-desc-exotic-smelling = exotic smelling
|
|||||||
reagent-physical-desc-energizing = energizing
|
reagent-physical-desc-energizing = energizing
|
||||||
reagent-physical-desc-exhilarating = exhilarating
|
reagent-physical-desc-exhilarating = exhilarating
|
||||||
reagent-physical-desc-vibrant = vibrant
|
reagent-physical-desc-vibrant = vibrant
|
||||||
|
reagent-physical-desc-fluffy = fluffy
|
||||||
|
|||||||
@@ -56,6 +56,16 @@
|
|||||||
# Wow double-yolk you're so lucky!
|
# Wow double-yolk you're so lucky!
|
||||||
- !type:DoActsBehavior
|
- !type:DoActsBehavior
|
||||||
acts: [ "Destruction" ]
|
acts: [ "Destruction" ]
|
||||||
|
# all below are for egg cooking/exploding
|
||||||
|
- type: AtmosExposed
|
||||||
|
- type: Temperature
|
||||||
|
currentTemperature: 290
|
||||||
|
- type: InternalTemperature
|
||||||
|
# ~1mm shell and ~1cm of albumen
|
||||||
|
thickness: 0.011
|
||||||
|
area: 0.04
|
||||||
|
# conductivity of egg shell based on a paper from Romanoff and Romanoff (1949)
|
||||||
|
conductivity: 0.456
|
||||||
|
|
||||||
# Splat
|
# Splat
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -91,7 +101,6 @@
|
|||||||
name: egg
|
name: egg
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Consumable/Food/egg.rsi
|
|
||||||
layers:
|
layers:
|
||||||
- state: icon
|
- state: icon
|
||||||
map: [ "enum.DamageStateVisualLayers.Base" ]
|
map: [ "enum.DamageStateVisualLayers.Base" ]
|
||||||
@@ -101,3 +110,30 @@
|
|||||||
icon: ""
|
icon: ""
|
||||||
- enum.DamageStateVisualLayers.Base:
|
- enum.DamageStateVisualLayers.Base:
|
||||||
white: ""
|
white: ""
|
||||||
|
- type: Construction
|
||||||
|
graph: Egg
|
||||||
|
node: start
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: FoodEggBase
|
||||||
|
id: FoodEggBoiled
|
||||||
|
name: boiled egg
|
||||||
|
description: A delicious hardboiled egg.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
layers:
|
||||||
|
- state: icon
|
||||||
|
map: [ "enum.DamageStateVisualLayers.Base" ]
|
||||||
|
- type: SolutionContainerManager
|
||||||
|
solutions:
|
||||||
|
food:
|
||||||
|
maxVol: 6
|
||||||
|
reagents:
|
||||||
|
- ReagentId: EggCooked
|
||||||
|
Quantity: 6
|
||||||
|
- type: Temperature
|
||||||
|
# preserve temperature from the boiling step
|
||||||
|
currentTemperature: 344
|
||||||
|
- type: Construction
|
||||||
|
graph: Egg
|
||||||
|
node: boiled
|
||||||
|
|||||||
@@ -229,6 +229,11 @@
|
|||||||
flavorType: Complex
|
flavorType: Complex
|
||||||
description: flavor-complex-egg
|
description: flavor-complex-egg
|
||||||
|
|
||||||
|
- type: flavor
|
||||||
|
id: raw-egg
|
||||||
|
flavorType: Complex
|
||||||
|
description: flavor-complex-raw-egg
|
||||||
|
|
||||||
- type: flavor
|
- type: flavor
|
||||||
id: bacon
|
id: bacon
|
||||||
flavorType: Complex
|
flavorType: Complex
|
||||||
|
|||||||
@@ -65,10 +65,26 @@
|
|||||||
|
|
||||||
- type: reagent
|
- type: reagent
|
||||||
id: Egg
|
id: Egg
|
||||||
|
name: reagent-name-raw-egg
|
||||||
|
group: Foods
|
||||||
|
desc: reagent-desc-raw-egg
|
||||||
|
physicalDesc: reagent-physical-desc-mucus-like
|
||||||
|
flavor: raw-egg
|
||||||
|
color: white
|
||||||
|
recognizable: true
|
||||||
|
metabolisms:
|
||||||
|
Food:
|
||||||
|
effects:
|
||||||
|
- !type:AdjustReagent
|
||||||
|
reagent: UncookedAnimalProteins
|
||||||
|
amount: 0.5
|
||||||
|
|
||||||
|
- type: reagent
|
||||||
|
id: EggCooked
|
||||||
name: reagent-name-egg
|
name: reagent-name-egg
|
||||||
group: Foods
|
group: Foods
|
||||||
desc: reagent-desc-egg
|
desc: reagent-desc-egg
|
||||||
physicalDesc: reagent-physical-desc-mucus-like
|
physicalDesc: reagent-physical-desc-fluffy
|
||||||
flavor: egg
|
flavor: egg
|
||||||
color: white
|
color: white
|
||||||
recognizable: true
|
recognizable: true
|
||||||
@@ -77,7 +93,7 @@
|
|||||||
effects:
|
effects:
|
||||||
- !type:AdjustReagent
|
- !type:AdjustReagent
|
||||||
reagent: Protein
|
reagent: Protein
|
||||||
amount: 0.5
|
amount: 1
|
||||||
|
|
||||||
- type: reagent
|
- type: reagent
|
||||||
id: Blackpepper
|
id: Blackpepper
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# egg explodes when heated!!!
|
||||||
|
- type: constructionGraph
|
||||||
|
id: Egg
|
||||||
|
start: start
|
||||||
|
graph:
|
||||||
|
- node: start
|
||||||
|
edges:
|
||||||
|
- to: boiled
|
||||||
|
steps:
|
||||||
|
- minTemperature: 344
|
||||||
|
- node: boiled
|
||||||
|
entity: FoodEggBoiled
|
||||||
|
edges:
|
||||||
|
- to: explode
|
||||||
|
completed:
|
||||||
|
- !type:DamageEntity
|
||||||
|
damage:
|
||||||
|
Blunt: 10
|
||||||
|
steps:
|
||||||
|
# egg explodes some time after the water in it boils and increases pressure, guessing ~110C
|
||||||
|
- minTemperature: 383
|
||||||
|
- node: explode
|
||||||
@@ -8,6 +8,16 @@
|
|||||||
products:
|
products:
|
||||||
Protein: 0.5
|
Protein: 0.5
|
||||||
|
|
||||||
|
- type: reaction
|
||||||
|
id: EggCooking
|
||||||
|
impact: Low
|
||||||
|
minTemp: 344
|
||||||
|
reactants:
|
||||||
|
Egg:
|
||||||
|
amount: 0.5
|
||||||
|
products:
|
||||||
|
EggCooked: 0.5
|
||||||
|
|
||||||
- type: reaction
|
- type: reaction
|
||||||
id: BloodToWine
|
id: BloodToWine
|
||||||
impact: Low
|
impact: Low
|
||||||
|
|||||||
Reference in New Issue
Block a user