Skip to content

Commit

Permalink
Фикс теста 4
Browse files Browse the repository at this point in the history
  • Loading branch information
Farrellka-dev committed Oct 14, 2024
1 parent 2506a56 commit 1e0c24d
Show file tree
Hide file tree
Showing 14 changed files with 139 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
flavor-complex-lpp-cargo-gargle-blaster = like you made a million and started a revolution
flavor-complex-lpp-miruvor = like arrogant
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
reagent-name-lpp-cargo-gargle-blaster = Cargo Gargle Blaster
reagent-desc-lpp-cargo-gargle-blaster = The Emperor's favorite drink.
reagent-name-lpp-miruvor = Miruvor
reagent-desc-lpp-miruvor = An exquisite drink especially for elves!
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию
flavor-complex-lpp-miruvor = как высокомерие
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass }
.suffix = Мирувор
.desc = { ent-DrinkGlass.desc }
ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass }
.suffix = Каргонский грызлодёр
.desc = { ent-DrinkGlass.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр
reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора.
reagent-name-lpp-miruvor = мирувор
reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов!
Empty file.
Empty file.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: entity
parent: DrinkGlass
id: DrinkLPPMiruvorGlass
suffix: miruvor
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: LPPMiruvor
Quantity: 30
- type: Icon
sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi
state: icon

- type: entity
parent: DrinkGlass
id: DrinkLPPCargoGargleBlasterGlass
suffix: cargo gargle blaster
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: LPPCargoGargleBlaster
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
state: icon
12 changes: 11 additions & 1 deletion Resources/Prototypes/_LostParadise/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,14 @@
- type: flavor
id: flowertea
flavorType: Complex
description: flavor-complex-flower-tea
description: flavor-complex-flower-tea

- type: flavor
id: lppcargogargleblaster
flavorType: Complex
description: flavor-complex-lpp-cargo-gargle-blaster

- type: flavor
id: lppmiruvor
flavorType: Complex
description: flavor-complex-lpp-miruvor
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
- type: reagent
id: LPPMiruvor
name: reagent-name-lpp-miruvor
parent: BaseAlcohol
desc: reagent-desc-lpp-miruvor
physicalDesc: reagent-physical-desc-lpp-exquisite
flavor: lppmiruvor
color: "#fcff54"
metamorphicSprite:
sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2

- type: reagent
id: LPPCargoGargleBlaster
name: reagent-name-lpp-cargo-gargle-blaster
parent: BaseAlcohol
desc: reagent-desc-lpp-cargo-gargle-blaster
physicalDesc: reagent-physical-desc-lpp-rich
flavor: lppcargogargleblaster
color: "#9cc8b4"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.4
33 changes: 33 additions & 0 deletions Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: reaction
id: LPPMiruvor
reactants:
Vodka:
amount: 2
Grenadine:
amount: 2
TableSalt:
amount: 1
JuiceLime:
amount: 1
JuiceOrange:
amount: 1
Mead:
amount: 1
products:
LPPMiruvor: 8

- type: reaction
id: LPPCargoGargleBlaster
reactants:
Moonshine:
amount: 2
Mead:
amount: 1
Kvass:
amount: 1
JuiceLemon:
amount: 1
Gold:
amount: 1
products:
LPPCargoGargleBlaster: 6

0 comments on commit 1e0c24d

Please sign in to comment.