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

Axel and Luna #180

Merged
merged 5 commits into from
Sep 17, 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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@ flavor-complex-thewaterslide = like unsanitary depravity
flavor-complex-whiskeysour = sour and like molasses
flavor-complex-whitechocolatechip = like white chocolate chips
flavor-complex-yeolhandy = like oranges and solitude
flavor-complex-thecutecaptain = like moonlight
flavor-complex-axelsale = like a long day on the frontier
flavor-complex-jenntonic = sweet with a hidden bite
flavor-complex-hallelujah = a moment of peace
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,15 @@ reagent-desc-whiskeysour = Shelter from the Noöspheric Storm.

reagent-name-yeolhandy = ye ol handy
reagent-desc-yeolhandy = The loner's choice, cold as their bed.

reagent-name-the-cute-captain = The Cute Captain
reagent-desc-the-cute-captain = Light blue liquid with a sweet floral scent and a hint of pomegranate

reagent-name-axels-ale = Axel's Ale
reagent-desc-axels-ale = Red like the color of a setting sun on a beach

reagent-name-jenn-tonic = Jenn in Tonic
reagent-desc-jenn-tonic = Light golden and bubbly, what could go wrong?

reagent-name-hallelujah = Hallelujah
reagent-desc-hallelujah = Exactly what you need.
20 changes: 20 additions & 0 deletions Resources/Prototypes/Floof/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,23 @@
id: yeolhandy
flavorType: Complex
description: flavor-complex-yeolhandy

- type: flavor
id: thecutecaptain
flavorType: Complex
description: flavor-complex-thecutecaptain

- type: flavor
id: axelsale
flavorType: Complex
description: flavor-complex-axelsale

- type: flavor
id: jenntonic
flavorType: Complex
description: flavor-complex-jenntonic

- type: flavor
id: hallelujah
flavorType: Complex
description: flavor-complex-hallelujah
Original file line number Diff line number Diff line change
Expand Up @@ -1395,3 +1395,99 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05

- type: reagent
id: TheCuteCaptain
name: reagent-name-the-cute-captain
parent: BaseAlcohol
desc: reagent-desc-the-cute-captain
physicalDesc: reagent-physical-desc-starry
flavor: thecutecaptain
color: "#87cefa"
metamorphicSprite:
sprite: Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 3
- !type:AdjustReagent
reagent: Pomelustine
amount: 0.5

- type: reagent
id: AxelsAle
name: reagent-name-axels-ale
parent: BaseAlcohol
desc: reagent-desc-axels-ale
physicalDesc: reagent-physical-desc-strong-smelling
flavor: axelsale
color: "#E43414"
metamorphicSprite:
sprite: Floof/Objects/Consumable/Drinks/deadmansdraught.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Pomelustine
amount: 0.5
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1

- type: reagent
id: JennTonic
name: reagent-name-jenn-tonic
parent: BaseAlcohol
desc: reagent-desc-jenn-tonic
physicalDesc: reagent-physical-desc-fizzy
flavor: jenntonic
color: "#C1C071"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.08

- type: reagent
id: Hallelujah
name: reagent-name-hallelujah
parent: BaseAlcohol
desc: reagent-desc-hallelujah
physicalDesc: reagent-physical-desc-soothing
flavor: hallelujah
color: "#87757E"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/wineglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 5
- !type:AdjustReagent
reagent: Ethanol
amount: 0.06

47 changes: 47 additions & 0 deletions Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -773,3 +773,50 @@
catalyst: true
products:
Sake: 1

- type: reaction
id: TheCuteCaptain
reactants:
Tea:
amount: 2
Pomelustine:
amount: 1
products:
TheCuteCaptain: 3

- type: reaction
id: AxelsAle
reactants:
Ale:
amount: 1
Rum:
amount: 1
Pomelustine:
amount: 1
products:
AxelsAle: 3

- type: reaction
id: JennTonic
reactants:
Ice:
amount: 1
Whiskey:
amount: 1
TonicWater:
amount: 1
products:
JennTonic: 3

- type: reaction
id: Hallelujah
reactants:
Wine:
amount: 2
Water:
amount: 3
LotophagoiOil:
amount: 1
products:
Hallelujah : 6

Loading