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.

Sign up for GitHub

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

Vending machine inventories reorganised #34200

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
+109 −74
Open

Vending machine inventories reorganised #34200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6a67682
Switched generic sodas with brands for SodaInventory
Alpaccalypse Jan 2, 2025
1ff51ba
All branded cans added to SodaInventory
Alpaccalypse Jan 2, 2025
fc40656
Reogranised vending machine inventory distribution
Alpaccalypse Jan 3, 2025
2daec8f
PWR Game dispenseOnHitChance increased for thematic reasons
Alpaccalypse Jan 5, 2025
4f1820f
Fixed Starkist vendor name inconsistency
Alpaccalypse Jan 5, 2025
041f1de
Removed edit. Moved to another PR
Alpaccalypse Jan 5, 2025
ab52776
Merged upstream
Alpaccalypse Jan 10, 2025
4cb18cd
Updated shambler's inventory
Alpaccalypse Jan 12, 2025
ff58271
Greatly reduced dink type distribution and overall can availability b…
Alpaccalypse Jan 14, 2025
865fcb4
Reduced can numbers, removed even more specific cans from specific ma…
Alpaccalypse Jan 14, 2025
58236b1
Made an entityTable to more rationally distribute drink vendors
Alpaccalypse Jan 14, 2025
271d0de
Raised boda inventory by 1 as it has only one drink and is a rarer sp…
Alpaccalypse Jan 14, 2025
0846695
Made Boda have only cola for contraband again.
Alpaccalypse Jan 14, 2025
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
13 changes: 5 additions & 8 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
- type: vendingMachineInventory
id: RobustSoftdrinksInventory
id: SpaceColaInventory
startingInventory:
DrinkColaCan: 4
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkPwrGameCan: 2
DrinkRootBeerCan: 1
DrinkLemonLimeCan: 3
DrinkSolDryCan: 1
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
11 changes: 4 additions & 7 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
id: DrGibbInventory
startingInventory:
DrinkDrGibbCan: 4
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkFourteenLokoCan: 1
DrinkEnergyDrinkCan: 2
DrinkIcedTeaCan: 1
DrinkSpaceUpCan: 3
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
12 changes: 4 additions & 8 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
id: PwrGameInventory
startingInventory:
DrinkPwrGameCan: 4
DrinkEnergyDrinkCan: 4
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkGrapeCan: 1
DrinkShamblersJuiceCan: 3
DrinkLemonLimeCan: 3
DrinkSolDryCan: 1
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robustdrinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: vendingMachineInventory
id: RobustSoftdrinksInventory
startingInventory:
DrinkIcedTeaCan: 2
DrinkEnergyDrinkCan: 1
DrinkLemonLimeCan: 1
DrinkRootBeerCan: 2
DrinkSolDryCan: 2
DrinkSpaceMountainWindCan: 1
DrinkSpaceUpCan: 1
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robustdrinksblack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: vendingMachineInventory
id: RobustSoftdrinksBlackInventory # Bit long, but makes sense with current IDs
startingInventory:
DrinkDrGibbCan: 1
DrinkFourteenLokoCan: 2
DrinkGrapeCan: 2
DrinkPwrGameCan: 1
DrinkShamblersJuiceCan: 1
DrinkColaCan: 1
DrinkStarkistCan: 1
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
11 changes: 4 additions & 7 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
id: ShamblersJuiceInventory
startingInventory:
DrinkShamblersJuiceCan: 4
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkIcedTeaCan: 1
DrinkLemonLimeCan: 3
DrinkSolDryCan: 1
DrinkColaCan: 3
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
17 changes: 9 additions & 8 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
- type: vendingMachineInventory
id: SodaInventory
startingInventory:
DrinkColaCan: 3
DrinkGrapeCan: 3
DrinkRootBeerCan: 3
DrinkIcedTeaCan: 3
DrinkSolDryCan: 3
DrinkLemonLimeCan: 3
DrinkLemonLimeCranberryCan: 3
DrinkFourteenLokoCan: 3
DrinkDrGibbCan: 2
DrinkFourteenLokoCan: 2
DrinkShamblersJuiceCan: 2
DrinkLemonLimeCan: 2
DrinkSolDryCan: 2
DrinkColaCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkSpaceUpCan: 2
DrinkStarkistCan: 2
emaggedInventory:
DrinkNukieCan: 3
DrinkChangelingStingCan: 3
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: vendingMachineInventory
id: BodaInventory
startingInventory:
DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda"
DrinkSodaWaterCan: 6 #typically hacked product. Default product is "soda"
contrabandInventory:
DrinkColaCan: 10
DrinkColaCan: 6
12 changes: 4 additions & 8 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
- type: vendingMachineInventory
id: SpaceUpInventory
startingInventory:
DrinkSpaceUpCan: 3
DrinkSpaceUpCan: 4
DrinkSpaceMountainWindCan: 3
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkGrapeCan: 1
DrinkEnergyDrinkCan: 2
DrinkStarkistCan: 3
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
11 changes: 4 additions & 7 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
id: StarkistInventory
startingInventory:
DrinkStarkistCan: 4
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkLemonLimeCranberryCan: 2
DrinkFourteenLokoCan: 2
DrinkDrGibbCan: 3
DrinkFourteenLokoCan: 1
DrinkEnergyDrinkCan: 2
DrinkRootBeerCan: 1
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
50 changes: 36 additions & 14 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,39 @@
- state: red
- sprite: Structures/Machines/VendingMachines/random.rsi
state: drink
- type: RandomSpawner
prototypes:
- VendingMachineCoffee
- VendingMachineCola
- VendingMachineColaRed
- VendingMachineColaBlack
- VendingMachineSovietSoda
- VendingMachineShamblersJuice
- VendingMachinePwrGame
- VendingMachineDrGibb
- VendingMachineSoda
- VendingMachineStarkist
- VendingMachineSpaceUp
chance: 1
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: SodaVendorsTable
prob: 0.99

