More beer, wine and ale (#686)

* more beer

* ru

* comoss fix update, loc change to eng

* Update dwarf.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
This commit is contained in:
Nim
2024-12-18 16:37:06 +02:00
committed by GitHub
parent a248c176ae
commit 868699a219
13 changed files with 1128 additions and 458 deletions

View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Localizations
[Dependency] private readonly ILocalizationManager _loc = default!;
// If you want to change your codebase's language, do it here.
public const string Culture = "ru-RU"; // CrystallEdge-Localization. "ru-RU" or "en-US"
public const string Culture = "en-US"; // CrystallEdge-Localization. "ru-RU" or "en-US"
/// <summary>
/// Custom format strings used for parsing and displaying minutes:seconds timespans.
@@ -28,9 +28,9 @@ namespace Content.Shared.Localizations
var culture = new CultureInfo(Culture);
_loc.LoadCulture(culture);
// Uncomment for Ru localization
var fallbackCulture = new CultureInfo("en-US");
_loc.LoadCulture(fallbackCulture);
_loc.SetFallbackCluture(fallbackCulture);
//var fallbackCulture = new CultureInfo("en-US");
//_loc.LoadCulture(fallbackCulture);
//_loc.SetFallbackCluture(fallbackCulture);
//
_loc.AddFunction(culture, "PRESSURE", FormatPressure);

View File

@@ -11,4 +11,16 @@ cp14-flavor-base-magic = magical
cp14-flavor-complex-water = like water
cp14-flavor-complex-vomit = like something gut-wrenching
cp14-flavor-complex-quartz = squeaks in your teeth
cp14-flavor-complex-quartz = squeaks in your teeth
cp14-flavor-complex-beer = like hops
cp14-flavor-complex-dwarfbeer = like ore
cp14-flavor-complex-gerbil = like tart and bitter
cp14-flavor-complex-breeze = like sweet and sour
cp14-flavor-complex-blowlaw = like lawfully
cp14-flavor-complex-wine = like grape rinds
cp14-flavor-complex-zellasian-pleasure = like aristocratic and vinous
cp14-flavor-complex-leeks = like fruity and mystical
cp14-flavor-complex-durandate = like cheap and tart
cp14-flavor-complex-ale = like bread
cp14-flavor-complex-bloodytear = like sad and alcoholic
cp14-flavor-complex-bottomless = like semi-divine and dangerous

View File

@@ -0,0 +1,18 @@
cp14-reagent-name-beer = beer
cp14-reagent-desc-beer = An alcoholic beverage made from malted grains, hops, yeast, and water.
cp14-reagent-name-wine = wine
cp14-reagent-desc-wine = An premium alchoholic beverage made from distilled grape juice.
cp14-reagent-name-ale = ale
cp14-reagent-desc-ale = A dark alchoholic beverage made by malted barley and yeast.
cp14-reagent-name-dwarfbeer = Beer Joy of the Deep
cp14-reagent-name-gerbil = Beer Gerbil
cp14-reagent-name-breeze = Beer Breeze
cp14-reagent-name-blowlaw = Beer Blow Law
cp14-reagent-name-bloodytear = Ale Bloody Tear
cp14-reagent-name-bottomless = Ale Bottomless
cp14-reagent-name-zellasian-pleasure = Wine Zellasian Pleasure
cp14-reagent-name-leeks = Wine Leeks
cp14-reagent-name-durandate = Wine Durandate

View File

@@ -11,4 +11,16 @@ cp14-flavor-base-magic = волшебно
cp14-flavor-complex-water = как вода
cp14-flavor-complex-vomit = как что-то выворачивающее наизнанку
cp14-flavor-complex-quartz = скрипит на зубах
cp14-flavor-complex-quartz = скрипит на зубах
cp14-flavor-complex-beer = как хмель
cp14-flavor-complex-dwarfbeer = как руда
cp14-flavor-complex-gerbil = терпкое и горькое
cp14-flavor-complex-breeze = сладкое с кислинкой
cp14-flavor-complex-blowlaw = законопослушно
cp14-flavor-complex-wine = как виноградная кожура
cp14-flavor-complex-zellasian-pleasure = аристократично и виноградно
cp14-flavor-complex-leeks = фруктово и мистически
cp14-flavor-complex-durandate = дешёвое и терпкое
cp14-flavor-complex-ale = как хлеб
cp14-flavor-complex-bloodytear = печально и алкогольно
cp14-flavor-complex-bottomless = полубожественно и опасно

View File

@@ -0,0 +1,18 @@
cp14-reagent-name-beer = пиво
cp14-reagent-desc-beer = Алкогольный напиток, приготовленный из солода, хмеля, дрожжей и воды.
cp14-reagent-name-wine = вино
cp14-reagent-desc-wine = Алкогольный напиток премиум-класса, изготовленный из дистиллированного виноградного сока.
cp14-reagent-name-ale = эль
cp14-reagent-desc-ale = Темный алкогольный напиток, приготовленный из ячменного солода и дрожжей.
cp14-reagent-name-dwarfbeer = Пиво Радость глубин
cp14-reagent-name-gerbil = Пиво Песчянка
cp14-reagent-name-breeze = Пиво Ветерок
cp14-reagent-name-blowlaw = Пиво Удар закона
cp14-reagent-name-bloodytear = Эль Кровавая слеза
cp14-reagent-name-bottomless = Эль Бездоннка
cp14-reagent-name-zellasian-pleasure = Вино Услада Зелласиан
cp14-reagent-name-leeks = Вино Ликс
cp14-reagent-name-durandate = Вино Дюрандат

View File

@@ -2961,6 +2961,9 @@ entities:
- type: Transform
pos: -47.5,-72.5
parent: 2
- type: ItemPlacer
placedEntities:
- 15363
- proto: CP14BankStorageMarker
entities:
- uid: 1269
@@ -42805,6 +42808,12 @@ entities:
rot: 1.5707963267948966 rad
pos: 108.5,59.5
parent: 2
- type: ItemPlacer
placedEntities:
- 10144
- 10140
- 10150
- 10135
- proto: CP14BrassChest
entities:
- uid: 687
@@ -43668,6 +43677,33 @@ entities:
- type: Transform
pos: -16.707724,-16.458473
parent: 2
- proto: CP14CraneBarrelSmallAleBloodyTear
entities:
- uid: 2291
components:
- type: Transform
pos: -3.5,-11.5
parent: 2
- type: Physics
bodyType: Static
- proto: CP14CraneBarrelSmallBeerBlowLaw
entities:
- uid: 2029
components:
- type: Transform
pos: -5.5,-11.5
parent: 2
- type: Physics
bodyType: Static
- proto: CP14CraneBarrelSmallBeerBreeze
entities:
- uid: 2057
components:
- type: Transform
pos: -4.5,-11.5
parent: 2
- type: Physics
bodyType: Static
- proto: CP14CrateCoffin
entities:
- uid: 1349
@@ -44654,7 +44690,7 @@ entities:
- type: Transform
pos: -4.638483,-32.429073
parent: 2
- proto: CP14DemiplanKey
- proto: CP14DemiplaneKeyT1
entities:
- uid: 5537
components:
@@ -85184,7 +85220,7 @@ entities:
rot: -1.5707963267948966 rad
pos: -3.5,17.5
parent: 2
- proto: CP14SpawnerExpeditionLootCommon
- proto: CP14SpawnerDemiplaneLootT1
entities:
- uid: 983
components:
@@ -86387,17 +86423,16 @@ entities:
rot: 1.5707963267948966 rad
pos: -5.5,-13.5
parent: 2
- uid: 2029
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,-12.5
parent: 2
- uid: 2041
components:
- type: Transform
pos: -7.5,2.5
parent: 2
- uid: 2056
components:
- type: Transform
pos: -5.5,-11.5
parent: 2
- uid: 2066
components:
- type: Transform
@@ -87506,13 +87541,6 @@ entities:
parent: 2
- type: Fixtures
fixtures: {}
- uid: 5534
components:
- type: Transform
pos: -5.5,-11.5
parent: 2
- type: Fixtures
fixtures: {}
- proto: CP14WallmountCrystalAmethysts
entities:
- uid: 1782
@@ -106485,12 +106513,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -7.5,-11.5
parent: 2
- uid: 2291
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,-11.5
parent: 2
- uid: 4108
components:
- type: Transform

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,40 @@
- type: entity
id: CP14OrganDwarfHeart
parent: OrganHumanHeart
name: dwarf heart
categories: [ ForkFiltered ]
components:
- type: Metabolizer
metabolizerTypes: [CP14Dwarf]
- type: entity
id: CP14DwarfOrganDwarfLiver
parent: OrganHumanLiver
name: dwarf liver
categories: [ ForkFiltered ]
components:
- type: Metabolizer
metabolizerTypes: [CP14Dwarf]
- type: entity
id: CP14DwarfOrganDwarfStomach
parent: OrganHumanStomach
name: dwarf stomach
categories: [ ForkFiltered ]
components:
- type: Sprite
state: stomach
- type: Organ
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 75
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Stomach
- type: Metabolizer
maxReagents: 5
metabolizerTypes: [CP14Dwarf]

View File

@@ -18,10 +18,10 @@
- right_leg
- left_leg
organs:
heart: OrganHumanHeart
heart: CP14OrganDwarfHeart
lungs: OrganHumanLungs
stomach: OrganHumanStomach
liver: OrganHumanLiver
stomach: CP14DwarfOrganDwarfStomach
liver: CP14DwarfOrganDwarfLiver
kidneys: OrganHumanKidneys
right_arm:
part: CP14RightArmHuman

View File

@@ -0,0 +1,3 @@
- type: metabolizerType
id: CP14Dwarf
name: metabolizer-type-dwarf

View File

@@ -57,16 +57,138 @@
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelBeer
suffix: Beer
id: CP14CraneBarrelDwarfBeer
suffix: Beer. Dwarf
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: Beer
- ReagentId: CP14DwarfBeer
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-dwarfbeer
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelBeerGerbil
suffix: Beer. Gerbil
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerGerbil
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-gerbil
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelBeerBreeze
suffix: Beer. Breeze
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerBreeze
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-breeze
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelBeerBlowLaw
suffix: Beer. BlowLaw
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerBlowLaw
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-blowlaw
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelAleBloodyTear
suffix: Ale. BloodyTear
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14AleBloodyTear
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-bloodytear
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelAleBottomless
suffix: Ale. Bottomless
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14AleBottomless
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-bottomless
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelWineZellasianPleasure
suffix: Wine. ZellasianPleasure
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14WineZellasianPleasure
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-zellasian-pleasure
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelWineLeeks
suffix: Wine. Leeks
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14WineLeeks
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-leeks
- type: entity
parent: CP14CraneBarrel
id: CP14CraneBarrelWineDurandate
suffix: Wine. Durandate
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14WineDurandate
Quantity: 500
- type: Label
currentLabel: cp14-reagent-name-durandate
- type: entity
id: CP14CraneBarrelSmall
@@ -141,13 +263,78 @@
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallBeer
suffix: Beer
id: CP14CraneBarrelSmallDwarfBeer
suffix: Beer. Dwarf
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: Beer
- ReagentId: CP14DwarfBeer
Quantity: 50
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallBeerGerbil
suffix: Beer. Gerbil
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerGerbil
Quantity: 50
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallBeerBreeze
suffix: Beer. Breeze
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerBreeze
Quantity: 50
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallBeerBlowLaw
suffix: Beer. BlowLaw
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14BeerBlowLaw
Quantity: 50
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallAleBloodyTear
suffix: Ale. BloodyTear
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14AleBloodyTear
Quantity: 50
- type: entity
parent: CP14CraneBarrelSmall
id: CP14CraneBarrelSmallAleBottomless
suffix: Ale. Bottomless
categories: [ ForkFiltered ]
components:
- type: SolutionContainerManager
solutions:
barrel:
reagents:
- ReagentId: CP14AleBottomless
Quantity: 50

View File

@@ -45,4 +45,64 @@
- type: flavor
id: CP14Quartz
flavorType: Complex
description: cp14-flavor-complex-quartz
description: cp14-flavor-complex-quartz
- type: flavor
id: CP14beer
flavorType: Complex
description: cp14-flavor-complex-beer
- type: flavor
id: CP14dwarfbeer
flavorType: Complex
description: cp14-flavor-complex-dwarfbeer
- type: flavor
id: CP14gerbil
flavorType: Complex
description: cp14-flavor-complex-gerbil
- type: flavor
id: CP14breeze
flavorType: Complex
description: cp14-flavor-complex-breeze
- type: flavor
id: CP14blowLaw
flavorType: Complex
description: cp14-flavor-complex-blowlaw
- type: flavor
id: CP14wine
flavorType: Complex
description: cp14-flavor-complex-wine
- type: flavor
id: CP14zellasianPleasure
flavorType: Complex
description: cp14-flavor-complex-zellasian-pleasure
- type: flavor
id: CP14leeks
flavorType: Complex
description: cp14-flavor-complex-leeks
- type: flavor
id: CP14durandate
flavorType: Complex
description: cp14-flavor-complex-durandate
- type: flavor
id: CP14ale
flavorType: Complex
description: cp14-flavor-complex-ale
- type: flavor
id: CP14bloodyTear
flavorType: Complex
description: cp14-flavor-complex-bloodytear
- type: flavor
id: CP14bottomless
flavorType: Complex
description: cp14-flavor-complex-bottomless

View File

@@ -0,0 +1,247 @@
# Base Alcohol
- type: reagent
id: CP14DwarfBeer
name: cp14-reagent-name-beer
parent: BaseAlcohol
desc: cp14-reagent-desc-beer
slippery: true
physicalDesc: reagent-physical-desc-strong-smelling
flavor: CP14dwarfbeer
color: "#4b3620"
boilingPoint: 78.2
meltingPoint: -114.1
metabolisms:
Alcohol:
effects:
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 10
- !type:OrganType
type: CP14Dwarf
shouldHave: false
damage:
types:
Poison: 1
# dwarves take less toxin damage and heal a marginal amount of brute
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 10
- !type:OrganType
type: CP14Dwarf
damage:
types:
Poison: 0.2
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 10
- !type:OrganType
type: CP14Dwarf
damage:
groups:
Brute: -1
- !type:ChemVomit
probability: 0.04
conditions:
- !type:ReagentThreshold
reagent: CP14DwarfBeer
min: 8
- !type:OrganType
type: CP14Dwarf
shouldHave: false
- !type:Drunk
boozePower: 2
fizziness: 0.8
- type: reagent
id: CP14Beer
name: cp14-reagent-name-beer
parent: BaseAlcohol
desc: cp14-reagent-desc-beer
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14beer
color: "#e3e77b"
recognizable: true
fizziness: 0.6
metabolisms:
Poison:
metabolismRate: 0.1
effects:
- !type:Emote
emote: Laugh
probability: 0.05
- type: reagent
id: CP14BeerGerbil
name: cp14-reagent-name-beer
parent: BaseAlcohol
desc: cp14-reagent-desc-beer
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14gerbil
color: "#3c1e14"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Beer
amount: 0.2
- type: reagent
id: CP14BeerBreeze
name: cp14-reagent-name-beer
parent: BaseAlcohol
desc: cp14-reagent-desc-beer
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14breeze
color: "#ffdc64"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Beer
amount: 0.2
- type: reagent
id: CP14BeerBlowLaw
name: cp14-reagent-name-beer
parent: BaseAlcohol
desc: cp14-reagent-desc-beer
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14blowLaw
color: "#f0d778"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Beer
amount: 0.3
- type: reagent
id: CP14Wine
name: cp14-reagent-name-wine
parent: BaseAlcohol
desc: cp14-reagent-desc-wine
physicalDesc: reagent-physical-desc-translucent
flavor: CP14wine
color: "#7E4043"
recognizable: true
metabolisms:
Medicine:
effects:
- !type:ModifyBloodLevel
amount: 0.4
- type: reagent
id: CP14WineZellasianPleasure
name: cp14-reagent-name-wine
parent: BaseAlcohol
desc: cp14-reagent-desc-wine
physicalDesc: reagent-physical-desc-translucent
flavor: CP14zellasianPleasure
color: "#5a1e1e"
recognizable: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Wine
amount: 0.3
- type: reagent
id: CP14WineLeeks
name: cp14-reagent-name-wine
parent: BaseAlcohol
desc: cp14-reagent-desc-wine
physicalDesc: reagent-physical-desc-translucent
flavor: CP14leeks
color: "#961e32"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Wine
amount: 0.2
- type: reagent
id: CP14WineDurandate
name: cp14-reagent-name-wine
parent: BaseAlcohol
desc: cp14-reagent-desc-wine
physicalDesc: reagent-physical-desc-translucent
flavor: CP14durandate
color: "#8c3c32"
recognizable: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Wine
amount: 0.1
- type: reagent
id: CP14Ale
name: cp14-reagent-name-ale
parent: BaseAlcohol
desc: cp14-reagent-desc-ale
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14ale
color: "#663100"
recognizable: true
fizziness: 0.6
metabolisms:
Poison:
metabolismRate: 0.2
effects:
- !type:Emote
emote: Laugh
probability: 0.05
- type: reagent
id: CP14AleBloodyTear
name: cp14-reagent-name-ale
parent: BaseAlcohol
desc: cp14-reagent-desc-ale-bloody-tear
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14bloodyTear
color: "#993333"
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Ale
amount: 0.2
- type: reagent
id: CP14AleBottomless
name: cp14-reagent-name-ale
parent: BaseAlcohol
desc: cp14-reagent-desc-ale
physicalDesc: reagent-physical-desc-bubbly
flavor: CP14bottomless
color: "#2d1914"
recognizable: true
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: CP14Ale
amount: 0.2