Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Four new food crates for the ATS #33286

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Bounties/bounties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@
- Cake
- Pie
- Bread
- Pistachios

- type: cargoBounty
id: BountyVegetable
Expand Down
40 changes: 40 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,43 @@
cost: 2400
category: cargoproduct-category-name-food
group: market

- type: cargoProduct
id: FoodCookGetmore
icon:
sprite: Objects/Consumable/Food/snacks.rsi
state: raisins
product: CrateFoodGetMore
cost: 750
category: cargoproduct-category-name-food
group: market

- type: cargoProduct
id: FoodHappyHonkMeals
icon:
sprite: Objects/Consumable/Food/burger.rsi
state: bigbite
product: CrateFoodHappyHonkBigBite
cost: 1000
category: cargoproduct-category-name-food
group: market

- type: cargoProduct
id: FoodIceCream
icon:
sprite: Objects/Consumable/Food/frozen.rsi
state: sandwich
product: CrateFoodIceCream
cost: 1200
category: cargoproduct-category-name-food
group: market

- type: cargoProduct
id: FoodSnowcone
icon:
sprite: Objects/Consumable/Food/frozen.rsi
state: cone
product: CrateFoodSnowcone
cost: 1100
category: cargoproduct-category-name-food
group: market
81 changes: 81 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,84 @@
- id: DrinkFourteenLokoCan
amount: 4

- type: entity
id: CrateFoodGetMore
parent: CratePlastic
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a VERY powerful crate. Could you tune it down a small bit? I'd cut each snack to 3 each and reduce everything else by one at least.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been meaning to restructure this PR, it's been needing a rework and I've let it fall by the wayside.

First, I want to give you the two most apt comparisons. The first is a Getmore Restock, which currently restocks 3 of each of the following in any snack.yml machine, 6 if you use both boxes on the same machine:
image

Effectively this crate as it is is a focused version of that restock box (which comes in 2 per crate, which costs 600), going for the same total (minus the contraband), just in the actual baking ingredients. It is then merged with the "optimal" baking crate which is Kitchen Supplies, which comes with the following:
image

Same concept, but a cut inventory, being less "generally" good, and being hyper-focused on baking. And yes, the Kitchen Supplies crate is in fact that good, and I think it's that way because they're an absolute pain to get from cargo, especially if you want more than one, they'd rather just give you ChefVends due to their ease of delivery.

With 3 of each snack, we're getting ~300 in value from the snacks, with a cut kitchen supplies inventory, and then you're wondering why you're ever ordering this. 3 of a reagent to cook with kind of sucks. For instance, with one such crate you can make:

Pistachios: 3 Baklava (only recipe, has the advantage of being a pie for the sake of clown/bounty)
4no Rasins: 3 Raisin Cookies (only recipe, unless you count Cak, which this crate does not cover)
Chocolate: This gets even more sad:
image

In order for this crate to be worth getting, I think you need to go heavy on the candy. It's a pantry crate for when Botany is refusing to grow crops for you because they have other focuses (a common issue on servers like Salamander), allowing you to still cook foods that require effort and "uncommon" ingredients through working with cargo, and without having to raid all of the snack machines on the station.

If we're going to nerf the ingredients, the worst I'd like to see is 4 on the 3 candies, or cutting pistachios and raisins and boosting the chocolate. If this crate is to exist, it has to have a reason to be taken over Kitchen Supplies and ChefVend, otherwise it'll just be bloat in the Cargo menu that will be ignored.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trust your judgement I didn't realize how powerful the other crates where. Maybe just slightly reduce some of the candy then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm stuck in the office today, but thinking about what changes to make.

I can see cutting pistachios and raisins to 4 to still see inherent value in ordering this crate over Kitchen Supplies. If forced to cut more, it'd be to get pistachios down to 2-3, given how much relative food Baklava gives as a pie item, but I don't see what real abuse can come from having it at 4. It makes for an easy pie for clown to throw, it's another efficient way to do the pie bounty (ChefVend just does it with meat pie instead), but it doesn't break anything or shake up the meta at all beyond allowing easier no-Botany Chef play.

That said, I'm thinking about the FoodBoxCloth that's now been added to Kitchen Supplies. I think that I need to add it to this crate. Not just for moth inclusiveness and the inherent baking theme to the crate, but because I can see in 6 months time if I don't add it, a new contributor is going to see it missing from this crate and think that it's an omission and PR to get one added to it. I may as well jump ahead and add one.

name: Getmore Bakemore crate
description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines!
components:
- type: StorageFill
contents:
- id: FoodSnackRaisins
amount: 4
- id: FoodSnackChocolate
amount: 6
- id: FoodSnackPistachios
amount: 4
- id: ReagentContainerFlour
amount: 3
- id: ReagentContainerSugar
amount: 2
- id: FoodCondimentPacketSalt
amount: 3
- id: DrinkMilkCarton
amount: 2
- id: FoodContainerEgg
amount: 2
- id: FoodBoxCloth
amount: 1

- type: entity
id: CrateFoodIceCream
parent: CrateFreezer
name: ice cream delivery
description: An assortment of ice cream delights for any occasion! Includes 16 frozen treats.
components:
- type: StorageFill
contents:
- id: FoodFrozenSandwich
amount: 3
- id: FoodFrozenSandwichStrawberry
amount: 2
- id: FoodFrozenPopsicleOrange
amount: 2
- id: FoodFrozenPopsicleBerry
amount: 2
- id: FoodFrozenPopsicleJumbo
amount: 3
- id: FoodFrozenCornuto
amount: 2
- id: FoodFrozenSundae
amount: 2

- type: entity
id: CrateFoodSnowcone
parent: CrateFreezer
name: snowcone delivery
description: A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones.
components:
- type: StorageFill
contents:
- id: FoodFrozenSnowconeBase
amount: 3
- id: FoodFrozenSnowconeBerry
amount: 3
- id: FoodFrozenSnowconeFruit
amount: 3
- id: FoodFrozenSnowconeRainbow
amount: 3
- id: FoodFrozenSnowconeClown
amount: 2
- id: FoodFrozenSnowconeMime
amount: 2

- type: entity
id: CrateFoodHappyHonkBigBite
parent: CratePlastic
name: Happy Honk meal delivery
description: Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy!
components:
- type: StorageFill
contents:
- id: FoodMealHappyHonkBigBite
amount: 2
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,81 @@
prob: 0.1
orGroup: GiftPool

- type: entity
id: FoodMealHappyHonkBigBite
parent: HappyHonk
name: Happy Honk Big Bite Meal
description: Someone paid good money to get this fast food meal shipped out this way. It smells fresh, somehow.
components:
- type: StorageFill
contents:
- id: FoodBurgerBig
amount: 1
- id: FoodMealFriesCheesy
amount: 1
- id: DrinkColaBottleFull
amount: 1
- id: FoodPieAppleSlice
amount: 1
- id: ToyMouse
orGroup: GiftPool
- id: ToyAi
orGroup: GiftPool
- id: ToyNuke
orGroup: GiftPool
- id: ToyFigurinePassenger
orGroup: GiftPool
- id: ToyGriffin
orGroup: GiftPool
- id: ToyHonk
orGroup: GiftPool
- id: ToyIan
orGroup: GiftPool
- id: ToyMarauder
orGroup: GiftPool
- id: ToyMauler
orGroup: GiftPool
- id: ToyGygax
orGroup: GiftPool
- id: ToyOdysseus
orGroup: GiftPool
- id: ToyOwlman
orGroup: GiftPool
- id: ToyDeathRipley
orGroup: GiftPool
- id: ToyPhazon
orGroup: GiftPool
- id: ToyFireRipley
orGroup: GiftPool
- id: ToyReticence
orGroup: GiftPool
- id: ToyRipley
orGroup: GiftPool
- id: ToySeraph
orGroup: GiftPool
- id: ToyDurand
orGroup: GiftPool
- id: ToySkeleton
orGroup: GiftPool
- id: FoamBlade
orGroup: GiftPool
- id: ClothingHeadHatBunny
orGroup: GiftPool
- id: PersonalAI
orGroup: GiftPool
- id: ToySword
orGroup: GiftPool
- id: RevolverCapGun
orGroup: GiftPool
- id: ToyRubberDuck
orGroup: GiftPool
- id: BikeHorn
prob: 0.5
orGroup: GiftPool
- id: GoldenBikeHorn
prob: 0.1
orGroup: GiftPool

- type: entity
parent: BoxCardboard
id: FoodBoxCloth
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@
- type: Item

- type: entity
name: sweetie's pistachios
name: Sweetie's Pistachios
parent: FoodSnackBase
id: FoodSnackPistachios
description: Sweeties's name-brand pistachios. probably won't give you diseases. Probably.
description: Sweeties's name-brand pistachios. Probably won't give you diseases. Probably.
components:
- type: FlavorProfile
flavors:
Expand All @@ -196,6 +196,7 @@
- type: Tag
tags:
- Fruit # Seed of a fruit, you can yell at me
- Pistachios # Added tag due to CrateFoodGetMore interaction with BountyFruit.

- type: entity
name: popcorn
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,9 @@
- type: Tag
id: Pipe

- type: Tag
id: Pistachios

- type: Tag
id: Pizza

Expand Down
Loading