From 3cb91d35e9443c8a8a888218382e64dca1eda250 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 31 Aug 2024 14:58:27 -0500 Subject: [PATCH 1/4] initial commit --- .../Locale/en-US/flavors/flavor-profiles.ftl | 3 +++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 3 +++ .../Prototypes/Entities/Objects/Fun/crayons.yml | 4 ++++ .../Prototypes/Entities/Objects/Misc/paper.yml | 3 +++ .../Entities/Objects/Specific/rehydrateable.yml | 14 ++++++++++++-- Resources/Prototypes/Flavors/flavors.yml | 15 +++++++++++++++ 6 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index eb6a43c1b442..f56a6c36b8bc 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -50,6 +50,7 @@ flavor-base-horrible = horrible # lmao flavor-base-terrible = terrible flavor-base-mindful = mindful +flavor-base-chewy = chewy # Complex flavors. Put a flavor here when you want something that's more # specific. @@ -173,6 +174,8 @@ flavor-complex-violets = like violets flavor-complex-pyrotton = like a burning mouth flavor-complex-mothballs = like mothballs flavor-complex-paint-thinner = like paint thinner +flavor-complex-paper = like mushy pulp +flavor-complex-compressed-meat = like compressed meat # Drink-specific flavors. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 7d3acddcfe17..5c91f5c9f29a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1743,6 +1743,9 @@ Asphyxiation: 4 Slash: 7 Blunt: 3 + - type: FlavorProfile + flavors: + - meaty - type: entity parent: MobMouse diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 4aab2efdb97b..ffecfdf99407 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -23,6 +23,10 @@ - type: Crayon capacity: 15 - type: Food + - type: FlavorProfile + flavors: + - chewy + - bitter - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 4646c9308654..e06fcf3a96f4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -63,6 +63,9 @@ solution: food delay: 7 forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper - type: BadFood - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 1d0b7a4e0995..26a0df1a0065 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -15,6 +15,11 @@ Quantity: 10 - type: Food solution: cube + - type: FlavorProfile + flavors: + - chewy + - horrible + - compressed-meat - type: RefillableSolution solution: cube - type: Sprite @@ -161,7 +166,7 @@ plushie: maxVol: 11 # needs room for water reagents: - - ReagentId: Nutriment + - ReagentId: Nutriment #contains nutriment like other dehydrated animals, but isn't edible? Who is grinding dehydrated carp to eat them?? Quantity: 10 - type: RefillableSolution solution: plushie @@ -205,7 +210,7 @@ sound: path: /Audio/Effects/bite.ogg -- type: entity +- type: entity #why is this all redefined down here as a parent of base object instead of just being parented to monkeycube?? TODO: Fix this shit parent: BaseItem id: SyndicateSponge name: monkey cube @@ -223,6 +228,11 @@ Quantity: 10 - type: Food solution: cube + - type: FlavorProfile + flavors: + - chewy + - horrible + - compressed-meat - type: RefillableSolution solution: cube - type: Sprite diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index f1d3e194ac5c..a9fd1886db26 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -179,6 +179,11 @@ flavorType: Base description: flavor-base-mindful +- type: flavor + id: chewy + flavorType: Base + description: flavor-base-chewy + - type: flavor id: mustard flavorType: Complex @@ -1113,3 +1118,13 @@ id: cherry flavorType: Complex description: flavor-complex-cherry + +- type: flavor + id: paper + flavorType: Complex + description: flavor-complex-paper + +- type: flavor + id: compressed-meat + flavorType: Complex + description: flavor-complex-compressed-meat \ No newline at end of file From e818b349d4cdfda8bb115c86a1bcfd9c94731307 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 31 Aug 2024 15:20:52 -0500 Subject: [PATCH 2/4] VSCodium is being dumb I don't know why vscodium thinks I modified this whitespace when this is infact how I wrote it in the first place, but it's being dumb and I think if I reset in order to put it in the initial commit I'll have to rebase again so :P. go go gadget single byte commit --- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index e06fcf3a96f4..d26bdf25c7c0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -65,7 +65,7 @@ forceFeedDelay: 7 - type: FlavorProfile flavors: - - paper + - paper - type: BadFood - type: SolutionContainerManager solutions: From 982d1b9abd8d76f8b0297a07005dcc3ff3f28ce8 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 31 Aug 2024 16:08:40 -0500 Subject: [PATCH 3/4] but wait, there's more! --- .../Entities/Clothing/base_clothing.yml | 3 +++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 17 ++++++++++++++--- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 4 ++++ .../Entities/Objects/Materials/materials.yml | 6 ++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml index 02a2ddce4116..da9a7f8b1a90 100644 --- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml +++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml @@ -11,6 +11,9 @@ - WhitelistChameleon - type: StaticPrice price: 10 + - type: FlavorProfile #yes not every peice of clothing is edible, but this way every edible piece of clothing should have the flavor without me having to track down what specific clothing can and cannot be eaten. + flavors: + - fiber - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 5c91f5c9f29a..c0401ae96c00 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -347,6 +347,11 @@ bloodReagent: InsectBlood bloodMaxVolume: 20 - type: Food + - type: FlavorProfile + flavors: + - horrible + - terrible + - chewy - type: Hunger baseDecayRate: 0.25 - type: Extractable @@ -957,6 +962,9 @@ requiresSpecialDigestion: true # Wooly prevents eating wool deleting the goat so its fine requireDead: false + - type: FlavorProfile + flavors: + - fiber - type: Butcherable spawned: - id: FoodMeat @@ -1635,6 +1643,9 @@ Dead: Base: splat-0 - type: Food + - type: FlavorProfile + flavors: + - meaty - type: Thirst startingThirst: 25 # spawn with Okay thirst state thresholds: @@ -1743,9 +1754,6 @@ Asphyxiation: 4 Slash: 7 Blunt: 3 - - type: FlavorProfile - flavors: - - meaty - type: entity parent: MobMouse @@ -3182,6 +3190,9 @@ Dead: Base: splat-0 - type: Food + - type: FlavorProfile + flavors: + - meaty - type: Hunger baseDecayRate: 0.3 - type: Extractable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 29e81b092a7a..7adcd2816ae0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -585,6 +585,10 @@ - Hamster - VimPilot - ChefPilot + - type: FlavorProfile + flavors: + - meaty + - sadness - type: entity name: Shiva diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 31777c2a84ce..8371e21c6598 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -117,6 +117,9 @@ - type: Appearance - type: Food requiresSpecialDigestion: true + - type: FlavorProfile + flavors: + - fiber - type: SolutionContainerManager solutions: food: @@ -405,6 +408,9 @@ - type: Appearance - type: Food requiresSpecialDigestion: true + - type: FlavorProfile + flavors: + - fiber - type: SolutionContainerManager solutions: food: From 439bb79eab46d83d9ebbf606c5ec8b9c7778b82e Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 31 Aug 2024 16:11:25 -0500 Subject: [PATCH 4/4] missing newline --- Resources/Prototypes/Flavors/flavors.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index a9fd1886db26..c500229507bf 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1127,4 +1127,5 @@ - type: flavor id: compressed-meat flavorType: Complex - description: flavor-complex-compressed-meat \ No newline at end of file + description: flavor-complex-compressed-meat + \ No newline at end of file