Skip to content

Commit

Permalink
Kegs (DeltaV 2378#) (#2618)
Browse files Browse the repository at this point in the history
* Barrels & Kegs (#2378)

* initial commit

* fixes

* Cleanup

* Update drinks_keg.yml

* Keg = cask

* Update boozeomat.yml

* Update barrel.yml

* Update kilderkin.yml

---------

Co-authored-by: rosieposie <[email protected]>
  • Loading branch information
dvir001 and rosieposieeee authored Dec 29, 2024
1 parent 0686ef9 commit f8a0b13
Show file tree
Hide file tree
Showing 23 changed files with 301 additions and 137 deletions.
62 changes: 33 additions & 29 deletions Resources/Maps/_NF/Shuttles/kilderkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,6 @@ entities:
parent: 1
- type: Physics
canCollide: False
bodyType: Static
- type: Fixtures
fixtures: {}
- proto: BenchSofaLeft
Expand All @@ -900,8 +899,6 @@ entities:
rot: 3.141592653589793 rad
pos: 5.5,1.5
parent: 1
- type: Physics
bodyType: Static
- proto: BenchSofaMiddle
entities:
- uid: 121
Expand All @@ -910,8 +907,6 @@ entities:
rot: 3.141592653589793 rad
pos: 6.5,1.5
parent: 1
- type: Physics
bodyType: Static
- proto: BenchSofaRight
entities:
- uid: 122
Expand All @@ -920,8 +915,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 7.5,2.5
parent: 1
- type: Physics
bodyType: Static
- proto: BlastDoor
entities:
- uid: 278
Expand Down Expand Up @@ -1702,19 +1695,6 @@ entities:
- type: Transform
pos: 2.5,1.5
parent: 1
- type: ContainerContainer
containers:
board: !type:Container
showEnts: False
occludes: True
ents: []
bank-ATM-cashSlot: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- type: Physics
canCollide: False
- type: ItemSlots
- proto: DefibrillatorCabinetFilled
entities:
- uid: 321
Expand Down Expand Up @@ -3228,19 +3208,11 @@ entities:
- type: Transform
pos: -4.5,-4.5
parent: 1
- type: FuelGenerator
on: False
- type: Physics
bodyType: Static
- uid: 320
components:
- type: Transform
pos: -3.5,-4.5
parent: 1
- type: FuelGenerator
on: False
- type: Physics
bodyType: Static
- proto: PottedPlantRandom
entities:
- uid: 363
Expand Down Expand Up @@ -4498,7 +4470,7 @@ entities:
rot: -1.5707963267948966 rad
pos: -4.5,-6.5
parent: 1
- proto: WarpPointShip
- proto: WarpPoint
entities:
- uid: 496
components:
Expand Down Expand Up @@ -4560,11 +4532,43 @@ entities:
rot: -1.5707963267948966 rad
pos: 2.5,-5.5
parent: 1
- proto: WoodenBarrel
entities:
- uid: 620
components:
- type: Transform
pos: -5.5,3.5
parent: 1
- uid: 621
components:
- type: Transform
pos: -5.5,2.5
parent: 1
- proto: WoodenKegBeer
entities:
- uid: 617
components:
- type: Transform
pos: -4.5,3.5
parent: 1
- proto: WoodenKegWine
entities:
- uid: 618
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,1.5
parent: 1
- proto: Wrench
entities:
- uid: 554
components:
- type: Transform
pos: -4.203125,-4.8230324
parent: 1
- uid: 619
components:
- type: Transform
pos: -4.5121074,1.5808618
parent: 1
...
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
DrinkJigger: 5
DrinkIceBucket: 2
BarSpoon: 3
DrinkKegSteel: 4 # Frontier: kegs
DrinkKegWood: 4 # Frontier: kegs
DrinkKegPlastic: 4 # Frontier: kegs
DrinkKegSteel: 2 # Frontier: kegs
DrinkKegWood: 2 # Frontier: kegs
DrinkKegPlastic: 2 # Frontier: kegs
CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
DrinkAbsintheBottleFull: 1
DrinkAleBottleFull: 5
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
- type: entity
parent: CrateGeneric
id: WoodenBarrel
name: wooden barrel
description: A musty old wooden barrel.
components:
- type: Sprite
sprite: DeltaV/Objects/Storage/barrel.rsi
layers:
- state: base
map: ["enum.StorageVisualLayers.Base"]
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- type: Icon
sprite: DeltaV/Objects/Storage/barrel.rsi
state: base
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: Wood
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 30
behaviors:
- !type:PlaySoundBehavior
sound:
collection: WoodDestroy
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank1:
min: 1
max: 4
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Construction
graph: WoodenBarrel
node: woodenbarrel
containers:
- entity_storage
- type: StaticPrice
price: 50
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.3,0.2,0.4"
density: 150
mask:
- SmallMobMask #this is so they can go under plastic flaps
layer:
- MachineLayer
- type: Climbable

- type: entity
parent: StorageTank
id: WoodenKeg
name: wooden keg
description: A musty old wooden keg, with a tap attached to the front.
components:
- type: SolutionContainerManager
solutions:
tank:
maxVol: 1000 # Frontier 500<1000
- type: ExaminableSolution
solution: tank
- type: UserInterface
interfaces:
enum.TransferAmountUiKey.Key:
type: TransferAmountBoundUserInterface
- type: DrawableSolution
solution: tank
- type: InjectableSolution
solution: tank
- type: Drink
solution: tank
- type: Spillable
solution: tank
- type: DumpableSolution
solution: tank
- type: Sprite
sprite: DeltaV/Objects/Storage/keg.rsi
layers:
- state: base
map: ["enum.StorageVisualLayers.Base"]
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: Wood
- type: StaticPrice
price: 50
- type: Construction
graph: WoodenKeg
node: woodenkeg
containers:
- entity_storage
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.3,0.2,0.4"
density: 200
mask:
- SmallMobMask #this is so they can go under plastic flaps
layer:
- MachineLayer
- type: Transform
noRot: false

- type: entity
parent: WoodenKeg
name: root beer keg
description: A musty old wooden keg, with a tap attached to the front. Smells like root beer.
id: WoodenKegRootBeer
components:
- type: Label
currentLabel: reagent-name-root-beer
- type: SolutionContainerManager
solutions:
tank:
reagents:
- ReagentId: RootBeer
Quantity: 1000 # Frontier 500<1000

- type: entity
parent: WoodenKeg
name: beer keg
description: A musty old wooden keg, with a tap attached to the front. Smells like beer.
id: WoodenKegBeer
components:
- type: Label
currentLabel: reagent-name-beer
- type: SolutionContainerManager
solutions:
tank:
reagents:
- ReagentId: Beer
Quantity: 1000 # Frontier 500<1000

- type: entity
parent: WoodenKeg
name: wine keg
description: A musty old wooden keg, with a tap attached to the front. Smells like wine.
id: WoodenKegWine
components:
- type: Label
currentLabel: reagent-name-wine
- type: SolutionContainerManager
solutions:
tank:
reagents:
- ReagentId: Wine
Quantity: 1000 # Frontier 500<1000
54 changes: 54 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/barrel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
- type: constructionGraph
id: WoodenBarrel
start: start
graph:
- node: start
edges:
- to: woodenbarrel
steps:
- material: WoodPlank
amount: 5
doAfter: 5

- node: woodenbarrel
entity: WoodenBarrel
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 5
- !type:EmptyAllContainers
- !type:DeleteEntity

- type: constructionGraph
id: WoodenKeg
start: start
graph:
- node: start
edges:
- to: woodenkeg
steps:
- material: WoodPlank
amount: 5
doAfter: 5

- node: woodenkeg
entity: WoodenKeg
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
conditions:
- !type:SolutionEmpty
solution: tank
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 5
- !type:EmptyAllContainers
- !type:DeleteEntity
25 changes: 25 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Crafting/barrel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: construction
name: wooden barrel
id: WoodenBarrel
graph: WoodenBarrel
startNode: start
targetNode: woodenbarrel
category: construction-category-storage
description: A musty old wooden barrel.
icon:
sprite: DeltaV/Objects/Storage/barrel.rsi
state: base
objectType: Structure

- type: construction
name: wooden keg
id: WoodenKeg
graph: WoodenKeg
startNode: start
targetNode: woodenkeg
category: construction-category-storage
description: A musty old wooden keg, with a tap attached to the front.
icon:
sprite: DeltaV/Objects/Storage/keg.rsi
state: base
objectType: Structure
Loading

0 comments on commit f8a0b13

Please sign in to comment.