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

Crafting pr #191

Merged
merged 22 commits into from
May 27, 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
44 changes: 41 additions & 3 deletions Resources/Locale/en-US/Nuclear14/reagents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@ reagent-desc-irradiated-nuka-cola = This Nuka-Cola gives off a slight tingle.

## Animals
reagent-name-milk-brahmin = brahmin milk
reagent-desc-milk-brahmin = tasty brahmin milk
reagent-desc-milk-brahmin = Tasty brahmin milk.
reagent-name-milk-bighorner = bighorner milk
reagent-desc-milk-bighorner = fatty bighorner milk
reagent-desc-milk-bighorner = Fatty bighorner milk.
reagent-name-milk-radstag = radstag milk
reagent-desc-milk-radstag = protein rich radstag milk
reagent-desc-milk-radstag = Protein rich radstag milk.

reagent-name-fireantnectar = Fire ant nectar
reagent-desc-fireantnectar = Crystals of fire ant nectar.
reagent-name-bloatflyacid = bloatfly acid
reagent-desc-bloatflyacid = Acid from the sac of a bloatfly.
reagent-name-cazadoracid = cazador acid
reagent-desc-cazadoracid = Acid from the sac of a cazador stinger.

## Extracts
reagent-name-extract-agave-nectar = agave nectar extract
Expand Down Expand Up @@ -70,6 +77,37 @@ reagent-desc-extract-white-horsenettle = A group of nettles and berries, they do
reagent-name-extract-xander = xander extract
reagent-desc-extract-xander = An edible root, it was obviously pulled from the ground at some point. Tastes similar to a potato, very starchy, but good to eat.

## Teas
reagent-name-tea-agave = agave tea
reagent-desc-tea-agave = Sweet and tangy tea.
reagent-name-tea-blackberry = blackberry tea
reagent-desc-tea-blackberry = Sweet yet tart.
reagent-name-tea-barrelcactus = barrel cactus tea
reagent-desc-tea-barrelcactus = Weak tea.
reagent-name-tea-broc = broc tea
reagent-desc-tea-broc = Medicinal but dull.
reagent-name-tea-datura = datura tea
reagent-desc-tea-datura = Bitter drink.
reagent-name-tea-honeymesquite = honey mesquite tea
reagent-desc-tea-honeymesquite = Oddly sweet.
reagent-name-tea-mutfruit = mutfruit tea
reagent-desc-tea-mutfruit = Dull but homely.
reagent-name-tea-nettle = nettle tea
reagent-desc-tea-nettle = Medicinal and warming.
reagent-name-tea-pricklypear = prickly pear tea
reagent-desc-tea-pricklypear = fruity.
reagent-name-tea-starlightberry = starlightberry tea
reagent-desc-tea-starlightberry = Bursting with flavor.
reagent-name-tea-tarberry = tarberry tea
reagent-desc-tea-tarberry = Bursting with flavor.
reagent-name-tea-whitehorsenettle = white horsenettle tea
reagent-desc-tea-whitehorsenettle = Tingly.
reagent-name-tea-xander = xander tea
reagent-desc-tea-xander = medicinal root tea.
reagent-name-tea-fireantnectar = fire ant nectar
reagent-desc-tea-fireantnectar = Crystalised nectar from a fire ant. Sugary.


# Chems
reagent-name-firetoxin = fire toxin
reagent-desc-firetoxin = The hot stuff from firey creatures.
Expand Down
17 changes: 17 additions & 0 deletions Resources/Prototypes/Nuclear14/Catalog/Fills/gatherables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,23 @@
prob: 0.75
amount: 1
maxAmount: 1


- type: entityLootTable
id: WildNettleAll
entries:
- id: N14FloraProduceWildNettle
prob: 0.75
amount: 1
maxAmount: 3

- type: entityLootTable
id: WildNettleClippers
entries:
- id: N14FloraWildNettleClippingSeed
prob: 0.75
amount: 1
maxAmount: 1


