Dan's Soaked Smokes (#19150)

* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list.

* Forgot a png

* Smokes work just need sprite work and random

* First pass on random cigs

* Cigarettes are named now just randomization left

* Finished on my end.

* Whoops

* Nutrient is not availiable for smokes I guess?

* Testing fixes

* Dunno found this on the filledbookshelf might work here?

* I dont know what Im doing wrong but I think this might work.

* Trying with orgroups in the pack YAML

* It seems to not like the food chems. Commented them out.

* THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume.

* I have a sneaky suspicion its the size of the container and pool of fill items.

* Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent.

* Apparently non whole number size is a no go.

* Cartons were to small and added maxamount on cigarettes.

* Amount: 0 caused odd errors. removed and changed maxamount to 2.

* Reworked randomization system to try and use weightedRandom instead of prob in storageFill

* Wrong weightedRandom

* Rework of a rework. Good on my end. Simplified the randomization to bare minimum.

* Added gas station dick pill vibe to all the names.

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

@@ -5,6 +5,7 @@
     CigPackRed: 2
     CigPackBlue: 2
     CigPackBlack: 2
+    CigPackMixed: 2
     CigarCase: 1
     SmokingPipeFilledTobacco: 1
     Vape: 1

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

@@ -77,3 +77,21 @@
     contents:
       - id: CigPackBlack
         amount: 6
+
+- type: entity
+  id: CigCartonMixed
+  parent: CigCartonGreen
+  name: Dan's soaked smokes
+  description: A carton containg 3 packets of Dan's soaked smokes.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
+    layers:
+      - state: closed
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
+  - type: StorageFill
+    contents:
+      - id: CigPackMixedMedical
+      - id: CigPackMixed
+      - id: CigPackMixedNasty

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

@@ -22,6 +22,30 @@
     graph: smokeableCigarette
     node: cigarette
 
+- type: entity
+  id: SoakedCigarette
+  parent: BaseCigar
+  name: cigarette
+  description: A roll of tobacco and nicotine soaked in some chemical.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    state: unlit-icon
+  - type: Tag
+    tags:
+      - Cigarette
+      - Trash
+  - type: SpaceGarbage
+  - type: Clothing
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit
+  - type: Item
+    size: 1
+  - type: Construction
+    graph: smokeableCigarette
+    node: cigarette
+
 - type: entity
   id: CigaretteSpent
   parent: Cigarette
@@ -51,3 +75,331 @@
             Quantity: 10
           - ReagentId: Omnizine
             Quantity: 30
+
+- type: entity
+  id: CigaretteOmnizine
+  parent: SoakedCigarette
+  name: Hot Dog Water Flavor Explosion
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Omnizine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteIron
+  parent: SoakedCigarette
+  name: Rusty Orange Baja Blast
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Iron
+            Quantity: 10
+
+- type: entity
+  id: CigaretteTricordrazine
+  parent: SoakedCigarette
+  name: Licorice Allsorts
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Tricordrazine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDylovene
+  parent: SoakedCigarette
+  name: Urinal Cake Disolver
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dylovene
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDermaline
+  parent: SoakedCigarette
+  name: Aloe Peanut Butter Medley
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dylovene
+            Quantity: 10
+
+- type: entity
+  id: CigaretteArithrazine
+  parent: SoakedCigarette
+  name: Roman Pipe Works
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Arithrazine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteIpecac
+  parent: SoakedCigarette
+  name: Grandma's Christmas Fruitcake
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Ipecac
+            Quantity: 2
+
+- type: entity
+  id: CigaretteBicaridine
+  parent: SoakedCigarette
+  name: Wet Dog Enhanced Cigarette
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Bicaridine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDexalin
+  parent: SoakedCigarette
+  name: Rocky Mountain Musk
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dexalin
+            Quantity: 10
+
+- type: entity
+  id: CigarettePax
+  parent: SoakedCigarette
+  name: Switzerland Express
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Pax
+            Quantity: 2
+
+- type: entity
+  id: CigaretteBbqSauce
+  parent: SoakedCigarette
+  name: Spicy Wood Aroma
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: BbqSauce
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBlackPepper
+  parent: SoakedCigarette
+  name: English Spice
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Blackpepper
+            Quantity: 10
+
+- type: entity
+  id: CigaretteCapsaicinOil
+  parent: SoakedCigarette
+  name: Chilly P
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: CapsaicinOil
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBread
+  parent: SoakedCigarette
+  name: Double Toasted
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteMilk
+  parent: SoakedCigarette
+  name: Bovine Extract
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Milk
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBanana
+  parent: SoakedCigarette
+  name: Clown Adjancency Bonus
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: BananaHonk
+            Quantity: 10
+
+- type: entity
+  id: CigaretteSpaceDrugs
+  parent: SoakedCigarette
+  name: 80's Power Hour
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: SpaceDrugs
+            Quantity: 10
+
+- type: entity
+  id: CigaretteMuteToxin
+  parent: SoakedCigarette
+  name: Mixed Lozenges
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: MuteToxin
+            Quantity: 2
+
+- type: entity
+  id: CigaretteMold
+  parent: SoakedCigarette
+  name: Beneath The Sink Experience
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Mold
+            Quantity: 2
+
+- type: entity
+  id: CigaretteLicoxide
+  parent: SoakedCigarette
+  name: Wake Up Call
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Licoxide
+            Quantity: 5
+
+- type: entity
+  id: CigaretteWeldingFuel
+  parent: SoakedCigarette
+  name: Plasma Sauce
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: WeldingFuel
+            Quantity: 5
+
+- type: entity
+  id: CigaretteTHC
+  parent: SoakedCigarette
+  name: Hippy Romance Novel
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: THC
+            Quantity: 5

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

