Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cigarette ecs (#4495)

Browse Source 
* Reorganized Shared.Storage folder

* Replace StorageCounter with Item Counter

* Change stack visuals setting data

* Fix mirrorcult suggestions

* Fix items from upstream

* Fix type formatting
This commit is contained in:
Ygg01
2021-09-04 19:42:32 +02:00
committed by GitHub
parent fc1ddb00cb
commit 53b53c3e0e
22 changed files with 370 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -32,7 +32,7 @@
- Welder
- Radio
- PowerCell
- type: ItemCounter
- type: ItemMapper
mapLayers:
cutters_red:
whitelist:
@@ -99,7 +99,7 @@
- Radio
- Handcuff
- PowerCell
- type: ItemCounter
- type: ItemMapper
mapLayers:
drill:
whitelist:
@@ -161,7 +161,7 @@
- Handcuff
- RangedMagazine
- Ammo
- type: ItemCounter
- type: ItemMapper
mapLayers:
flashbang:
whitelist:
@@ -196,7 +196,7 @@
- Soap
- Flashlight
- CigPack
- type: ItemCounter
- type: ItemMapper
mapLayers:
bottle:
whitelist:
@@ -241,7 +241,7 @@
- Hypospray
- SurgeryTool
- Radio
- type: ItemCounter
- type: ItemMapper
mapLayers:
bottle:
whitelist:
@@ -300,7 +300,7 @@
components:
- Seed
- Smoking
- type: ItemCounter
- type: ItemMapper
mapLayers:
hatchet:
whitelist:
@@ -352,7 +352,7 @@
- FlashOnTrigger
- Flash
- Handcuff
- type: ItemCounter
- type: ItemMapper
mapLayers:
flashbang:
whitelist:
@@ -396,7 +396,7 @@
- type: StorageFill
contents:
- id: CaptainSabre
- type: ItemCounter
- type: ItemMapper
mapLayers:
sheath-bag:
whitelist:

165
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
View File

@@ -26,25 +26,26 @@
HeldPrefix: box
- type: StorageFill
contents:
- id: FoodDonutPink
amount: 3
- id: FoodDonutPlain
amount: 3
- type: StorageCounter
countTag: Donut
- id: FoodDonutPink
amount: 3
- id: FoodDonutPlain
amount: 3
- type: ItemCounter
count:
tags: [Donut]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- pink-box2
- box3
- pink-box4
- box5
- pink-box6
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- pink-box2
- box3
- pink-box4
- box5
- pink-box6
# Egg
@@ -68,29 +69,30 @@
size: 12
- type: StorageFill
contents:
- id: FoodEgg
amount: 12
- type: StorageCounter
countTag: Egg
- id: FoodEgg
amount: 12
- type: ItemCounter
count:
tags: [Egg]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- box2
- box3
- box4
- box5
- box6
- box7
- box8
- box9
- box10
- box11
- box12
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- box2
- box3
- box4
- box5
- box6
- box7
- box8
- box9
- box10
- box11
- box12
# Someday...
# - type: DamageOnLand
# amount: 5
@@ -123,8 +125,8 @@
components:
- type: StorageFill
contents:
- id: Eggshells
amount: 12
- id: Eggshells
amount: 12
- type: Destructible
thresholds:
- trigger:
@@ -164,16 +166,16 @@
# stackType: PizzaBox
- type: Appearance
visuals:
- type: StorageVisualizer
state_open: box-open
state_closed: box
# - type: StackVisualizer
# stackLayers:
# - box
# - box1
# - box2
# - box3
# - box4
- type: StorageVisualizer
state_open: box-open
state_closed: box
# - type: StackVisualizer
# stackLayers:
# - box
# - box1
# - box2
# - box3
# - box4
- type: entity
name: pizza box
@@ -236,23 +238,24 @@
HeldPrefix: box
- type: StorageFill
contents:
- id: FoodBakedNugget
amount: 6
- type: StorageCounter
countTag: Nugget
- id: FoodBakedNugget
amount: 6
- type: ItemCounter
count:
tags: [Nugget]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- box2
- box3
- box4
- box5
- box6
- type: BagOpenCloseVisualizer
openIcon: box-open
- type: StackVisualizer
composite: true
stackLayers:
- box1
- box2
- box3
- box4
- box5
- box6
# Donkpocket
@@ -277,8 +280,8 @@
color: red
- type: StorageFill
contents:
- id: FoodDonkpocket
amount: 6
- id: FoodDonkpocket
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -291,8 +294,8 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- id: FoodDonkpocketSpicy
amount: 6
- id: FoodDonkpocketSpicy
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -305,8 +308,8 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- id: FoodDonkpocketTeriyaki
amount: 6
- id: FoodDonkpocketTeriyaki
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -320,8 +323,8 @@
color: white
- type: StorageFill
contents:
- id: FoodDonkpocketPizza
amount: 6
- id: FoodDonkpocketPizza
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -335,8 +338,8 @@
color: brown
- type: StorageFill
contents:
- id: FoodDonkpocketGondola
amount: 6
- id: FoodDonkpocketGondola
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -349,8 +352,8 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- id: FoodDonkpocketBerry
amount: 6
- id: FoodDonkpocketBerry
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -364,8 +367,8 @@
color: yellow
- type: StorageFill
contents:
- id: FoodDonkpocketHonk
amount: 6
- id: FoodDonkpocketHonk
amount: 6
- type: entity
parent: FoodBoxDonkpocket
@@ -380,5 +383,5 @@
color: green
- type: StorageFill
contents:
- id: FoodDonkpocketDink
amount: 6
- id: FoodDonkpocketDink
amount: 6

41
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
View File

@@ -13,24 +13,25 @@
size: 6
- type: StorageFill
contents:
- id: Cigarette
amount: 6
- type: StorageCounter
countTag: Cigarette
- id: Cigarette
amount: 6
- type: ItemCounter
count:
tags: [Cigarette]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
composite: true
stackLayers:
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
composite: true
stackLayers:
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- type: entity
id: CigPackGreen
@@ -42,7 +43,7 @@
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
layers:
- state: closed
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
size: 6
@@ -57,7 +58,7 @@
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
layers:
- state: closed
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
size: 6
@@ -72,7 +73,7 @@
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
layers:
- state: closed
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
size: 6
@@ -87,7 +88,7 @@
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
layers:
- state: closed
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
size: 6

41
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
View File

@@ -8,7 +8,7 @@
netsync: false
sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
layers:
- state: closed
- state: closed
- type: Storage
capacity: 8
- type: Item
@@ -16,25 +16,26 @@
size: 8
- type: StorageFill
contents:
- id: Cigar
amount: 8
- type: StorageCounter
countTag: Cigar
- id: Cigar
amount: 8
- type: ItemCounter
count:
tags: [Cigar]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
composite: true
stackLayers:
- cigar1
- cigar2
- cigar3
- cigar4
- cigar5
- cigar6
- cigar7
- cigar8
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
composite: true
stackLayers:
- cigar1
- cigar2
- cigar3
- cigar4
- cigar5
- cigar6
- cigar7
- cigar8
- type: entity
id: CigarGoldCase
@@ -44,5 +45,5 @@
components:
- type: StorageFill
contents:
- id: CigarGold
amount: 8
- id: CigarGold
amount: 8

5
Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
View File

@@ -193,8 +193,9 @@
contents:
- id: DrinkColaCan
amount: 6
- type: StorageCounter
countTag: Cola
- type: ItemCounter
count:
tags: [Cola]
- type: Appearance
visuals:
- type: StackVisualizer

4
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
View File

@@ -203,8 +203,6 @@
sprite: Objects/Fun/crayons.rsi
size: 9999
HeldPrefix: box
- type: StorageCounter
countTag: Crayon
- type: StorageFill
contents:
- id: CrayonRed
@@ -214,7 +212,7 @@
- id: CrayonBlue
- id: CrayonPurple
- id: CrayonBlack
- type: ItemCounter
- type: ItemMapper
mapLayers:
black_box:
whitelist:

5
Resources/Prototypes/Entities/Objects/Tools/matches.yml
View File

@@ -63,8 +63,9 @@
contents:
- id: Matchstick
amount: 6
- type: StorageCounter
countTag: Matchstick
- type: ItemCounter
count:
tags: [Cigar]
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer