Skip to content

Commit

Permalink
Cigs, cig paper and cardboard crafting, cig vendors, cig crates, (#228)
Browse files Browse the repository at this point in the history
* adds cigs, cig crafting, paper and cardboard crafting, cig vendors and breakable cig crates.

* fix
  • Loading branch information
Peptide90 authored Jun 26, 2024
1 parent 672c866 commit a4e9c93
Show file tree
Hide file tree
Showing 169 changed files with 2,069 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
state: cardboard
- type: Stack
count: 1
- type: Construction
graph: N14Cardboard
node: cardboard

- type: entity
parent: MaterialBase
Expand Down
38 changes: 38 additions & 0 deletions Resources/Prototypes/Nuclear14/Catalog/Fills/crates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- type: entity
parent: N14CrateBreakPlain
id: N14CrateBreakPlainFilledCigarettes
suffix: cigarette packs random # We don't give it a name, players need to break it to find out whats inside.
components:
- type: StorageFill
contents:
- id: N14CigarettePackSalem
prob: 0.5
- id: N14CigarettePackKool
prob: 0.5
- id: N14CigarettePackMarlboro
prob: 0.5
- id: N14CigarettePackWinston
prob: 0.5
- id: N14CigarettePackCustom
prob: 0.5
- id: N14CigarettePackSalem
prob: 0.4
- id: N14CigarettePackKool
prob: 0.4
- id: N14CigarettePackMarlboro
prob: 0.4
- id: N14CigarettePackWinston
prob: 0.4
- id: N14CigarettePackCustom
prob: 0.4

- type: entity
parent: N14CrateBreakPlain
id: N14CrateBreakPlainFilledCigarettesRepublic
suffix: republics
name: Republic cigarette crate
components:
- type: StorageFill
contents:
- id: N14CigarettePackRepublics
amount: 6
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
- type: entity
parent: Cigarette
id: N14Cigarette
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
state: unlit-icon
scale: 0.5, 0.5
- type: Tag
tags:
- Cigarette
- Trash
- type: SpaceGarbage
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
slots: [ mask ]
equippedPrefix: unlit
- type: Item
size: Tiny

- type: entity
parent: N14Cigarette
id: N14CigaretteSpent
suffix: spent
components:
- type: Sprite
state: burnt-icon
- type: Smokable
state: Burnt
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 20
- type: Tag
tags:
- Cigarette
- Trash
- Burnt

- type: entity
parent: N14Cigarette
id: N14CigaretteKool
description: A Kool brand cigarette.
suffix: kool
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi

- type: entity
parent: N14CigaretteKool
id: N14CigaretteSalem
description: A Salem brand cigarette.
suffix: salem

- type: entity
parent: N14Cigarette
id: N14CigaretteMarlboro
description: A Marlboro brand cigarette.
suffix: marlboro
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi

- type: entity
parent: N14Cigarette
id: N14CigaretteRepublic
description: A Republic brand cigarette.
suffix: republic
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi

- type: entity
parent: N14Cigarette
id: N14CigaretteRollie
description: A roll up cigarette.
suffix: rollie
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi
- type: Construction
graph: N14Cigarette
node: cigarette

- type: entity
parent: N14Cigarette
id: N14CigaretteWinston
description: A Winston brand cigarette.
suffix: winston
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi
- type: Clothing
sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
- type: entity
id: N14CigPackBase
parent: [ BaseStorageItem, BaseBagOpenClose ]
name: cigarette pack
abstract: true
components:
- type: Sprite
scale: 0.65, 0.65
layers:
- state: closed
- state: open
map: ["openLayer"]
visible: false
- state: overlay_cig_0
map: ["cig0"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_1
map: ["cig1"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_2
map: ["cig2"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_3
map: ["cig3"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_4
map: ["cig4"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_5
map: ["cig5"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_6
map: ["cig6"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_7
map: ["cig7"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- state: overlay_cig_8
map: ["cig8"]
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi
visible: false
- type: Tag
tags:
- CigPack
- Trash
- type: PhysicalComposition
materialComposition:
Cardboard: 10
- type: Item
size: Tiny
shape: # Yes, this is cursed, but it breaks otherwise, dont question it.
- 0,0,0,1
- type: Storage
grid:
- 0,0,4,1
- type: StorageFill
contents:
- id: Cigarette
amount: 8
- type: ItemCounter
count:
tags: [Cigarette]
composite: true
layerStates:
- cig0
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- cig7
- cig8
- type: Appearance

# - type: entity
# parent: N14CigPackBase
# id: N14CigarettePack
# name: cigarette packet
# description: A generic pack of cigarettes.

- type: entity
parent: N14CigPackBase
id: N14CigarettePackSalem
name: Salem cigs pack
description: A refined green cigarette packet. A label on the packaging reads, Salem. Refreshes your taste.
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi
- type: StorageFill
contents:
- id: N14CigaretteSalem
amount: 8

- type: entity
parent: N14CigPackBase
id: N14CigarettePackKool
name: Kools cigs pack
description: A kool green cigarette packet. A label on the packaging reads, KOOL. So good, it's got to be KOOL!
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi
- type: StorageFill
contents:
- id: N14CigaretteKool
amount: 8

- type: entity
parent: N14CigPackBase
id: N14CigarettePackMarlboro
name: Marlboro cigs pack
description: A cool red cigarette packet. A label on the packaging reads, Marlboro. Where theres a man, theres a Marlboro.
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi
- type: StorageFill
contents:
- id: N14CigaretteMarlboro
amount: 8

- type: entity
parent: N14CigPackBase
id: N14CigarettePackWinston
name: Winston cigs pack
description: A refined red cigarette packet. A label on the packaging reads, Winston. Winston tastes good, like a cigarette should!
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi
- type: StorageFill
contents:
- id: N14CigaretteWinston
amount: 8

- type: entity
parent: N14CigPackBase
id: N14CigarettePackCustom
suffix: custom
name: cardboard cigs pack
description: A simple hand-made cardboard cigarette pack
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi
- type: StorageFill
contents:
- id: N14CigaretteRollie
amount: 8

- type: entity
parent: N14CigPackBase
id: N14CigarettePackRepublics
name: Republics cig pack
description: A rustic cardboard cigarette pack with the flag of the New Californian Republic on it. A label on the packaging reads, Republics. Taste the freedom, feel the burn.
components:
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi
- type: StorageFill
contents:
- id: N14CigaretteRepublic
amount: 8
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
- type: entity
parent: BaseStorageItem
name: pack of rolling paper
id: N14PackRollingPaper
description: A pack of thin pieces of paper used to make fine smokeables.
components:
- type: Storage
grid:
- 0,0,3,1
whitelist:
tags:
- RollingPaper
- CigFilter
- type: StorageFill
contents:
- id: N14RollingPaper
amount: 4
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
state: cigpapers
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi

- type: entity
parent: PaperRolling
id: N14RollingPaper
suffix: Full
components:
- type: Stack
stackType: N14RollingPaper
count: 5
- type: Sprite
sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi
state: rollie_paper
scale: 0.6, 0.6
- type: Item
sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi
size: Tiny
- type: Construction
graph: N14RollingPaper
node: rollingpaper

- type: entity
id: N14RollingPaper1
suffix: Single
parent: N14RollingPaper
components:
- type: Stack
count: 1
Loading

0 comments on commit a4e9c93

Please sign in to comment.