- type: entityLootTable
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
# Buckets
# Milk

# Tea
## Other Teas
- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaFireantNectar
name: fireant nectar tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaFireantNectar
Quantity: 20

- type: entity
parent: N14DrinkTeaFireantNectar
id: N14DrinkTeaFireantNectarJar
description: A jar of liquid.
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/jar.rsi

## Plant Teas
- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaAgave
name: agave tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaAgave
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaBlackberry
name: blackberry tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaBlackberry
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaBarrelCactus
name: barrel cactus tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaBarrelCactus
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaBroc
name: brocflower tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaBroc
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaDatura
name: datura tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaDatura
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaHoneyMesquite
name: honey mesquite tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaHoneyMesquite
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaMutrfruit
name: mutfruit tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaMutfruit
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaNettle
name: nettle tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaNettle
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaPricklypear
name: prickly pear tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaPricklypear
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaStarlightberry
name: starlightberry tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaStarlightberry
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaTarberry
name: tarberry tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaTarberry
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaWhiteHorsenettle
name: white horsenettle tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaWhiteHorsenettle
Quantity: 20

- type: entity
parent: DrinkGreenTea
id: N14DrinkTeaXander
name: xander root tea
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: TeaXander
Quantity: 20
Original file line number Diff line number Diff line change
@@ -1,3 +1,69 @@
# Base 50 units
- type: entity
parent: DrinkBottleBaseFull
id: DrinkBottleBaseFull50
abstract: true
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50

# Milk
# Empty Bottle
- type: entity
parent: DrinkBottleBaseFull50
id: N14DrinkBottleMilkEmpty
name: milk bottle
description: Looks good at holding milky substances.
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi # N14TODO:SPRITE: Change this

- type: entity
parent: N14DrinkBottleMilkEmpty
id: N14DrinkMilkBrahmin
name: brahmin milk
description: The glass bottle of brahmin milk.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
reagents:
- ReagentId: N14MilkBrahmin
Quantity: 50
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi # N14TODO:SPRITE: Change this

- type: entity
parent: N14DrinkMilkBrahmin
id: N14DrinkMilkBighorner
name: bighorner milk
description: The glass bottle of bighorner milk.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
reagents:
- ReagentId: N14MilkBighorner
Quantity: 50

- type: entity
parent: N14DrinkMilkBrahmin
id: N14DrinkMilkRadstag
name: radstag milk
description: The glass bottle of radstag milk.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
reagents:
- ReagentId: N14MilkRadstag
Quantity: 50

# Soda
- type: entity
parent: DrinkBottleGlassBaseFull
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,26 @@
loot:
All: WildMutfruitAll
PlantSampleTaker: WildMutfruitClippers

- type: entity
parent: N14WastelandFlora
id: N14WastelandFloraWildNettle
name: wild nettles
description: A wild nettle plant. It looks healthy.
components:
- type: Sprite
sprite: Objects/Specific/Hydroponics/nettle.rsi
- type: OreVein
currentOre: WildNettle
- type: Gatherable
whitelist:
components:
- Hands
tags:
- PlantSampleTaker
loot:
All: WildNettleAll
PlantSampleTaker: WildNettleClippers

- type: entity
parent: N14WastelandFlora
Expand Down Expand Up @@ -1000,6 +1020,32 @@
Quantity: 10
- type: Produce
seedId: N14WildMutfruit

- type: entity
parent: N14FloraProduceFood
id: N14FloraProduceWildNettle
name: wild nettle
description: Wild nettles. Stingy.
components:
- type: Sprite
state: Objects/Specific/Hydroponics/nettle.rsi
- type: Stack
stackType: Nettles
count: 1
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: ExtractNettle
Quantity: 10
- type: Extractable
juiceSolution:
reagents:
- ReagentId: ExtractNettle
Quantity: 10
- type: Produce
seedId: N14WildNettle

- type: entity
parent: N14FloraProduceFood
Expand Down
Loading
Loading