From e621f1f9ca34911c157386dba72d676e66d2f340 Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 21:42:15 -0500 Subject: [PATCH 01/10] dank-pocket --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index c7e46d9a94a040..0fb71101a4e8c5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -77,7 +77,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 3 + - ReagentId: THC + Quantity: 1 - type: Sprite state: dank @@ -96,9 +98,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine - Quantity: 4 + Quantity: 2 + - ReagentId: THC + Quantity: 5 - type: entity name: spicy-pocket From bebc9b970e2fe2e9755a59cb0c746437637a4c2f Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 21:58:40 -0500 Subject: [PATCH 02/10] spicy-pocket --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 0fb71101a4e8c5..86f976105c37b0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -112,9 +112,16 @@ components: - type: FlavorProfile flavors: - - spicy - meaty - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: CapsaicinOil + Quantity: 1 - type: Sprite state: plain @@ -134,9 +141,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine Quantity: 2 + - ReagentId: CapsaicinOil + Quantity: 4 - type: Sprite state: spicy From cd9c7d76b1fb48b738923de3357879921636d090 Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 23:07:39 -0500 Subject: [PATCH 03/10] Teriyaki sauce reagent --- .../meta/consumable/food/condiments.ftl | 3 +++ .../Consumable/Food/Containers/condiments.yml | 19 +++++++++++++++++++ .../Reagents/Consumable/Food/condiments.yml | 19 ++++++++++++++++++- .../Prototypes/Recipes/Reactions/food.yml | 12 ++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl index 809fbafffd9c20..277f747214c710 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -37,6 +37,9 @@ reagent-desc-vinaigrette = A basic salad dressing made with oil, vinegar and sea reagent-name-soysauce = soy sauce reagent-desc-soysauce = A salty soy-based flavoring. +reagent-name-teriyaki = teriyaki sauce +reagent-desc-teriyaki = A sweet and savory sauce often paired with meat. + reagent-name-table-salt = table salt reagent-desc-table-salt = Commonly known as salt, Sodium Chloride is often used to season food or kill borers instantly. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index bbe5cf244b2abf..581cca99ada144 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -303,6 +303,25 @@ maxFillLevels: 2 fillBaseName: packet-solid- +- type: entity + parent: BaseFoodCondimentPacket + id: FoodCondimentPacketTeriyaki + name: teriyaki sauce + description: A sweet and savory marinade. + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: TeriyakiSauce + Quantity: 10 + - type: Icon + state: packet-soysauce # TODO Make a new sprite? + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 2 + fillBaseName: packet-solid- + - type: entity parent: BaseFoodCondimentPacket id: FoodCondimentPacketSugar diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index 19b31b6d250cf0..d449839e4d19a2 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -134,13 +134,30 @@ - !type:SatiateThirst factor: -0.5 # high salt content +- type: reagent + id: TeriyakiSauce + name: reagent-name-teriyaki + group: Foods + desc: reagent-desc-teriyaki + physicalDesc: reagent-physical-desc-salty + flavor: savory + color: saddlebrown + recognizable: true + metabolisms: + Food: + effects: + - !type:SatiateHunger + factor: 0.5 + - !type:SatiateThirst + factor: -0.5 # high salt content + - type: reagent id: TableSalt name: reagent-name-table-salt group: Foods desc: reagent-desc-table-salt physicalDesc: reagent-physical-desc-grainy - flavor: salty + flavor: savory color: "#cfd1d0" recognizable: true boilingPoint: 1465.0 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7d524a9c7ae00f..17dbb73a28fc40 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -304,6 +304,18 @@ products: Soysauce: 3 +- type: reaction + id: CookingTeriyakiSauce + reactants: + Soysauce: + amount: 2 + Sugar: + amount: 1 + Sake: + amount: 1 + products: + TeriyakiSauce: 4 + - type: reaction id: CookingVinaigrette reactants: From b5d1bf8b4d18770e438a0998b8e97c3860a12ca1 Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 23:08:11 -0500 Subject: [PATCH 04/10] teriyaki-pocket --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 86f976105c37b0..435ab0b5807cb8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -160,6 +160,14 @@ - meaty - sweet - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: TeriyakiSauce + Quantity: 1 - type: Sprite state: teriyaki @@ -179,9 +187,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine Quantity: 2 + - ReagentId: TeriyakiSauce + Quantity: 4 - type: entity name: pizza-pocket From 5fbbaa7339788bfd321b5981c779b10305ab9e63 Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 23:30:59 -0500 Subject: [PATCH 05/10] honk-pocket --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 435ab0b5807cb8..c1b5737685ac19 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -145,7 +145,7 @@ - ReagentId: Omnizine Quantity: 2 - ReagentId: CapsaicinOil - Quantity: 4 + Quantity: 5 - type: Sprite state: spicy @@ -191,7 +191,7 @@ - ReagentId: Omnizine Quantity: 2 - ReagentId: TeriyakiSauce - Quantity: 4 + Quantity: 5 - type: entity name: pizza-pocket @@ -250,9 +250,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 3 - ReagentId: Omnizine Quantity: 2 + - ReagentId: JuiceBanana + Quantity: 1 - type: Sprite state: banana @@ -271,9 +273,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine Quantity: 2 + - ReagentId: JuiceBanana + Quantity: 5 - type: entity name: berry-pocket From b7307a4cef134075072d76d192139c8987827f6f Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 23:35:11 -0500 Subject: [PATCH 06/10] berry-pocket --- .../Entities/Objects/Consumable/Food/Baked/donkpocket.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index c1b5737685ac19..01d97fae2e1965 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -287,14 +287,15 @@ components: - type: FlavorProfile flavors: - - sweet - cheap - type: SolutionContainerManager solutions: food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 + - ReagentId: Sugar + Quantity: 1 - type: Sprite state: berry @@ -306,7 +307,6 @@ components: - type: FlavorProfile flavors: - - sweet - cheap - type: SolutionContainerManager solutions: @@ -317,7 +317,7 @@ - ReagentId: Omnizine Quantity: 2 - ReagentId: Sugar - Quantity: 2 + Quantity: 3 - type: entity name: stonk-pocket From 017bea322778bf72fc0ee65fc65824a9c211832d Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 3 Sep 2024 23:47:26 -0500 Subject: [PATCH 07/10] carp-pocket --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 01d97fae2e1965..4a18112f679553 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -356,6 +356,8 @@ - ReagentId: Omnizine Quantity: 2 +# random stonk pockets + - type: entity name: carp-pocket parent: FoodDonkpocketBase @@ -371,7 +373,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 + - ReagentId: Carpotoxin + Quantity: 0.5 - type: Sprite state: carp @@ -391,7 +395,9 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Omnizine - Quantity: 2 + Quantity: 3 + - ReagentId: Carpotoxin + Quantity: 0.5 - type: entity name: dink-pocket From 522a80cd41741f1a99b676ab66059f41119fd23a Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 4 Sep 2024 00:05:56 -0500 Subject: [PATCH 08/10] quantity balancing --- .../Objects/Consumable/Food/Baked/donkpocket.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 4a18112f679553..fc1f91477e93ea 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -231,7 +231,7 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 13 - ReagentId: Omnizine Quantity: 2 @@ -252,7 +252,7 @@ - ReagentId: Nutriment Quantity: 3 - ReagentId: Omnizine - Quantity: 2 + Quantity: 1 - ReagentId: JuiceBanana Quantity: 1 - type: Sprite @@ -275,9 +275,9 @@ - ReagentId: Nutriment Quantity: 8 - ReagentId: Omnizine - Quantity: 2 + Quantity: 4 - ReagentId: JuiceBanana - Quantity: 5 + Quantity: 3 - type: entity name: berry-pocket @@ -374,7 +374,7 @@ reagents: - ReagentId: Nutriment Quantity: 4 - - ReagentId: Carpotoxin + - ReagentId: CarpoToxin Quantity: 0.5 - type: Sprite state: carp @@ -395,9 +395,9 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Omnizine - Quantity: 3 - - ReagentId: Carpotoxin - Quantity: 0.5 + Quantity: 4 + - ReagentId: CarpoToxin + Quantity: 1 - type: entity name: dink-pocket From a794fdef0270db37dc03bf57371742b0eebd3c61 Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 4 Sep 2024 02:06:47 -0500 Subject: [PATCH 09/10] stonk-pocket random contents --- .../Consumable/Food/Baked/donkpocket.yml | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index fc1f91477e93ea..0e46124b1c8b00 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -210,7 +210,7 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - type: Sprite state: pizza @@ -313,7 +313,7 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 9 - ReagentId: Omnizine Quantity: 2 - ReagentId: Sugar @@ -329,12 +329,6 @@ flavors: - profits - cheap - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 5 - type: Sprite state: stonk @@ -350,13 +344,35 @@ - type: SolutionContainerManager solutions: food: + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 3 - ReagentId: Omnizine - Quantity: 2 + Quantity: 1 + - type: RandomFillSolution + solution: food + weightedRandomId: RandomFillStonk -# random stonk pockets +- type: weightedRandomFillSolution + id: RandomFillStonk + fills: + - quantity: 5 # Average result + weight: 5 + reagents: + - Nutriment + - quantity: 10 # Quality result + weight: 3 + reagents: + - Nutriment + - quantity: 1 # Losing result + weight: 3 + reagents: + - Omnizine + - quantity: 9 # Jackpot + weight: 1 + reagents: + - Omnizine - type: entity name: carp-pocket From c076d6eec21b3cc579e9d4adfef622cbaee944bb Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 4 Sep 2024 02:21:12 -0500 Subject: [PATCH 10/10] Teriyaki in condiment vendor --- .../Catalog/VendingMachines/Inventories/condiments.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index 70924a1e6e7627..2d7fa436326cc1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -11,10 +11,11 @@ FoodCondimentPacketPepper: 5 FoodCondimentPacketSalt: 5 FoodCondimentPacketSoy: 5 + FoodCondimentPacketTeriyaki: 5 FoodCondimentPacketSugar: 5 FoodCondimentPacketCornoil: 5 ForkPlastic: 10 SpoonPlastic: 10 KnifePlastic: 10 FoodPlatePlastic: 10 - FoodPlateSmallPlastic: 10 \ No newline at end of file + FoodPlateSmallPlastic: 10