diff --git a/Resources/Prototypes/Diseases/infectious.yml b/Resources/Prototypes/Diseases/infectious.yml index 87168a977f..a71786d84a 100644 --- a/Resources/Prototypes/Diseases/infectious.yml +++ b/Resources/Prototypes/Diseases/infectious.yml @@ -300,6 +300,7 @@ min: 420 ## Reachable with a flamer - !type:DiseaseReagentCure reagent: Theobromine + min: 4 - type: disease id: TongueTwister diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index 9c6dd6e663..dd45faa8b1 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -1,5 +1,6 @@ -- type: reagent - id: Nutriment +# End points - the eventual goal is that almost all foods and drinks metabolize into either these, or reagents that build up (e.g. theobromine, caffeine,... ) +- type: reagent + id: Nutriment #Anything that isn't better suited to vitamin, protein, or sugar. we aren't doing a super in-depth simulator. name: reagent-name-nutriment group: Foods desc: reagent-desc-nutriment @@ -18,7 +19,7 @@ pricePerUnit: 2 - type: reagent - id: Vitamin + id: Vitamin #Anything "healthy" name: reagent-name-vitamin group: Foods desc: reagent-desc-vitamin @@ -41,7 +42,7 @@ pricePerUnit: 2.5 - type: reagent - id: Protein + id: Protein #Meat and beans name: reagent-name-protein group: Foods desc: reagent-desc-protein @@ -61,3 +62,28 @@ - !type:SatiateHunger pricePerUnit: 3 +- type: reagent + id: Sugar #Candy and grains + name: reagent-name-sugar + group: Foods + desc: reagent-desc-sugar + physicalDesc: reagent-physical-desc-sweet + flavor: sweet + color: white + meltingPoint: 146.0 + metabolisms: + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:ReagentThreshold #Only satiates when eaten with nutriment + reagent: Nutriment + min: 0.1 + factor: 1 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.1 + - !type:PlantAdjustWeeds + amount: 2 + - !type:PlantAdjustPests + amount: 2 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 47777adfe7..e187bd7f22 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -9,8 +9,12 @@ metabolisms: Food: effects: - - !type:SatiateHunger - factor: 1 + - !type:AdjustReagent + reagent: Sugar + amount: 0.4 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 - type: reagent id: Oats @@ -23,8 +27,12 @@ metabolisms: Food: effects: - - !type:SatiateHunger - factor: 1 + - !type:AdjustReagent + reagent: Sugar + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.3 - type: reagent id: Enzyme @@ -34,11 +42,6 @@ physicalDesc: reagent-physical-desc-chalky flavor: bitter color: "#009900" - metabolisms: - Food: - effects: - - !type:SatiateHunger - nutritionFactor: 1 - type: reagent id: Egg @@ -51,31 +54,9 @@ metabolisms: Food: effects: - - !type:SatiateHunger - factor: 1 - -- type: reagent - id: Sugar - name: reagent-name-sugar - group: Foods - desc: reagent-desc-sugar - physicalDesc: reagent-physical-desc-sweet - flavor: sweet - color: white - meltingPoint: 146.0 - metabolisms: - Food: - effects: - - !type:SatiateHunger - factor: 1 - plantMetabolism: - - !type:PlantAdjustNutrition - amount: 0.1 - - !type:PlantAdjustWeeds - amount: 2 - - !type:PlantAdjustPests - amount: 2 - + - !type:AdjustReagent + reagent: Protein + amount: 0.5 - type: reagent id: Blackpepper @@ -85,11 +66,6 @@ physicalDesc: reagent-physical-desc-grainy flavor: peppery color: black - metabolisms: - Food: - effects: - - !type:SatiateHunger - factor: 1 - type: reagent id: Vinegar @@ -102,8 +78,17 @@ metabolisms: Food: effects: - - !type:SatiateHunger - factor: 1 + - !type:AdjustReagent + reagent: Water + amount: 0.4 + - !type:AdjustReagent + reagent: Vitamin + amount: 0.1 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 6 - type: reagent id: Rice @@ -116,7 +101,12 @@ metabolisms: Food: effects: - - !type:SatiateHunger + - !type:AdjustReagent + reagent: Sugar + amount: 0.4 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 - type: reagent id: OilOlive @@ -129,8 +119,9 @@ metabolisms: Food: effects: - - !type:SatiateHunger - factor: 1 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.75 - type: reagent id: Oil @@ -157,8 +148,9 @@ metabolisms: Food: effects: - - !type:SatiateHunger # spicy foods satiate hunger better - factor: 1.5 + - !type:AdjustReagent + reagent: Nutriment #Oils enhance nutrition + amount: 0.75 Poison: effects: - !type:AdjustTemperature diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index f9d712c46c..820629bf6f 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -342,6 +342,7 @@ boilingPoint: 554 # I'm not a chemist, but it boils at 295, lower than melting point, idk how it works so I gave it higher value metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange conditions: @@ -351,9 +352,9 @@ type: Animal # Applying damage to the mobs with lower metabolism capabilities damage: types: - Poison: 4 + Poison: 0.4 - !type:ChemVomit - probability: 0.04 + probability: 0.04 #Scaled for time, not metabolismrate. conditions: - !type:ReagentThreshold min: 3 @@ -444,6 +445,7 @@ color: "#F2E9D2" metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange conditions: @@ -453,7 +455,7 @@ type: Animal damage: types: - Poison: 6 + Poison: 0.06 - type: reagent id: Pax