Stomach YAML tweaks (short-term satiety) (#9326)

This commit is contained in:
Kara
2022-07-01 13:42:29 -07:00
committed by GitHub
parent e40a03ec48
commit de6db8cb21
10 changed files with 24 additions and 41 deletions

View File

@@ -24,7 +24,7 @@ namespace Content.Server.Body.Components
/// Initial internal solution storage volume /// Initial internal solution storage volume
/// </summary> /// </summary>
[DataField("maxVolume")] [DataField("maxVolume")]
public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(100); public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(20);
/// <summary> /// <summary>
/// Time in seconds between reagents being ingested and them being /// Time in seconds between reagents being ingested and them being

View File

@@ -290,7 +290,7 @@ namespace Content.Server.Chemistry.Components
return; return;
} }
var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(50)); var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(20));
for (int i = 0; i < pillAmount; i++) for (int i = 0; i < pillAmount; i++)
{ {
var pill = _entities.SpawnEntity("Pill", _entities.GetComponent<TransformComponent>(Owner).Coordinates); var pill = _entities.SpawnEntity("Pill", _entities.GetComponent<TransformComponent>(Owner).Coordinates);

View File

@@ -22,7 +22,7 @@ chem-master-window-packaging-text = Packaging
chem-master-current-text-label = Label: chem-master-current-text-label = Label:
chem-master-window-pills-label = Pills: chem-master-window-pills-label = Pills:
chem-master-window-pill-type-label = Pill type: chem-master-window-pill-type-label = Pill type:
chem-master-window-max-pills-volume-text = max 50u/each chem-master-window-max-pills-volume-text = max 20u/each
chem-master-window-max-bottles-volume-text = max 30u/each chem-master-window-max-bottles-volume-text = max 30u/each
chem-master-window-create-pill-button = Create chem-master-window-create-pill-button = Create
chem-master-window-create-bottle-button = Create chem-master-window-create-bottle-button = Create

View File

@@ -147,8 +147,6 @@
stomach: stomach:
maxVol: 250 maxVol: 250
- type: Stomach - type: Stomach
maxVolume: 250
digestionDelay: 20
# The stomach metabolizes stuff like foods and drinks. # The stomach metabolizes stuff like foods and drinks.
# TODO: Have it work off of the ent's solution container, and move this # TODO: Have it work off of the ent's solution container, and move this
# to intestines instead. # to intestines instead.

View File

@@ -6,3 +6,10 @@
- type: Metabolizer - type: Metabolizer
metabolizerTypes: [ Rat ] metabolizerTypes: [ Rat ]
- type: entity
id: OrganRatStomach
parent: OrganAnimalStomach
suffix: "rat"
components:
- type: Stomach
maxVolume: 50 # they're hungry

View File

@@ -13,8 +13,6 @@
compatibility: Slime compatibility: Slime
- type: Brain - type: Brain
- type: Stomach - type: Stomach
maxVolume: 250
digestionDelay: 20
- type: Metabolizer - type: Metabolizer
maxReagents: 6 maxReagents: 6
metabolizerTypes: [ Slime ] metabolizerTypes: [ Slime ]

View File

@@ -105,8 +105,7 @@
stomach: stomach:
maxVol: 100 maxVol: 100
- type: Stomach - type: Stomach
maxVolume: 100 maxVolume: 10
digestionDelay: 20
- type: Metabolizer - type: Metabolizer
maxReagents: 3 maxReagents: 3
metabolizerTypes: [Animal] metabolizerTypes: [Animal]

View File

@@ -12,28 +12,9 @@
compatibility: Biological compatibility: Biological
mechanisms: mechanisms:
- OrganRatLungs - OrganRatLungs
- OrganHumanStomach - OrganRatStomach
- OrganHumanLiver - OrganAnimalLiver
- OrganHumanHeart - OrganAnimalHeart
- OrganHumanKidneys - OrganAnimalKidneys
- type: Damageable - type: Damageable
damageContainer: Biological damageContainer: Biological
- type: entity
id: OrganRatLungs
parent: BaseAnimalOrgan
name: lungs
noSpawn: true
components:
- type: Mechanism
size: 1
compatibility: Biological
- type: Lung
- type: Metabolizer
removeEmpty: true
solutionOnBody: false
solution: "Lung"
metabolizerTypes: [ Rat ]
groups:
- id: Gas
rateModifier: 100.0

View File

@@ -123,7 +123,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Dexalin - ReagentId: Dexalin
Quantity: 15 Quantity: 15
@@ -136,7 +136,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Dylovene - ReagentId: Dylovene
Quantity: 15 Quantity: 15
@@ -149,7 +149,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Hyronalin - ReagentId: Hyronalin
Quantity: 15 Quantity: 15
@@ -162,7 +162,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Iron - ReagentId: Iron
Quantity: 15 Quantity: 15
@@ -175,7 +175,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Kelotane - ReagentId: Kelotane
Quantity: 15 Quantity: 15
@@ -188,7 +188,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: SpaceDrugs - ReagentId: SpaceDrugs
Quantity: 15 Quantity: 15
@@ -201,7 +201,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Tricordrazine - ReagentId: Tricordrazine
Quantity: 15 Quantity: 15
@@ -214,7 +214,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
reagents: reagents:
- ReagentId: Romerol - ReagentId: Romerol
Quantity: 10 Quantity: 10

View File

@@ -272,7 +272,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 50 maxVol: 20
- type: SolutionSpiker - type: SolutionSpiker
sourceSolution: food sourceSolution: food
- type: DeleteOnTrigger - type: DeleteOnTrigger