Skip to content

Commit 00391e3

Browse files
authored
big boys have tried big boy solutions. let a yaml warrior take a crack at it ok? (impstation#4127)
1 parent c4d0f53 commit 00391e3

File tree

2 files changed

+37
-10
lines changed
  • Resources/Prototypes/_Impstation

2 files changed

+37
-10
lines changed

Resources/Prototypes/_Impstation/Catalog/Fills/Crates/holiday.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
- id: PlushieCaptain
1414
- id: PlushieGiantBear
1515
- id: BoxMacarons
16-
amount: 3
16+
amount: 2
17+
- id: BoxMacaronsCottonAllowed
18+
amount: 1
1719
- id: BoxConversationHeart
1820
amount: 3
1921
- id: BoxChocolateHearts

Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Food/Containers/box.yml

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,8 @@
9191
- !type:GroupSelector
9292
rolls: 4
9393
children:
94-
- id: FoodMacaronBerry
95-
- id: FoodMacaronCherry
96-
- id: FoodMacaronLemon
97-
- id: FoodMacaronCotton
98-
weight: 0.8
99-
- id: FoodMacaronMimana
100-
weight: 0.4
101-
- id: FoodGummyWorm
102-
weight: 0.1
94+
- !type:NestedSelector
95+
tableId: MacaronNoCottonEntityTable
10396
- type: Storage
10497
grid:
10598
- 0,0,1,1
@@ -110,6 +103,38 @@
110103
sprite: _Impstation/Objects/Consumable/Food/Candy/chalk_heart.rsi
111104
state: chalkheartpackage1
112105

106+
- type: entity
107+
parent: BoxMacarons
108+
id: BoxMacaronsCottonAllowed
109+
suffix: cotton-safe
110+
components:
111+
- type: EntityTableContainerFill
112+
containers:
113+
storagebase: !type:AllSelector
114+
children:
115+
- !type:NestedSelector
116+
rolls: 2
117+
tableId: MacaronNoCottonEntityTable
118+
- !type:GroupSelector
119+
rolls: 2
120+
children:
121+
- !type:NestedSelector
122+
tableId: MacaronNoCottonEntityTable
123+
- id: FoodMacaronCotton
124+
weight: 0.6
125+
126+
- type: entityTable
127+
id: MacaronNoCottonEntityTable
128+
table: !type:GroupSelector
129+
children:
130+
- id: FoodMacaronBerry
131+
- id: FoodMacaronCherry
132+
- id: FoodMacaronLemon
133+
- id: FoodMacaronMimana
134+
weight: 0.3
135+
- id: FoodGummyWorm
136+
weight: 0.1
137+
113138
- type: entity
114139
name: Discount Dan's Hot Sauce Sampler Pack
115140
parent: BoxCardboard

0 commit comments

Comments
 (0)