@@ -63,6 +63,71 @@
     - cig6
   - type: Appearance
 
+- type: entity
+  id: CigPackMixedBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: soaked cigarette pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: cig1
+      map: ["cig1"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig2
+      map: ["cig2"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig3
+      map: ["cig3"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig4
+      map: ["cig4"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig5
+      map: ["cig5"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig6
+      map: ["cig6"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+  - type: SpaceGarbage
+  - type: Storage
+    capacity: 10
+  - type: Item
+    size: 10
+  - type: StorageFill
+    contents:
+    - id: CigaretteRandom
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - cig1
+    - cig2
+    - cig3
+    - cig4
+    - cig5
+    - cig6
+  - type: Appearance
+
 - type: entity
   id: CigPackGreen
   parent: CigPackBase
@@ -121,3 +186,89 @@
     contents:
     - id: CigaretteSyndicate
       amount: 5
+
+- type: entity
+  id: CigPackMixedMedical
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteIron
+    - id: CigaretteTricordrazine
+    - id: CigaretteDylovene
+    - id: CigaretteDermaline
+    - id: CigaretteArithrazine
+    - id: CigaretteBicaridine
+    - id: CigaretteIpecac
+    - id: CigaretteOmnizine
+      prob: 0.25
+    - id: CigaretteDexalin
+      prob: 0.25
+    - id: CigarettePax
+      prob: 0.10
+
+
+- type: entity
+  id: CigPackMixed
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteBbqSauce
+      prob: 0.70
+    - id: CigaretteBlackPepper
+      prob: 0.70
+    - id: CigaretteCapsaicinOil
+      prob: 0.70
+    - id: CigaretteBread
+      prob: 0.70
+    - id: CigaretteMilk
+      prob: 0.70
+    - id: CigaretteBanana
+      prob: 0.10
+    - id: CigaretteTHC
+      prob: 0.70
+    - id: CigaretteTricordrazine
+      prob: 0.25
+    - id: CigaretteSpaceDrugs
+      prob: 0.50
+    - id: CigaretteLicoxide
+      prob: 0.10
+
+- type: entity
+  id: CigPackMixedNasty
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteSpaceDrugs
+      amount: 2
+    - id: CigaretteWeldingFuel
+      amount: 2
+    - id: CigaretteMold
+      amount: 2
+    - id: CigaretteTHC
+    - id: CigaretteLicoxide
+      prob: 0.50
+    - id: CigarettePax
+      prob: 0.10
+    - id: CigaretteMuteToxin
+      prob: 0.05

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "trash"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}