From 2180c26122fe59e438e51dd2dd3284e1d830b423 Mon Sep 17 00:00:00 2001 From: Pancake Date: Wed, 15 Dec 2021 02:07:58 -0800 Subject: [PATCH] Smokeable Tweaks (#5611) Co-authored-by: metalgearsloth --- .../VendingMachines/Inventories/cigs.yml | 1 + .../Smokeables/Cigarettes/blunts.yml | 28 --------- .../Smokeables/Cigarettes/joints.yml | 57 +++++++++++++++++++ .../Smokeables/Cigarettes/rolling_paper.yml | 24 ++++++++ .../Recipes/Crafting/Graphs/smokeables.yml | 38 +++++++++++-- .../Recipes/Crafting/smokeables.yml | 21 +++++-- Resources/Prototypes/tags.yml | 3 + 7 files changed, 134 insertions(+), 38 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index 6b537bd07e..60612d08a1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -10,3 +10,4 @@ CigPackBlack: 2 CigarCase: 1 Matchbox: 5 + PackPaperRollingFilters: 3 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml deleted file mode 100644 index 8a65fa3ce5..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: entity - id: Rollie - parent: BaseCigar - name: blunt - description: A roll of dried plant matter wrapped in thin paper. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi - netsync: false - state: unlit-icon - - type: Tag - tags: - - Cigarette - - type: Clothing - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi - Slots: [ mask ] - HeldPrefix: unlit - size: 1 - - type: Construction - graph: smokeableRollie - node: rollie - - type: SolutionContainerManager - solutions: - smokable: - maxVol: 20 - reagents: - - ReagentId: THC - Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml new file mode 100644 index 0000000000..28808de511 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml @@ -0,0 +1,57 @@ +- type: entity + id: Joint + parent: BaseCigar + name: joint + description: A roll of dried plant matter wrapped in thin paper. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + netsync: false + state: unlit-icon + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 + - type: Construction + graph: smokeableJoint + node: joint + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + reagents: + - ReagentId: THC + Quantity: 10 + +- type: entity + id: Blunt + parent: BaseCigar + name: blunt + description: A roll of dried plant matter wrapped in a dried tobacco leaf. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + netsync: false + state: unlit-icon + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 + - type: Construction + graph: smokeableBlunt + node: blunt + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + reagents: + - ReagentId: THC + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml index fe21860de1..a0dbfdcb5c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml @@ -8,6 +8,7 @@ whitelist: tags: - RollingPaper + - CigFilter capacity: 16 - type: StorageFill contents: @@ -19,6 +20,25 @@ - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi +- type: entity + parent: PackPaperRolling + name: pack of rolling paper with filters + id: PackPaperRollingFilters + description: A pack of filters and thin pieces of paper used to make fine smokeables. + components: + - type: Storage + whitelist: + tags: + - RollingPaper + - CigFilter + capacity: 32 + - type: StorageFill + contents: + - id: PaperRolling + amount: 8 + - id: CigaretteFilter + amount: 8 + - type: entity id: PaperRolling name: rolling paper @@ -54,3 +74,7 @@ state: cigfilter - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + size: 2 + - type: Tag + tags: + - CigFilter diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index dbbdabfcc1..c676c01966 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -1,10 +1,10 @@ -- type: constructionGraph - id: smokeableRollie +- type: constructionGraph + id: smokeableJoint start: start graph: - node: start edges: - - to: rollie + - to: joint steps: - prototype: PaperRolling icon: @@ -23,8 +23,36 @@ # color: darkgreen name: ground cannabis doAfter: 2 - - node: rollie - entity: Rollie + - node: joint + entity: Joint + +- type: constructionGraph + id: smokeableBlunt + start: start + graph: + - node: start + edges: + - to: blunt + steps: + - prototype: LeavesTobaccoDried + icon: + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + name: dried tobacco leaves + - prototype: CigaretteFilter + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigfilter + name: cigarette filter + - prototype: GroundCannabis + icon: + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile +# color: darkgreen + name: ground cannabis + doAfter: 2 + - node: blunt + entity: Blunt - type: constructionGraph id: smokeableCigarette diff --git a/Resources/Prototypes/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/smokeables.yml index d23de733e8..49d3267a1b 100644 --- a/Resources/Prototypes/Recipes/Crafting/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/smokeables.yml @@ -1,14 +1,25 @@ -- type: construction - name: rollie - id: smokeableRollie - graph: smokeableRollie +- type: construction + name: joint + id: smokeableJoint + graph: smokeableJoint startNode: start - targetNode: rollie + targetNode: joint category: Misc description: "A roll of dried plant matter wrapped in thin paper." icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png objectType: Item +- type: construction + name: blunt + id: smokeableBlunt + graph: smokeableBlunt + startNode: start + targetNode: blunt + category: Misc + description: "A roll of dried plant matter wrapped in a dried tobacco leaf." + icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png + objectType: Item + - type: construction name: cigarette id: smokeableCigarette diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ea594aba85..f7eaa44692 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -39,6 +39,9 @@ - type: Tag id: CaptainSabre +- type: Tag + id: CigFilter + - type: Tag id: CigPack