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

Ports Pears & Coffee from Frontier #2232

Merged
merged 18 commits into from
Dec 31, 2024
Merged
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
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
flavor-complex-pear = like pears
flavor-base-basic = basic

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
food-sequence-content-pear = pear
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-pumpkin-spice-latte = spiced pumpkin latte
reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-coffeegrounds = coffee grounds
reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_NF/seeds/seeds.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
seeds-pear-name = pear
seeds-pear-display-name = pear tree
seeds-coffee-name = coffee
seeds-coffee-display-name = coffee plant

Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
CherrySeeds: 5
ChiliSeeds: 5
CocoaSeeds: 3
CoffeeSeeds: 5 # Frontier
CornSeeds: 5
CottonSeeds: 5
EggplantSeeds: 5
Expand All @@ -27,6 +28,7 @@
OnionSeeds: 5
OnionRedSeeds: 5
OrangeSeeds: 5
PearSeeds: 3 # Frontier
PeaSeeds: 5
PoppySeeds: 3
PotatoSeeds: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,8 @@
amount: !type:RangeNumberSelector
range: 1, 5
# End DeltaV additions
# Begin Frontier additions
- id: FoodCoffee # Frontier
amount: !type:RangeNumberSelector
range: 1, 5
# End Frontier additions
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
- type: entity
name: raw coffee beans
parent: FoodProduceBase
id: FoodCoffeeBeansRaw
description: Green coffee beans, just waiting to be roasted.
components:
- type: FlavorProfile
flavors:
- bitter
- type: Food
- type: SolutionContainerManager
solutions:
food:
maxVol: 6
reagents:
- ReagentId: Nutriment
Quantity: 1
- ReagentId: Theobromine # Caffeine
Quantity: 1
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
state: produce-beans
- type: Tag
tags:
- Fruit
- type: Construction
graph: Coffee
node: start
defaultTarget: light roasted coffee
- type: AtmosExposed # Expose the beans to atmosphere - heats and cools them
- type: Temperature # Temperature components needed to cook the beans
currentTemperature: 290
- type: InternalTemperature
thickness: 0.008 # 8mm (roughly bean sized)
area: .2 # essentially a giant sheet of beans

- type: entity
name: light roasted coffee beans
parent: FoodProduceBase
id: FoodCoffeeBeansRoastedLight
description: Cinnamon roast coffee beans. Bright and fruity.
components:
- type: FlavorProfile
flavors:
- bitter
- type: Food
- type: SolutionContainerManager
solutions:
food:
maxVol: 6
reagents:
- ReagentId: CoffeeGrounds
Quantity: 5
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
state: produce-beans-light
- type: Tag
tags:
- Fruit
- type: Construction
graph: Coffee
node: light roasted coffee
defaultTarget: medium roasted coffee
- type: AtmosExposed # Expose the beans to atmosphere - heats and cools them
- type: Temperature # Temperature components needed to cook the beans
- type: InternalTemperature
thickness: 0.008 # 8mm (roughly bean sized)
area: .2 # essentially a giant sheet of beans
conductivity: 1.5 # Arbitrarily chosen
- type: Extractable
grindableSolutionName: food

- type: entity
name: medium roasted coffee beans
parent: FoodCoffeeBeansRoastedLight
id: FoodCoffeeBeansRoastedMedium
description: City roast coffee beans. Smooth and nutty.
components:
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
state: produce-beans-medium
- type: Construction
graph: Coffee
node: medium roasted coffee
defaultTarget: dark roasted coffee

- type: entity
name: dark roasted coffee beans
parent: FoodCoffeeBeansRoastedLight
id: FoodCoffeeBeansRoastedDark
description: Viennese roast coffee beans. Smoky and spicy.
components:
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
state: produce-beans-dark
- type: Construction
graph: Coffee
node: dark roasted coffee
144 changes: 144 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
- type: entity
name: poached pears
parent: FoodBowlBase
id: FoodMealPoachedPears
description: The classiest use for a can of wine.
components:
- type: FlavorProfile
flavors:
- fruity
- alcohol
- pear
- type: Sprite
sprite: _NF/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: poachedpear
- type: SolutionContainerManager
solutions:
food:
maxVol: 25
reagents:
- ReagentId: Nutriment
Quantity: 12
- ReagentId: Vitamin
Quantity: 5
- ReagentId: Wine # DeltaV we dont have Flavorol, changed to wine
Quantity: 8
- type: Tag
tags:
- Fruit

- type: entity
name: pears belle helene
parent: FoodBowlBase
id: FoodMealPearsBelleHelene
description: The delicate flavor of the immaculate pear drenched in chocolate.
components:
- type: FlavorProfile
flavors:
- chocolate
- pear
- creamy
- type: Sprite
sprite: _NF/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: bellepear
- type: SolutionContainerManager
solutions:
food:
maxVol: 35
reagents:
- ReagentId: Nutriment
Quantity: 16 # DeltaV increase for lack of flavorol
- ReagentId: Vitamin
Quantity: 12 # DeltaV increase for lack of flavorol
- ReagentId: Theobromine
Quantity: 3
- type: Tag
tags:
- Fruit

- type: entity
name: pear muffin
parent: FoodMealBase
id: FoodBakedMuffinPear
description: I won't tell if you just try to pick out the chocolate.
components:
- type: FlavorProfile
flavors:
- chocolate
- muffin
- pear
- type: Sprite
sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
state: pearmuffin
scale: .75, .75
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 7 # DeltaV increase for lack of flavorol
- ReagentId: Vitamin
Quantity: 5 # DeltaV increase for lack of flavorol
- ReagentId: Theobromine
Quantity: 1
- type: Tag
tags:
- Fruit

- type: entity
name: pear and cheese tart
parent: FoodPieBase
id: FoodTartPearCheese
description: The most sublime pair.
components:
- type: FlavorProfile
flavors:
- sweet
- cheesy
- pear
- type: Sprite
sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi
layers:
- state: tin
- state: pearandcheese
- type: Tag
tags:
- Fruit
- Pie

- type: entity
name: coffee berries
parent: FoodProduceBase
id: FoodCoffee
description: Red berries encasing coffee beans.
components:
- type: FlavorProfile
flavors:
- bitter
- type: Food
- type: SolutionContainerManager
solutions:
food:
maxVol: 12
reagents:
- ReagentId: Nutriment
Quantity: 2
- ReagentId: Theobromine
Quantity: 1
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
- type: Produce
seedId: coffee
- type: Tag
tags:
- Fruit
- type: SpawnItemsOnUse
items:
- id: FoodCoffeeBeansRaw
sound:
path: /Audio/Effects/packetrip.ogg
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
name: pear
parent: FoodProduceBase
id: FoodPear
description: It's peary good.
components:
- type: FlavorProfile
flavors:
- pear
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/pear.rsi
- type: Produce
seedId: pear
- type: Tag
tags:
- Fruit
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
- type: entity
parent: SeedBase
name: packet of pear seeds
description: They are peary good for you.
id: PearSeeds
components:
- type: Seed
seedId: pear
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/pear.rsi

- type: entity
parent: SeedBase
name: packet of coffee seeds
description: Perfect for any self-respecting coffee roaster.
id: CoffeeSeeds
components:
- type: Seed
seedId: coffee
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi

- type: seed
id: pear
name: seeds-pear-name
noun: seeds-noun-seeds
displayName: seeds-pear-display-name
plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi
packetPrototype: PearSeeds
productPrototypes:
- FoodPear
harvestRepeat: Repeat
lifespan: 55
maturation: 6
production: 6
yield: 3
potency: 10
idealLight: 6
chemicals:
Nutriment:
Min: 1
Max: 10
PotencyDivisor: 10
Vitamin:
Min: 1
Max: 4
PotencyDivisor: 25

- type: seed
id: coffee
name: seeds-coffee-name
noun: seeds-noun-seeds
displayName: seeds-coffee-display-name
plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi
packetPrototype: CoffeeSeeds
productPrototypes:
- FoodCoffee
lifespan: 25
maturation: 9
production: 1
yield: 2
potency: 5
idealLight: 8
growthStages: 5
harvestRepeat: Repeat
waterConsumption: 0.60
chemicals:
Nutriment:
Min: 2
Max: 8
PotencyDivisor: 16
Theobromine:
Min: 1
Max: 4
PotencyDivisor: 25
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Flavors/flavors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: flavor
id: pear
flavorType: Complex
description: flavor-complex-pear

- type: flavor
id: basic
flavorType: Base
description: flavor-base-basic
Loading
Loading