Moff plushies Extended. Part 1. Attempt №2

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -108,6 +108,16 @@
   category: cargoproduct-category-name-fun
   group: market
 
+- type: cargoProduct
+  id: FunMoffPlushies
+  icon:
+    sprite: Objects/Fun/moff_plushie.rsi
+    state: moff
+  product: CrateFunMoffPlushieBulk
+  cost: 500
+  category: cargoproduct-category-name-fun
+  group: market
+
 - type: cargoProduct
   id: FunBoardGames
   icon:

Resources/Prototypes/Catalog/Fills/Crates/cargo.yml

@@ -299,9 +299,24 @@
     - id: PlushieSharkBlue
       prob: 0.01
       orGroup: Plushies
-    - id: PlushieMoth
+    - id: PlushieMoff
       prob: 0.01
       orGroup: Plushies
+    - id: PlushieMoffRainbow
+      prob: 0.005
+      orGroup: Plushies
+    - id: PlushieMoffsician
+      prob: 0.005
+      orGroup: Plushies
+    - id: PlushieMoffBar
+      prob: 0.005
+      orGroup: Plushies
+    - id: PlushieMoffBluespace
+      prob: 0.005
+      orGroup: Plushies
+    - id: PlushieMoffrror
+      prob: 0.005
+      orGroup: Plushies
     - id: PlushieArachind
       prob: 0.01
       orGroup: Plushies

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -36,10 +36,76 @@
     - id: PlushieDiona
     - id: PlushieXeno
     - id: PlushieHampter
-    - id: PlushieMoth
+    - !type:GroupSelector
+      children:
+      - id: PlushieMoff
+      - id: PlushieMoffMonarch
+      - id: PlushieMoffLuna
+      - id: PlushieMoffAtlas
+      - id: PlushieMoffRedish
+      - id: PlushieMoffRoyal
+      - id: PlushieMoffGothic
+      - id: PlushieMoffLovers
+      - id: PlushieMoffWhitefly
+      - id: PlushieMoffFirewatch
+      - id: PlushieMoffDeadhead
+      - id: PlushieMoffPoison
+      - id: PlushieMoffRagged
+      - id: PlushieMoffSnow
+      - id: PlushieMoffClockwork
+      - id: PlushieMoffMoonfly
+      - id: PlushieMoffWitchwing
+      - id: PlushieMoffPlasmafire
+      - id: PlushieMoffBrown
+      - id: PlushieMoffRosy
+      - id: PlushieMoffRainbow
+        weight: 0.5
+      - id: PlushieMoffsician
+        weight: 0.5
+      - id: PlushieMoffBar
+        weight: 0.5
+      - id: PlushieMoffBluespace
+        weight: 0.5
+      - id: PlushieMoffrror
+        weight: 0.25
     - id: PlushieArachind
     - id: PlushiePenguin
 
+- type: entityTable
+  id: AllMoffsPlushieTable
+  table: !type:GroupSelector
+    children:
+      - id: PlushieMoff
+      - id: PlushieMoffMonarch
+      - id: PlushieMoffLuna
+      - id: PlushieMoffAtlas
+      - id: PlushieMoffRedish
+      - id: PlushieMoffRoyal
+      - id: PlushieMoffGothic
+      - id: PlushieMoffLovers
+      - id: PlushieMoffWhitefly
+      - id: PlushieMoffFirewatch
+      - id: PlushieMoffDeadhead
+      - id: PlushieMoffPoison
+      - id: PlushieMoffRagged
+      - id: PlushieMoffSnow
+      - id: PlushieMoffClockwork
+      - id: PlushieMoffMoonfly
+      - id: PlushieMoffWitchwing
+      - id: PlushieMoffPlasmafire
+      - id: PlushieMoffBrown
+      - id: PlushieMoffRosy
+      - !type:GroupSelector #Rare plush
+        weight: 3
+        children:
+        - id: PlushieMoffRainbow
+        - id: PlushieMoffsician
+        - id: PlushieMoffBar
+        - id: PlushieMoffBluespace
+          weight: 0.5
+        - id: PlushieMoffrror
+          weight: 0.25
+
 - type: entity
   id: CrateFunPlushie
   parent: CrateGenericSteel
@@ -53,6 +119,19 @@
         rolls: !type:ConstantNumberSelector
           value: 10
 
+- type: entity
+  id: CrateFunMoffPlushieBulk
+  parent: CratePlastic
+  name: bulk moff plushie crate
+  description: A buncha soft moff plushies. Throw them around, eat them, play with them! And then wonder how you're gonna explain this purchase to NT... *chitters!*
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: AllMoffsPlushieTable
+        rolls: !type:ConstantNumberSelector
+          value: 7
+
 - type: entity
   id: CrateFunLizardPlushieBulk
   parent: CrateGenericSteel

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

@@ -18,6 +18,7 @@
         - PlushieAtmosian
         - PlushieNuke
         - PlushieLizard
+        - PlushieMoffRandom
         - PlushieNar
         - PlushieCarp
         - PlushieSlime

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -96,6 +96,8 @@
         orGroup: GiftPool
       - id: PlushieArachind
         orGroup: GiftPool
+      - id: PlushieMoffRandom #Squeaks!
+        orGroup: GiftPool
       - id: ClothingNeckCloakMoth
         orGroup: GiftPool
       - id: ToyMouse