Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge sugar and glucose, touch up how some drinks metabolize. (#7398)

Browse Source
This commit is contained in:
Rane
2022-05-22 04:25:38 -04:00
committed by GitHub
parent ab2ef53412
commit a05abd106c
15 changed files with 392 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#33EE00"
spritePath: absintheglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.3
- type: reagent
id: Ale
@@ -38,6 +46,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#0000CD"
spritePath: curacaoglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.1
- type: reagent
id: Cognac
@@ -47,6 +63,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#AB3C05"
spritePath: cognacglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: DeadRum
@@ -56,6 +80,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: rumglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Ethanol
@@ -70,6 +102,9 @@
Poison:
effects:
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 5
damage:
groups:
Caustic: 1
@@ -82,6 +117,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: ginvodkaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Kahlua
@@ -123,6 +166,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
Poison:
effects:
- !type:HealthChange
@@ -138,6 +184,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: rumglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Sake
@@ -154,6 +208,14 @@
desc: reagent-desc-tequila
physicalDesc: reagent-physical-desc-strong-smelling
color: "#d7d1d155"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Vermouth
@@ -172,6 +234,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#d1d1d155"
spritePath: ginvodkaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Whiskey
@@ -181,6 +251,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: whiskeyglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Wine
@@ -246,6 +324,14 @@
physicalDesc: reagent-physical-desc-translucent
color: "#ff7d63"
spritePath: antifreeze.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: AtomicBomb
@@ -255,6 +341,17 @@
physicalDesc: reagent-physical-desc-cloudy
color: "#666300"
spritePath: atomicbombglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- !type:AdjustReagent
reagent: Radium
amount: 0.05
- type: reagent
id: B52
@@ -264,6 +361,14 @@
physicalDesc: reagent-physical-desc-bubbly
color: "#664300"
spritePath: b52glass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: BahamaMama
@@ -300,6 +405,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: beepskysmashglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: Bilk
@@ -318,6 +431,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#360000"
spritePath: blackrussianglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: BloodyMary
@@ -345,6 +466,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: bravebullglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: CubaLibre
@@ -354,6 +483,14 @@
physicalDesc: reagent-physical-desc-bubbly
color: "#3E1B00"
spritePath: cubalibreglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: DemonsBlood
@@ -388,6 +525,9 @@
factor: 2
- !type:SatiateHunger
factor: -2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
Medicine:
effects:
- !type:HealthChange
@@ -406,6 +546,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#2E6671"
spritePath: driestmartiniglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: ErikaSuprise
@@ -424,6 +572,14 @@
physicalDesc: reagent-physical-desc-volatile
color: "#9cc8b4"
spritePath: gargleblasterglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: GinFizz
@@ -433,6 +589,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: ginfizzglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: GinTonic
@@ -442,6 +606,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#004166"
spritePath: gintonicglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: Goldschlager
@@ -451,6 +623,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#FFFF91"
spritePath: goldschlagerglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: Grog
@@ -496,6 +676,14 @@
physicalDesc: reagent-physical-desc-bubbly
color: "#2E6671"
spritePath: irishcarbomb.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: IrishCream
@@ -505,6 +693,14 @@
physicalDesc: reagent-physical-desc-creamy
color: "#664300"
spritePath: irishcreamglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: IrishCoffee
@@ -514,15 +710,14 @@
physicalDesc: reagent-physical-desc-cloudy
color: "#664300"
spritePath: irishcoffeeglass.rsi
- type: reagent
id: KiraSpecial
name: reagent-name-kira-special
parent: BaseAlcohol
desc: reagent-desc-kira-special
physicalDesc: reagent-physical-desc-strong-smelling
color: "#CCCC99"
spritePath: kiraspecial.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: LongIslandIcedTea
@@ -532,6 +727,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: longislandicedteaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: Manhattan
@@ -577,6 +780,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#664300"
spritePath: martiniglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: Mead
@@ -603,6 +814,14 @@
desc: reagent-desc-moonshine
physicalDesc: reagent-physical-desc-strong-smelling
color: "#d1d7d155"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
- type: reagent
id: Neurotoxin
@@ -616,6 +835,10 @@
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
Poison:
effects:
- !type:HealthChange
@@ -631,6 +854,14 @@
physicalDesc: reagent-physical-desc-metallic
color: "#585840"
spritePath: patronglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2
- type: reagent
id: RedMead
@@ -641,15 +872,6 @@
color: "#C73C00"
spritePath: red_meadglass.rsi
- type: reagent
id: Rewriter
name: reagent-name-rewriter
parent: BaseAlcohol
desc: reagent-desc-rewriter
physicalDesc: reagent-physical-desc-strong-smelling
color: "#485000"
spritePath: rewriter.rsi
- type: reagent
id: Sbiten
name: reagent-name-sbiten
@@ -667,6 +889,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#A68310"
spritePath: screwdriverglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: Silencer
@@ -721,6 +951,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#FFE48C"
spritePath: tequillasunriseglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: ThreeMileIsland
@@ -730,6 +968,17 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#666340"
spritePath: threemileislandglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- !type:AdjustReagent
reagent: Uranium
amount: 0.05
- type: reagent
id: ToxinsSpecial
@@ -748,6 +997,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#004666"
spritePath: martiniglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: VodkaTonic
@@ -757,6 +1014,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#0064C8"
spritePath: vodkatonicglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: WhiskeyCola
@@ -766,6 +1031,14 @@
physicalDesc: reagent-physical-desc-bubbly
color: "#3E1B00"
spritePath: whiskeycolaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: WhiskeySoda
@@ -775,6 +1048,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#533600"
spritePath: whiskeysodaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
- type: reagent
id: WhiteRussian
@@ -784,3 +1065,11 @@
physicalDesc: reagent-physical-desc-strong-smelling
color: "#A68340"
spritePath: whiterussianglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15

3
Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
View File

@@ -45,6 +45,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
reactiveEffects:
Flammable:
methods: [ Touch ]

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

@@ -5,6 +5,14 @@
desc: reagent-desc-coffee
physicalDesc: reagent-physical-desc-aromatic
color: "#664300"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- type: reagent
id: Cream
@@ -72,6 +80,14 @@
physicalDesc: reagent-physical-desc-aromatic
color: "#104038"
spritePath: icedteaglass.rsi
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- type: reagent
id: Lemonade
@@ -201,6 +217,14 @@
desc: reagent-desc-tea
physicalDesc: reagent-physical-desc-aromatic
color: "#8a5a3a"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- type: reagent
id: TonicWater
@@ -275,3 +299,21 @@
effects:
- !type:SatiateThirst
factor: 1
- type: reagent
id: KiraSpecial
name: kira special
parent: BaseDrink
desc: Long live the guy who everyone had mistaken for a girl. Baka!
physicalDesc: strong-smelling
color: "#CCCC99"
spritePath: kiraspecial.rsi
- type: reagent
id: Rewriter
name: rewriter
parent: BaseDrink
desc: The secret of the sanctuary of the Librarian...
physicalDesc: strong-smelling
color: "#485000"
spritePath: rewriter.rsi

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

@@ -29,6 +29,14 @@
desc: reagent-desc-energy-drink
physicalDesc: reagent-physical-desc-fizzy
color: "#ffffbf"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- type: reagent
id: GrapeSoda
@@ -118,6 +126,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.1
Poison:
effects:
- !type:HealthChange

17
Resources/Prototypes/Reagents/Consumable/Food/food.yml
View File

@@ -15,23 +15,6 @@
- !type:PlantAdjustHealth
amount: 0.5
- type: reagent
id: Glucose
name: reagent-name-glucose
desc: reagent-desc-glucose
physicalDesc: reagent-physical-desc-syrupy
color: "#ffffff"
boilingPoint: 340282300000000000000000000000000000000 #Fun fact: Glucose can't boil. So let's just set it to the maximum float value.
meltingPoint: 146.0
plantMetabolism:
- !type:PlantAdjustNutrition
amount: 0.1
- !type:PlantAdjustWeeds
amount: 2
- !type:PlantAdjustPests
amount: 2
- type: reagent
id: Vitamin
name: reagent-name-vitamin

9
Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
View File

@@ -57,11 +57,20 @@
desc: reagent-desc-sugar
physicalDesc: reagent-physical-desc-sweet
color: white
meltingPoint: 146.0
metabolisms:
Food:
effects:
- !type:SatiateHunger
factor: 1
plantMetabolism:
- !type:PlantAdjustNutrition
amount: 0.1
- !type:PlantAdjustWeeds
amount: 2
- !type:PlantAdjustPests
amount: 2
- type: reagent
id: Blackpepper