- type: entityTable
id: SodaVendorsTable
table: !type:GroupSelector
children:
#Specialist drink vendors
- !type:GroupSelector
weight: 15
children:
- id: VendingMachineCoffee
- id: VendingMachineSovietSoda
- id: VendingMachineSoda #Only vendor with all branded drinks.
#Generic Robust soda vendors
- !type:GroupSelector
weight: 15
children:
- id: VendingMachineCola
- id: VendingMachineColaBlack
#Space cola "family" of vendors
- !type:GroupSelector
weight: 35
children:
- id: VendingMachineColaRed
- id: VendingMachineShamblersJuice
- id: VendingMachinePwrGame
#Dr. Gibb "family" of vendors
- !type:GroupSelector
weight: 35
children:
- id: VendingMachineDrGibb
- id: VendingMachineStarkist
- id: VendingMachineSpaceUp
10 changes: 6 additions & 4 deletions Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,16 @@
components:
- type: VendingMachineRestock
canRestock:
- RobustSoftdrinksInventory
- BodaInventory
- DrGibbInventory
- PwrGameInventory
- RobustSoftdrinksInventory
- RobustSoftdrinksBlackInventory
- ShamblersJuiceInventory
- StarkistInventory
- SpaceUpInventory
- SodaInventory
- DrGibbInventory
- SpaceColaInventory
- SpaceUpInventory
- StarkistInventory
- type: Sprite
layers:
- state: base
Expand Down
6 changes: 5 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@
id: VendingMachineColaBlack
suffix: Black
components:
- type: VendingMachine
pack: RobustSoftdrinksBlackInventory
- type: Sprite
sprite: Structures/Machines/VendingMachines/cola-black.rsi
layers:
Expand All @@ -496,6 +498,8 @@
name: Space Cola Vendor
description: It vends cola, in space.
components:
- type: VendingMachine
pack: SpaceColaInventory
- type: Sprite
sprite: Structures/Machines/VendingMachines/cola-red.rsi
layers:
Expand Down Expand Up @@ -559,7 +563,7 @@
- type: entity
parent: VendingMachineCola
id: VendingMachineStarkist
name: Star-kist Vendor
name: Starkist Vendor
description: The taste of a star in liquid form.
components:
- type: VendingMachine
Expand Down
Loading