Dans soaked smokes redux (#36979)

* Meat and Potatoes

* Whoops

Whoops

* entityTables my beloathed

reworked the cig fill for Dan's soaked smokes to use an entity table. There was just, a useless bit of code calling for a cig that didn't exist the in mixed cig parent for dan's and it was what was fucking it up and making it SO HARD for me to get it to work. Thanks Dan.

* ehhh, its good for the diff I guess

* Augh

* Why mappers why

* Welp

* migration.yml is pretty cool

Also like there is no reason for nasty and medical, they probably originally were made as a workaround.

Resources/Prototypes/Entities/Markers/Spawners/Random/smokables.yml

@@ -32,7 +32,7 @@
         state: unlit-icon
   - type: EntityTableSpawner
     table: !type:NestedSelector
-      tableId: SoakedSmokesTable
+      tableId: RandomSoakedSmokeTable
 
 #Tables
 - type: entityTable
@@ -75,34 +75,6 @@
           weight: 0.5
       - !type:GroupSelector
         children:
-        - id: CigPackMixedMedical
         - id: CigPackMixed
-        - id: CigPackMixedNasty
       - id: CigarGold
         weight: 0.10
-
-- type: entityTable
-  id: SoakedSmokesTable
-  table: !type:GroupSelector
-    children:
-      - id: CigaretteOmnizine
-      - id: CigaretteIron
-      - id: CigaretteDylovene
-      - id: CigaretteDermaline
-      - id: CigaretteIpecac
-      - id: CigaretteBicaridine
-      - id: CigaretteDexalin
-      - id: CigarettePax
-      - id: CigaretteBbqSauce
-      - id: CigaretteBlackPepper
-      - id: CigaretteOmnizine
-      - id: CigaretteCapsaicinOil
-      - id: CigaretteBread
-      - id: CigaretteMilk
-      - id: CigaretteBanana
-      - id: CigaretteSpaceDrugs
-      - id: CigaretteMuteToxin
-      - id: CigaretteMold
-      - id: CigaretteLicoxide
-      - id: CigaretteWeldingFuel
-      - id: CigaretteTHC

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

@@ -86,6 +86,5 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
   - type: StorageFill
     contents:
-      - id: CigPackMixedMedical
     - id: CigPackMixed
-      - id: CigPackMixedNasty
+      amount: 3

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

@@ -92,7 +92,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -107,7 +107,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -122,7 +122,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -137,7 +137,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -152,7 +152,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -167,7 +167,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -175,19 +175,19 @@
             Quantity: 10
 
 - type: entity
-  id: CigaretteIpecac
+  id: CigaretteNutriment
   parent: SoakedCigarette
   name: Grandma's Christmas Fruitcake
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: Ipecac
+          - ReagentId: Nutriment
-            Quantity: 2
+            Quantity: 10
 
 - type: entity
   id: CigaretteBicaridine
@@ -197,7 +197,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -212,7 +212,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -220,19 +220,19 @@
             Quantity: 10
 
 - type: entity
-  id: CigarettePax
+  id: CigaretteSaline
   parent: SoakedCigarette
-  name: Switzerland Express
+  name: North Atlantic Cruise
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: Pax
+          - ReagentId: Saline
-            Quantity: 2
+            Quantity: 10
 
 - type: entity
   id: CigaretteBbqSauce
@@ -242,7 +242,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -250,18 +250,18 @@
             Quantity: 10
 
 - type: entity
-  id: CigaretteBlackPepper
+  id: CigaretteFrezon
   parent: SoakedCigarette
-  name: English Spice
+  name: Atmospheric Adventure
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: Blackpepper
+          - ReagentId: Frezon
             Quantity: 10
 
 - type: entity
@@ -272,7 +272,7 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
@@ -280,77 +280,79 @@
             Quantity: 10
 
 - type: entity
-  id: CigaretteBread
+  id: CigaretteRadium
   parent: SoakedCigarette
-  name: Double Toasted
+  name: Ex Ray
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
+          - ReagentId: Radium
+            Quantity: 10
 
 - type: entity
-  id: CigaretteMilk
+  id: CigaretteHaloperidol
   parent: SoakedCigarette
-  name: Bovine Extract
+  name: Warm Bovine Extract
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: Milk
+          - ReagentId: Haloperidol
             Quantity: 10
 
 - type: entity
-  id: CigaretteBanana
+  id: CigaretteLaughter
   parent: SoakedCigarette
-  name: Clown Adjancency Bonus
+  name: Clown Adjacency Bonus
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: BananaHonk
+          - ReagentId: Laughter
             Quantity: 10
 
 - type: entity
-  id: CigaretteSpaceDrugs
+  id: CigaretteLipolicide
   parent: SoakedCigarette
-  name: 80's Power Hour
+  name: 80's Workout Routine
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: SpaceDrugs
+          - ReagentId: Lipolicide
             Quantity: 10
 
 - type: entity
-  id: CigaretteMuteToxin
+  id: CigaretteSodiumPolyacrylate
   parent: SoakedCigarette
-  name: Mixed Lozenges
+  name: Unhealthy Habits
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: MuteToxin
+          - ReagentId: SodiumPolyacrylate
-            Quantity: 2
+            Quantity: 10
 
 - type: entity
   id: CigaretteMold
@@ -360,12 +362,12 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Mold
-            Quantity: 2
+            Quantity: 10
 
 - type: entity
   id: CigaretteLicoxide
@@ -375,12 +377,12 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Licoxide
-            Quantity: 5
+            Quantity: 10
 
 - type: entity
   id: CigaretteWeldingFuel
@@ -390,24 +392,69 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: WeldingFuel
-            Quantity: 5
+            Quantity: 10
 
 - type: entity
-  id: CigaretteTHC
+  id: CigaretteRobustHarvest
   parent: SoakedCigarette
-  name: Hippy Romance Novel
+  name: Hippie Romance Novel
   components:
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 40
+        maxVol: 20
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: THC
+          - ReagentId: RobustHarvest
-            Quantity: 5
+            Quantity: 10
+
+- type: entity
+  id: CigarettePhlogiston
+  parent: SoakedCigarette
+  name: Dragon Dating Sim
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 10
+        - ReagentId: Phlogiston
+          Quantity: 10
+
+- type: entity
+  id: CigaretteBanana
+  parent: SoakedCigarette
+  name: Pun Pun's Tropical Getaway
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 10
+        - ReagentId: Potassium
+          Quantity: 10
+
+- type: entity
+  id: CigaretteBlackPepper
+  parent: SoakedCigarette
+  name: English Spice
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 10
+        - ReagentId: Blackpepper
+          Quantity: 10

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

@@ -119,10 +119,6 @@
   - type: Storage
     grid:
     - 0,0,4,1
-  - type: StorageFill
-    contents:
-    - id: CigaretteRandom
-      amount: 10
   - type: ItemCounter
     count:
       tags: [Cigarette]
@@ -195,34 +191,6 @@
     - id: CigaretteSyndicate
       amount: 10
 
-- type: entity
-  id: CigPackMixedMedical
-  parent: CigPackMixedBase
-  name: Dan's soaked smokes
-  suffix: Medical
-  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
@@ -234,52 +202,67 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-    - id: CigaretteBbqSauce
+      storagebase: !type:NestedSelector
-      prob: 0.70
+        rolls: !type:RangeNumberSelector
-    - id: CigaretteBlackPepper
+          range: 2, 9
-      prob: 0.70
+        tableId: RandomSoakedSmokeTable
-    - 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
+# Entity tables
-  id: CigPackMixedNasty
+
-  parent: CigPackMixedBase
+- type: entityTable
-  name: Dan's soaked smokes
+  id: RandomSoakedSmokeTable
-  suffix: Nasty
+  table: !type:GroupSelector
-  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+    children:
-  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
+      weight: 1
-    - id: CigarettePax
+    - id: CigaretteFrezon
-      prob: 0.10
+      weight: 1
-    - id: CigaretteMuteToxin
+    - id: CigarettePhlogiston
-      prob: 0.05
+      weight: 1
+    - id: CigaretteWeldingFuel
+      weight: 3
+    - id: CigaretteMold
+      weight: 3
+    - id: CigaretteRadium
+      weight: 3
+    - id: CigaretteOmnizine
+      weight: 4
+    - id: CigaretteTricordrazine
+      weight: 4
+    - id: CigaretteIron
+      weight: 4
+    - id: CigaretteDylovene
+      weight: 4
+    - id: CigaretteDermaline
+      weight: 4
+    - id: CigaretteArithrazine
+      weight: 4
+    - id: CigaretteBicaridine
+      weight: 4
+    - id: CigaretteDexalin
+      weight: 4
+    - id: CigaretteHaloperidol
+      weight: 6
+    - id: CigaretteLaughter
+      weight: 6
+    - id: CigaretteLipolicide
+      weight: 6
+    - id: CigaretteSodiumPolyacrylate
+      weight: 6
+    - id: CigaretteRobustHarvest
+      weight: 6
+    - id: CigaretteBanana
+      weight: 7
+    - id: CigaretteBlackPepper
+      weight: 7
+    - id: CigaretteCapsaicinOil
+      weight: 7
+    - id: CigaretteBbqSauce
+      weight: 7
+    - id: CigaretteNutriment
+      weight: 7
+    - id: CigaretteSaline
+      weight: 7
+

Resources/migration.yml

@@ -619,3 +619,14 @@ AirlockMaintIntLocked: AirlockMaintLocked
 # 2025-04-26
 ComputerCargoShuttle: ComputerShuttleCargo
 CargoShuttleComputerCircuitboard: CargoShuttleConsoleCircuitboard
+
+# 2025-05-02
+CigPackMixedNasty: CigPackMixed
+CigPackMixedMedical: CigPackMixed
+CigaretteIpecac: CigaretteNutriment
+CigarettePax: CigaretteSaline
+CigaretteTHC: CigaretteRobustHarvest
+CigaretteMuteToxin: CigaretteSodiumPolyacrylate
+CigaretteSpaceDrugs: CigaretteLipolicide
+CigaretteMilk: CigaretteHaloperidol
+CigaretteBread: CigaretteBbqSauce