juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bartender "Essentials" (#25367)

Browse Source 
* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst
This commit is contained in:
Firewatch
2024-04-01 02:41:14 -04:00
committed by GitHub
parent 5613c3d3dd
commit ea3e98e120
50 changed files with 820 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
View File

@@ -1,11 +1,11 @@
- type: reagentDispenserInventory
id: SodaDispenserInventory
inventory:
- DrinkCoconutWaterJug
- DrinkCoffeeJug
- DrinkColaBottleFull
- DrinkCreamCartonXL
- DrinkDrGibbJug
- DrinkEnergyDrinkJug
- DrinkGreenTeaJug
- DrinkIceJug
- DrinkJuiceLimeCartonXL

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View File

@@ -13,6 +13,7 @@
DrinkBeerBottleFull: 5
DrinkBlueCuracaoBottleFull: 2
DrinkCognacBottleFull: 4
DrinkCoconutWaterCarton: 3
DrinkColaBottleFull: 4
DrinkMilkCarton: 2
DrinkCreamCarton: 5
@@ -27,6 +28,7 @@
DrinkPatronBottleFull: 2
DrinkRumBottleFull: 4
DrinkSodaWaterCan: 8
DrinkSolDryCan: 8
DrinkSpaceMountainWindBottleFull: 3
DrinkSpaceUpBottleFull: 3
DrinkTequilaBottleFull: 3

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
View File

@@ -5,6 +5,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
View File

@@ -5,6 +5,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
View File

@@ -6,6 +6,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
View File

@@ -5,6 +5,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
View File

@@ -5,6 +5,7 @@
DrinkGrapeCan: 3
DrinkRootBeerCan: 3
DrinkIcedTeaCan: 3
DrinkSolDryCan: 3
DrinkLemonLimeCan: 3
DrinkFourteenLokoCan: 3
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
View File

@@ -6,6 +6,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
View File

@@ -5,6 +5,7 @@
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
emaggedInventory:

8
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
View File

@@ -19,6 +19,7 @@
- DrinkAloe
- DrinkAndalusia
- DrinkAntifreeze
- DrinkArnoldPalmer
- DrinkB52Glass
- DrinkBahamaMama
- DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
- DrinkBerryJuice
- DrinkBlackRussianGlass
- DrinkBlueCuracaoGlass
- DrinkBlueHawaiianGlass
- DrinkBloodyMaryGlass
- DrinkBooger
- DrinkBraveBullGlass
- DrinkCarrotJuice
- DrinkCoconutRum
- DrinkChocolateGlass
- DrinkCognacGlass
- DrinkCosmopolitan
- DrinkCubaLibreGlass
- DrinkDeadRumGlass
- DrinkDevilsKiss
@@ -66,15 +70,19 @@
- DrinkMilkshake
- DrinkMojito
- DrinkNTCahors
- DrinkPainkillerGlass
- DrinkPatronGlass
- DrinkPinaColadaGlass
- DrinkPoscaGlass
- DrinkRedMeadGlass
- DrinkRewriter
- DrinkRoyRogersGlass
- DrinkRootBeerFloatGlass
- DrinkRumGlass
- DrinkSakeGlass
- DrinkSbitenGlass
- DrinkScrewdriverCocktailGlass
- DrinkShirleyTempleGlass
- DrinkSuiDreamGlass
- DrinkSingulo
- DrinkSoyLatte

1
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
View File

@@ -31,6 +31,7 @@
- DrinkDrGibbCan
- DrinkEnergyDrinkCan
- DrinkShamblersJuiceCan
- DrinkSolDryCan
- DrinkPwrGameCan
- DrinkHotCoco
- DrinkHotCoffee

18
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
View File

@@ -112,6 +112,24 @@
- type: Sprite
sprite: Objects/Consumable/Drinks/tomatojuice.rsi
- type: entity
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkCoconutWaterCarton
name: coconut water
description: It's the inside of the coconut that counts.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: CoconutWater
Quantity: 50
- type: Drink
- type: Label
currentLabel: coconut water
- type: Sprite
sprite: Objects/Consumable/Drinks/coconutwater.rsi
- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
id: DrinkCreamCarton

157
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
View File

@@ -258,6 +258,22 @@
- ReagentId: Antifreeze
Quantity: 30
- type: entity
parent: DrinkGlass
id: DrinkArnoldPalmer
suffix: arnold palmer
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: ArnoldPalmer
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkAtomicBombGlass
@@ -437,6 +453,22 @@
sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkBlueHawaiianGlass
suffix: blue hawaiian
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: BlueHawaiian
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkBooger
@@ -501,6 +533,35 @@
sprite: Objects/Consumable/Drinks/chocolateglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkCoconutRum
suffix: coconut rum
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: CoconutRum
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/coconutrum.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkCoconutWaterGlass
suffix: coconut water
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: CoconutWater
Quantity: 30
- type: entity
parent: DrinkGlass
id: DrinkCoffee
@@ -533,6 +594,22 @@
sprite: Objects/Consumable/Drinks/cognacglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkCosmopolitan
suffix: cosmopolitan
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Cosmopolitan
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkCream
@@ -1340,6 +1417,22 @@
sprite: Objects/Consumable/Drinks/orangejuice.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkPainkillerGlass
suffix: painkiller
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Painkiller
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/painkiller.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkPatronGlass
@@ -1356,6 +1449,22 @@
sprite: Objects/Consumable/Drinks/patronglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkPinaColadaGlass
suffix: piña colada
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: PinaColada
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/pinacolada.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkPoisonBerryJuice
@@ -1484,6 +1593,22 @@
sprite: Objects/Consumable/Drinks/rumglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkRoyRogersGlass
suffix: roy rogers
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: RoyRogers
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/royrogers.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkSakeGlass
@@ -1609,6 +1734,22 @@
sprite: Objects/Consumable/Drinks/glass_white.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkShirleyTempleGlass
suffix: shirley temple
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: ShirleyTemple
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/shirleytemple.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkSilencerGlass
@@ -1641,6 +1782,22 @@
sprite: Objects/Consumable/Drinks/singulo.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkSolDryGlass
suffix: sol dry
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: SolDry
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkSnowWhite

17
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View File

@@ -789,6 +789,23 @@
- type: Label
currentLabel: ice
- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkCoconutWaterJug
name: coconut water jug
description: It's on the inside of the coconut that counts.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 300
reagents:
- ReagentId: CoconutWater
Quantity: 300
- type: Drink
- type: Label
currentLabel: coconut water
- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkCoffeeJug

18
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View File

@@ -239,6 +239,24 @@
- type: Item
sprite: Objects/Consumable/Drinks/space-up.rsi
- type: entity
parent: DrinkCanBaseFull
id: DrinkSolDryCan
name: sol dry
description: Sweet ginger soda from outer space!
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: SolDry
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/sol_dry.rsi
- type: Item
sprite: Objects/Consumable/Drinks/sol_dry.rsi
- type: entity
parent: DrinkCanBaseFull
id: DrinkStarkistCan

35
Resources/Prototypes/Flavors/flavors.yml
View File

@@ -624,6 +624,11 @@
flavorType: Complex
description: flavor-complex-dr-gibb
- type: flavor
id: gingersoda
flavorType: Complex
description: flavor-complex-ginger-soda
- type: flavor
id: lemonlimesoda
flavorType: Complex
@@ -694,6 +699,11 @@
flavorType: Complex
description: flavor-complex-rum
- type: flavor
id: coconutrum
flavorType: Complex
description: flavor-complex-coconut-rum
- type: flavor
id: coffeeliquor
flavorType: Complex
@@ -739,6 +749,31 @@
flavorType: Complex
description: flavor-complex-ice
- type: flavor
id: arnoldpalmer
flavorType: Complex
description: flavor-complex-arnold-palmer
- type: flavor
id: bluehawaiian
flavorType: Complex
description: flavor-complex-blue-hawaiian
- type: flavor
id: cosmopolitan
flavorType: Complex
description: flavor-complex-cosmopolitan
- type: flavor
id: painkiller
flavorType: Complex
description: flavor-complex-painkiller
- type: flavor
id: pinacolada
flavorType: Complex
description: flavor-complex-pina-colada
- type: flavor
id: longisland
flavorType: Complex

92
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
View File

@@ -79,6 +79,26 @@
reagent: Ethanol
amount: 0.1
- type: reagent
id: BlueHawaiian
name: reagent-name-blue-hawaiian
parent: BaseAlcohol
desc: reagent-desc-blue-hawaiian
physicalDesc: reagent-physical-desc-tropical
flavor: bluehawaiian
color: "#47687b"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Cognac
name: reagent-name-cognac
@@ -732,6 +752,46 @@
reagent: Ethanol
amount: 0.2
- type: reagent
id: CoconutRum
name: reagent-name-coconut-rum
parent: BaseAlcohol
desc: reagent-desc-coconut-rum
physicalDesc: reagent-physical-desc-strong-smelling
flavor: rum
color: "#cccbc8"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/coconutrum.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Cosmopolitan
name: reagent-name-cosmopolitan
parent: BaseAlcohol
desc: reagent-desc-cosmopolitan
physicalDesc: reagent-physical-desc-citric
flavor: cosmopolitan
color: "#f73030"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: CubaLibre
name: reagent-name-cuba-libre
@@ -1254,6 +1314,26 @@
types:
Poison: 1
- type: reagent
id: Painkiller
name: reagent-name-painkiller
parent: BaseAlcohol
desc: reagent-desc-painkiller
physicalDesc: reagent-physical-desc-refreshing
flavor: painkiller
color: "#e6cb47"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/painkiller.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Patron
name: reagent-name-patron
@@ -1292,6 +1372,18 @@
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
- type: reagent
id: PinaColada
name: reagent-name-pina-colada
parent: BaseAlcohol
desc: reagent-desc-pina-colada
physicalDesc: reagent-physical-desc-tropical
flavor: alcohol
color: "#e8dba4"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/pinacolada.rsi
state: icon
- type: reagent
id: Sbiten
name: reagent-name-sbiten

48
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
View File

@@ -48,6 +48,34 @@
- !type:SatiateThirst
factor: 1
- type: reagent
id: CoconutWater
name: reagent-name-coconut-water
parent: BaseDrink
desc: reagent-desc-coconut-water
physicalDesc: reagent-physical-desc-milky
flavor: nutty
color: "#f4eadb"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 4 # Coconut water is 94% water
- type: reagent
id: CreamOfCoconut
name: reagent-name-cream-of-coconut
parent: BaseDrink
desc: reagent-desc-cream-of-coconut
physicalDesc: reagent-physical-desc-syrupy
flavor: creamy
color: "#FFEABF"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- type: reagent
id: CafeLatte
name: reagent-name-cafe-latte
@@ -406,6 +434,26 @@
- !type:SatiateHunger
factor: 4
- type: reagent
id: ArnoldPalmer
name: reagent-name-arnold-palmer
parent: BaseAlcohol
desc: reagent-desc-arnold-palmer
physicalDesc: reagent-physical-desc-sweet
flavor: arnoldpalmer
color: "#d8cc5d"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 4
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- type: reagent
id: Pilk
name: reagent-name-pilk

46
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
View File

@@ -8,6 +8,23 @@
color: "#6c2828"
recognizable: true
- type: reagent
id: RoyRogers
name: reagent-name-roy-rogers
parent: BaseSoda
desc: reagent-desc-roy-rogers
physicalDesc: reagent-physical-desc-sweet
flavor: cola
color: "#262019"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/royrogers.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 4
- type: reagent
id: ChangelingSting
name: reagent-name-changeling-sting
@@ -116,6 +133,35 @@
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: SolDry
name: reagent-name-sol-dry
parent: BaseSoda
desc: reagent-desc-sol-dry
physicalDesc: reagent-physical-desc-fizzy
flavor: gingersoda
color: "#ccb87e"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
state: icon
- type: reagent
id: ShirleyTemple
name: reagent-name-shirley-temple
parent: BaseSoda
desc: reagent-desc-shirley-temple
physicalDesc: reagent-physical-desc-fizzy
flavor: sweet
color: "#af2221"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/shirleytemple.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 4
- type: reagent
id: SpaceMountainWind
name: reagent-name-space-mountain-wind

124
Resources/Prototypes/Recipes/Reactions/drinks.yml
View File

@@ -54,6 +54,16 @@
products:
Antifreeze: 4
- type: reaction
id: ArnoldPalmer
reactants:
IcedTea:
amount: 1
Lemonade:
amount: 1
products:
ArnoldPalmer: 2
- type: reaction
id: AtomicBomb
reactants:
@@ -76,6 +86,20 @@
products:
B52: 3
- type: reaction
id: BlueHawaiian
reactants:
CoconutRum:
amount: 2
JuicePineapple:
amount: 1
JuiceLemon:
amount: 1
BlueCuracao:
amount: 1
products:
BlueHawaiian: 5
- type: reaction
id: CogChamp
reactants:
@@ -90,6 +114,24 @@
sound:
path: /Audio/Magic/Cults/ClockCult/steam_whoosh.ogg
- type: reaction
id: BahamaMama
reactants:
Ice:
amount: 1
JuiceOrange:
amount: 1
JuicePineapple:
amount: 1
Rum:
amount: 1
CoconutRum:
amount: 1
Grenadine:
amount: 1
products:
BahamaMama: 6
- type: reaction
id: Barefoot
reactants:
@@ -182,6 +224,40 @@
products:
CafeLatte: 2
- type: reaction
id: CoconutRum
reactants:
Rum:
amount: 2
CoconutWater:
amount: 1
products:
CoconutRum: 3
- type: reaction
id: Cosmopolitan
reactants:
Vodka:
amount: 1
JuiceBerry:
amount: 1
JuiceLime:
amount: 1
products:
Cosmopolitan: 3
- type: reaction
id: CreamOfCoconut
reactants:
CoconutWater:
amount: 1
Sugar:
amount: 1
Milk:
amount: 1
products:
CreamOfCoconut: 3
- type: reaction
id: CubaLibre
reactants:
@@ -638,6 +714,34 @@
products:
Patron: 10
- type: reaction
id: Painkiller
reactants:
JuicePineapple:
amount: 3
CoconutRum:
amount: 1
JuiceOrange:
amount: 1
CreamOfCoconut:
amount: 1
products:
Painkiller: 6
- type: reaction
id: PinaColada
reactants:
JuicePineapple:
amount: 3
JuiceLime:
amount: 1
Rum:
amount: 1
CreamOfCoconut:
amount: 1
products:
PinaColada: 6
- type: reaction
id: Posca
reactants:
@@ -680,6 +784,16 @@
products:
RootBeerFloat: 3
- type: reaction
id: RoyRogers
reactants:
Cola:
amount: 2
Grenadine:
amount: 1
products:
RoyRogers: 3
- type: reaction
id: Sbiten
reactants:
@@ -700,6 +814,16 @@
products:
ScrewdriverCocktail: 3
- type: reaction
id: ShirleyTemple
reactants:
SolDry:
amount: 2
Grenadine:
amount: 1
products:
ShirleyTemple: 3
- type: reaction
id: Silencer
reactants: