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

feat: HydroCo - Beverage Powders #2210

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
51ff761
feat: Powdered drinks orderable by Logi
DisposableCrewmember42 Nov 16, 2024
64a8744
tweak: Lower amounts per crate
DisposableCrewmember42 Nov 16, 2024
9da8f35
chore: fix copy-paste mistake
DisposableCrewmember42 Nov 16, 2024
ab17a37
feat: Add HydroCo to StockTrade App
DisposableCrewmember42 Nov 16, 2024
61b71bd
tweak: Lemon, Lime and Pineapple Juice powders now deal slight Causti…
DisposableCrewmember42 Nov 16, 2024
7bb89e9
i18n: Powdered watermelon juice does not include water
DisposableCrewmember42 Nov 16, 2024
f1a52bd
feat: If eating straight powdered beverage, cough and vomit
DisposableCrewmember42 Nov 16, 2024
317aeb8
tweak: change powder tastes
DisposableCrewmember42 Nov 16, 2024
5f685a3
tweak: Add spoons to HydroCo crates
DisposableCrewmember42 Nov 16, 2024
0c4745a
tweak: Add HydroCo consumption notice to crates
DisposableCrewmember42 Nov 16, 2024
d76880c
refactor: consistent naming
DisposableCrewmember42 Nov 16, 2024
f311765
refactor: BasePowderBeverage now abstract, inherit physicalDesc
DisposableCrewmember42 Nov 16, 2024
0193e5e
refactor: mark ReagentTinBase as abstract
DisposableCrewmember42 Nov 16, 2024
9da7c4a
tweak: Rephrase HydroCo Notice
DisposableCrewmember42 Nov 16, 2024
b7cf8fd
refactor: Move name and description to prototype
DisposableCrewmember42 Nov 18, 2024
3d2b0e3
tweak: Juice crate now comes in one of four editions
DisposableCrewmember42 Nov 18, 2024
bc8b5ea
feat: powdered tomato juice
DisposableCrewmember42 Nov 18, 2024
8883595
refactor: rename reagent ftl for consistendcy
DisposableCrewmember42 Nov 18, 2024
0e800c6
tweak: use tomato powder in crate fill
DisposableCrewmember42 Nov 18, 2024
86d7581
fix: copy-paste mistake
DisposableCrewmember42 Nov 18, 2024
c0e3c4e
feat: hydroco trial mails
DisposableCrewmember42 Nov 18, 2024
aaa9b38
tweak: 2 soy, 2 regular milk in dairy crate
DisposableCrewmember42 Nov 18, 2024
aed6653
tweak: lower price for juice crate
DisposableCrewmember42 Nov 18, 2024
9b35f09
tweak: recolor tomato powder
DisposableCrewmember42 Nov 18, 2024
9cbfae1
tweak: use one of each edition, no themed crates; plastic spoons inst…
DisposableCrewmember42 Nov 18, 2024
556af0b
feat: soy milk powder and orange juice powder in sustenance vendor
DisposableCrewmember42 Nov 18, 2024
b5d9454
tweak: reword hydroco mail message
DisposableCrewmember42 Nov 18, 2024
9f22d6e
tweak: rearrange papers to play nicer with word-wrap
DisposableCrewmember42 Nov 18, 2024
a36a711
tweak: add new-line in case somebody drags the paper wider
DisposableCrewmember42 Nov 18, 2024
5d2b754
tweak: reintroduce random tin, condense juice fill tables
DisposableCrewmember42 Nov 19, 2024
eeff306
refactor: amount defaults to 1
DisposableCrewmember42 Nov 19, 2024
414778c
Add Changelog Entry for Teach Lesson (#2225)
Lyndomen Nov 19, 2024
341f2a5
refactor: add missing newline
DisposableCrewmember42 Nov 19, 2024
5d8343a
refactor: respect yaml property ordering convention
DisposableCrewmember42 Nov 21, 2024
a711c54
refactor: more yaml conventions
DisposableCrewmember42 Nov 24, 2024
53c90e0
Merge branch 'master' into hydroco-powdered-drinks
DisposableCrewmember42 Nov 24, 2024
d0e5f52
Merge branch 'master' into hydroco-powdered-drinks
DisposableCrewmember42 Nov 25, 2024
0d71dae
Merge branch 'master' into hydroco-powdered-drinks
MilonPL Nov 29, 2024
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX]
stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP]
stock-trading-company-fishinc = Fish Inc. [FIN]
stock-trading-company-donk = Donk Co. [DONK]
stock-trading-company-hydroco = HydroCo [HYD]
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
reagent-name-powdered-milk = powdered milk
reagent-desc-powdered-milk = A powder-based milk substitute that can be reconstituted with water.

reagent-name-powdered-milk-soy = powdered soy milk
reagent-desc-powdered-milk-soy = A powder-based dairy-free milk substitute that can be reconstituted with water.

reagent-name-powdered-juice-orange = powdered orange juice
reagent-desc-powdered-juice-orange = A powder-based orange juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-lime = powdered lime juice
reagent-desc-powdered-juice-lime = A powder-based lime juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-lemon = powdered lemon juice
reagent-desc-powdered-juice-lemon = A powder-based lemon juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-pineapple = powdered pineapple juice
reagent-desc-powdered-juice-pineapple = A powder-based pineapple juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-banana = powdered banana juice
reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-berry = powdered berry juice
reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-watermelon = powdered melon juice
reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-grape = powdered grape juice
reagent-desc-powdered-juice-grape = A powder-based grape juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-apple = powdered apple juice
reagent-desc-powdered-juice-apple = A powder-based apple juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-cherry = powdered cherry juice
reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-carrot = powdered carrot juice
reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water.

reagent-name-powdered-juice-tomato = powdered tomato juice
reagent-desc-powdered-juice-tomato = A powder-based tomato juice substitute that can be reconstituted with water.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
FoodSnackNutribrick: 5
FoodSnackMREBrownie: 5
FoodCondimentPacketKetchup: 5
ReagentTinPowderedMilkSoy: 2
ReagentTinPowderedJuiceOrange: 1
emaggedInventory:
KitchenKnife: 2
SpaceMedipen: 3
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,23 @@
cost: 3333
category: Food
group: market

- type: cargoProduct
id: FoodHydroCoDairy
icon:
sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
state: icon-order-dairy
product: CrateHydroCoDairy
cost: 1500
category: Food
group: market

- type: cargoProduct
id: FoodHydroCoJuice
icon:
sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
state: icon-order-juices
product: CrateHydroCoJuice
cost: 1500
category: Food
group: market
82 changes: 82 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,85 @@
contents:
- id: FoodPieBananaCream
amount: 13

- type: entity
parent: CratePlastic
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
id: CrateHydroCoDairy
name: HydroCo Dairy crate
description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
components:
- type: StorageFill
contents:
- id: PaperCrateHydroCoConsumption
- id: SpoonPlastic
amount: 2
- id: ReagentTinPowderedMilk
amount: 2
- id: ReagentTinPowderedMilkSoy
amount: 2

- type: entity
parent: CratePlastic
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
id: CrateHydroCoJuice
name: HydroCo Juice crate
description: A variety pack of powdered juice products from HydroCo.
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- !type:NestedSelector
tableId: FillHydroCoJuiceMix
- !type:NestedSelector
tableId: FillHydroCoJuiceRandomTin
prob: 0.15
- id: SpoonPlastic
amount: !type:ConstantNumberSelector
value: 2
- id: PaperCrateHydroCoConsumption

- type: entityTable
id: FillHydroCoJuiceMix
table: !type:AllSelector
children:
# Citrus
- !type:GroupSelector
children:
- id: ReagentTinPowderedJuiceOrange
- id: ReagentTinPowderedJuiceLime
- id: ReagentTinPowderedJuiceLemon
# Berry
- !type:GroupSelector
children:
- id: ReagentTinPowderedJuiceBerry
- id: ReagentTinPowderedJuiceGrape
- id: ReagentTinPowderedJuiceCherry
# Tropical
- !type:GroupSelector
children:
- id: ReagentTinPowderedJuicePineapple
- id: ReagentTinPowderedJuiceBanana
- id: ReagentTinPowderedJuiceWatermelon
# Garden
- !type:GroupSelector
children:
- id: ReagentTinPowderedJuiceApple
- id: ReagentTinPowderedJuiceCarrot
- id: ReagentTinPowderedJuiceTomato

- type: entityTable
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
id: FillHydroCoJuiceRandomTin
table: !type:GroupSelector
children:
- id: ReagentTinPowderedJuiceLemon
- id: ReagentTinPowderedJuiceLime
- id: ReagentTinPowderedJuiceOrange
- id: ReagentTinPowderedJuicePineapple
- id: ReagentTinPowderedJuiceBanana
- id: ReagentTinPowderedJuiceWatermelon
- id: ReagentTinPowderedJuiceBerry
- id: ReagentTinPowderedJuiceGrape
- id: ReagentTinPowderedJuiceCherry
- id: ReagentTinPowderedJuiceApple
- id: ReagentTinPowderedJuiceCarrot
- id: ReagentTinPowderedJuiceTomato
Loading
Loading