From 9adf737854ac54e3c9d12c73743849ded08d5fbe Mon Sep 17 00:00:00 2001 From: Kit0vras <123590995+Kit0vras@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:04:36 +0300 Subject: [PATCH] Reagent "Fat" and reactions for soapification and meatification (#16058) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Locale/en-US/reagents/meta/biological.ftl | 3 ++ Resources/Prototypes/Body/Parts/animal.yml | 15 ++++++ Resources/Prototypes/Body/Parts/arachnid.yml | 21 +++++++++ Resources/Prototypes/Body/Parts/human.yml | 21 +++++++++ Resources/Prototypes/Body/Parts/reptilian.yml | 21 +++++++++ Resources/Prototypes/Body/Parts/vox.yml | 21 +++++++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 4 +- .../Entities/Objects/Consumable/Food/meat.yml | 40 ++++++++++++++++ Resources/Prototypes/Reagents/biological.yml | 10 ++++ .../Prototypes/Recipes/Reactions/fun.yml | 47 +++++++++++++++++++ 10 files changed, 202 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index 7311433934..f2a0d8062b 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -9,3 +9,6 @@ reagent-desc-spider-blood = Doesn't taste like blueberry juice. reagent-name-ichor = ichor reagent-desc-ichor = An extremely potent regenerative chemical, perfected by space fauna evolution. Produced in the dragon's digestive system, it is seen as an exotic commodity due to the gargantuan effort of hunting for it. + +reagent-name-fat = fat +reagent-desc-fat = No matter how it was obtained, its application is important. diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index 3d90f24e1a..3be42d56cd 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -20,6 +20,13 @@ - type: Tag tags: - Trash + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 # For primates mainly - type: entity @@ -61,3 +68,11 @@ partType: Torso - type: Damageable damageContainer: Biological + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + diff --git a/Resources/Prototypes/Body/Parts/arachnid.yml b/Resources/Prototypes/Body/Parts/arachnid.yml index feeaed1986..757bd2d63f 100644 --- a/Resources/Prototypes/Body/Parts/arachnid.yml +++ b/Resources/Prototypes/Body/Parts/arachnid.yml @@ -13,6 +13,13 @@ containers: bodypart: !type:Container ents: [] + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: SpiderBlood + Quantity: 10 - type: entity id: TorsoArachnid @@ -28,6 +35,13 @@ state: "torso_m" - type: BodyPart partType: Torso + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: SpiderBlood + Quantity: 20 - type: entity id: HeadArachnid @@ -54,6 +68,13 @@ - type: Tag tags: - Head + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: SpiderBlood + Quantity: 10 - type: entity id: LeftArmArachnid diff --git a/Resources/Prototypes/Body/Parts/human.yml b/Resources/Prototypes/Body/Parts/human.yml index 316958dba6..46ae7963a7 100644 --- a/Resources/Prototypes/Body/Parts/human.yml +++ b/Resources/Prototypes/Body/Parts/human.yml @@ -18,6 +18,13 @@ - type: Tag tags: - Trash + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 - type: entity id: TorsoHuman @@ -33,6 +40,13 @@ state: "torso_m" - type: BodyPart partType: Torso + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 - type: entity id: HeadHuman @@ -54,6 +68,13 @@ - type: Tag tags: - Head + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 - type: entity id: LeftArmHuman diff --git a/Resources/Prototypes/Body/Parts/reptilian.yml b/Resources/Prototypes/Body/Parts/reptilian.yml index 0c17913034..5c9fb3cbe8 100644 --- a/Resources/Prototypes/Body/Parts/reptilian.yml +++ b/Resources/Prototypes/Body/Parts/reptilian.yml @@ -16,6 +16,13 @@ - type: Tag tags: - Trash + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 - type: entity id: TorsoReptilian @@ -31,6 +38,13 @@ state: "torso_m" - type: BodyPart partType: Torso + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 - type: entity id: HeadReptilian @@ -52,6 +66,13 @@ - type: Tag tags: - Head + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 - type: entity id: LeftArmReptilian diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml index c87cbaa67e..cc9394e394 100644 --- a/Resources/Prototypes/Body/Parts/vox.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -18,6 +18,13 @@ - type: Tag tags: - Trash + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 - type: entity id: TorsoVox @@ -33,6 +40,13 @@ state: "torso_m" - type: BodyPart partType: Torso + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 - type: entity id: HeadVox @@ -54,6 +68,13 @@ - type: Tag tags: - Head + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 - type: entity id: LeftArmVox diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 01a1d30ee8..cbdc4bf9d7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2112,7 +2112,9 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Blood - Quantity: 60 + Quantity: 55 + - ReagentId: Fat + Quantity: 5 - type: Butcherable spawned: - id: FoodMeat diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 5df2eb75f0..0dccac5531 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -23,6 +23,8 @@ Quantity: 5 - ReagentId: UncookedAnimalProteins Quantity: 1 + - ReagentId: Fat + Quantity: 5 - type: Item size: 5 - type: Temperature @@ -56,6 +58,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatCutlet @@ -130,6 +134,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 2 + - ReagentId: Fat + Quantity: 9 - type: entity name: raw bear meat @@ -148,6 +154,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatBearCutlet @@ -173,6 +181,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatPenguinCutletSlice @@ -198,6 +208,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatChickenCutlet @@ -223,6 +235,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatDuckCutlet @@ -272,6 +286,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 1 + - ReagentId: Fat + Quantity: 2 - type: Construction graph: CrabSteak node: start @@ -294,6 +310,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 + - ReagentId: Fat + Quantity: 3 - type: Construction graph: GoliathSteak node: start @@ -342,6 +360,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 3 - type: entity name: raw lizard meat @@ -360,6 +380,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatLizardCutlet @@ -412,6 +434,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 9 + - ReagentId: Fat + Quantity: 9 - type: SliceableFood count: 3 slice: FoodMeatSpiderCutlet @@ -433,6 +457,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 10 + - ReagentId: Fat + Quantity: 3 - type: entity name: meatwheat clump @@ -906,6 +932,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw bear cutlet @@ -928,6 +956,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw penguin cutlet @@ -948,6 +978,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw chicken cutlet @@ -968,6 +1000,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw duck cutlet @@ -988,6 +1022,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw lizard cutlet @@ -1011,6 +1047,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw spider cutlet @@ -1030,6 +1068,8 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 3 + - ReagentId: Fat + Quantity: 2 - type: entity name: raw xeno cutlet diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 501c67ca54..584aadfb99 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -87,3 +87,13 @@ plantMetabolism: - !type:PlantAdjustWater amount: 0.5 + +- type: reagent + id: Fat + name: reagent-name-fat + group: Biological + desc: reagent-desc-fat + flavor: terrible + color: "#d8d8b0" + physicalDesc: reagent-physical-desc-exotic-smelling + slippery: false diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index 04b7d19347..0e84604f77 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -24,6 +24,53 @@ products: BuzzochloricBees: 3 +- type: reaction + id: CreateSoap + impact: Low + quantized: true + reactants: + Fat: + amount: 15 + TableSalt: + amount: 10 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: Soap + +- type: reaction + id: CreateSoapHomemade + impact: Low + quantized: true + reactants: + Fat: + amount: 15 + TableSalt: + amount: 10 + Blood: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: SoapHomemade + +- type: reaction + id: Meatification + impact: Low + quantized: true + reactants: + Fat: + amount: 25 + Nutriment: + amount: 5 + Blood: + amount: 10 + Carbon: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodMeat + - type: reaction id: SpaceGlue minTemp: 370