Smokeable Tweaks (#5611)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

@@ -10,3 +10,4 @@
     CigPackBlack: 2
     CigarCase: 1
     Matchbox: 5
+    PackPaperRollingFilters: 3

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml

@@ -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

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

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

Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml

@@ -1,10 +1,10 @@
-- type: constructionGraph
+- type: constructionGraph
-  id: smokeableRollie
+  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
+    - node: joint
-      entity: Rollie
+      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

Resources/Prototypes/Recipes/Crafting/smokeables.yml

@@ -1,14 +1,25 @@
-- type: construction
+- type: construction
-  name: rollie
+  name: joint
-  id: smokeableRollie
+  id: smokeableJoint
-  graph: smokeableRollie
+  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

Resources/Prototypes/tags.yml

@@ -39,6 +39,9 @@
 - type: Tag
   id: CaptainSabre
 
+- type: Tag
+  id: CigFilter
+
 - type: Tag
   id: CigPack