Prototypes work

Resources/Prototypes/_CP14/Catalog/Fills/crates.yml

@@ -0,0 +1,107 @@
+- type: entity
+  id: CP14SmallWoodenCrateFilled
+  parent: 
+  - CP14SmallWoodenCrate
+  suffix: Filled, Tools and Fluff
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: CP14StationCrateLootTools
+        rolls: !type:RangeNumberSelector
+          range: 1, 5
+
+- type: entity
+  id: CP14LargeWoodenCrateFilled
+  suffix: Filled, Tools and Fluff
+  parent: 
+  - CP14LargeWoodenCrate
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: CP14StationCrateLoot
+
+- type: entityTable
+  id: CP14StationCrateLoot
+  table: !type:AllSelector
+    children:
+    # Tools
+    - !type:NestedSelector
+      tableId: CP14StationCrateLootTools
+      rolls: !type:RangeNumberSelector
+        range: 1, 5
+    # Fluff
+    - !type:NestedSelector
+      tableId: CP14StationCrateLootFluff
+      prob: 0.33
+      rolls: !type:RangeNumberSelector
+        range: 0, 2
+
+- type: entityTable
+  id: CP14StationCrateLootTools
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: CP14Scissors
+      - id: CP14BaseCrowbar
+      - id: CP14BaseWrench
+      - id: CP14BaseShovel
+      - id: CP14BaseMop
+      - id: CP14BaseBroom
+      - id: CP14BasePickaxe
+      - id: CP14CrystalLampBlueEmpty
+      - id: CP14CrystalLampOrangeEmpty
+      - id: CP14Rope
+      - id: CP14Nail10
+      - id: CP14EnergyCrystalSmall
+      - id: CP14BaseSharpeningStone
+      - !type:NestedSelector
+        tableId: CP14RandomVials
+
+- type: entityTable
+  id: CP14StationCrateLootFluff
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: CP14ClothingCloakFurcapeBlack
+      - id: CP14ClothingCloakFurcapeBlue
+      - id: CP14ClothingCloakSimpleWhite
+      - id: CP14ClothingCloakSimpleDarkBlue
+      - id: CP14ClothingCloakRitualAttireLeather
+      - id: CP14ClothingHeadBeretMercenary
+      - id: CP14ClothingPantsMercenaryTrousers
+      - id: CP14ClothingPantsSouthernMagician
+      - id: CP14ClothingShirtMercenary
+      - id: CP14ClothingShirtYellowWizard
+
+
+- type: entityTable
+  id: CP14RandomVials
+  table: !type:GroupSelector
+    children:
+    - id: CP14VialSmall
+    - id: CP14VialTiny
+    - id: CP14GreenBottle
+    - id: CP14GreenBottle2
+    - id: CP14BlueBottle
+    - id: CP14OrangeBottle
+    - id: CP14RedBottle
+    #Common
+    - !type:GroupSelector
+      weight: 0.5
+      children:
+      - id: CP14VialSmallDayflin
+      - id: CP14VialSmallBlueAmanita
+      - id: CP14VialSmallWildSage
+      - id: CP14VialSmallGroundQuartz
+      - id: CP14VialSmallAgaricMushroom
+      - id: CP14VialSmallBloodFlowerSap
+    #Rare
+    - !type:GroupSelector
+      weight: 0.15
+      children:
+      - id: CP14VialTinyLumiMushroom
+      - id: CP14VialTinyChromiumSlime

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml

@@ -46,11 +46,7 @@
         - id: CP14SpellScrollEarthWall
         - id: CP14SpellScrollFlashLight
       - id: CP14EnergyCrystalSmall
-      - id: CP14Bucket
-      - id: CP14CrystalLampBlueEmpty
-      - id: CP14Scissors
       - id: CP14BaseSharpeningStone
-      - id: CP14Rope
       - id: CP14GlassShard
       - id: CP14Paper
     # Rare
@@ -67,10 +63,10 @@
         - id: CP14VialTinyChromiumSlime
         - id: CP14VialTinyLumiMushroom
       - id: CP14SilverCoin5
-      - id: CP14Nail10
       - id: CP14BaseLockpick
       - id: CP14EnergyCrystalMedium
       - id: CP14DemiplanKey
+        weight: 2
       - !type:AllSelector
         children:
         - id: CP14Crossbolt
@@ -90,29 +86,9 @@
         - id: CP14ClothingRingSphereOfLight
         - id: CP14ClothingRingFlashLight
         - id: CP14SpellScrollResurrection
-      - !type:GroupSelector
-        children:
-        - id: CP14ClothingCloakArmoredRed
-        - id: CP14ClothingCloakBlacksmithArpon
-        - id: CP14ClothingCloakMaidArpon
-        - id: CP14ClothingCloakBrassArmor
-        - id: CP14ClothingCloakCuirass
-        - id: CP14ClothingCloakInfantryCuirass
-        - id: CP14ClothingCloakCuirassLoincloth
-        - id: CP14ClothingCloakCuirassLeg
-        - id: CP14ClothingHeadCapellina
-      - !type:GroupSelector
-        children:
-        - id: CP14ClothingCloakFurcapeBlack
-        - id: CP14ClothingCloakFurcapeBlue
-        - id: CP14ClothingCloakSimpleWhite
-        - id: CP14ClothingCloakSimpleDarkBlue
-        - id: CP14ClothingCloakRitualAttireLeather
-        - id: CP14ClothingHeadBeretMercenary
-        - id: CP14ClothingPantsMercenaryTrousers
-        - id: CP14ClothingPantsSouthernMagician
-        - id: CP14ClothingShirtMercenary
-        - id: CP14ClothingShirtYellowWizard
+      # Rare standard village crates loot
+      - !type:NestedSelector
+        tableId: CP14StationCrateLoot
 
 - type: entityTable
   id: CP14TableBureaucracy

Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml

@@ -1,6 +1,6 @@
 #Base for future bottles
 - type: entity
-  name: Green Bottle
+  name: green Bottle
   parent: CP14BaseVialFragile
   id: CP14GreenBottle
   suffix: Empty
@@ -36,9 +36,9 @@
     fillBaseName: fill-
 
 - type: entity
-  name: Blue vial
+  name: blue bottle
   parent: CP14GreenBottle
-  id: CP14BlueVial
+  id: CP14BlueBottle
   description: A blue vial perfect for drinking whiskey.
   components:
   - type: Sprite
@@ -52,9 +52,9 @@
     fillBaseName: fill-
 
 - type: entity
-  name: Green vial
+  name: green bottle
   parent: CP14GreenBottle
-  id: CP14GreenVial
+  id: CP14GreenBottle2
   description: Just a little green vial.
   components:
   - type: Sprite
@@ -65,7 +65,7 @@
         maxVol: 15
 
 - type: entity
-  name: Orange bottle
+  name: orange bottle
   parent: CP14GreenBottle
   id: CP14OrangeBottle
   description: Just a orange bottle.
@@ -74,7 +74,7 @@
     sprite: _CP14/Objects/Consumable/Drinks/orange_bottle.rsi
 
 - type: entity
-  name: Red Bottle
+  name: red Bottle
   parent: CP14GreenBottle
   id: CP14RedBottle
   description: A red bottle perfect for drinking wine.

Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml

@@ -142,7 +142,6 @@
     maxFillLevels: 5
     fillBaseName: liq-
 
-
 # Filled small
 
 - type: entity
@@ -205,6 +204,18 @@
         - ReagentId: CP14BlueAmanita
           Quantity: 10
 
+- type: entity
+  id: CP14VialSmallDayflin
+  parent: CP14VialSmall
+  suffix: Dayflin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14YellowDayflinPulp
+          Quantity: 10
+
 # Filled tiny
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: CP14BaseCrowbar
-  parent: 
+  parent:
   - BaseItem
   - CP14BaseWeaponDestructible
   - CP14BaseWeaponChemical

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml

@@ -7,7 +7,10 @@
   description: Mop for cleaning floors from various unpleasant liquids
   components:
   - type: Item
-    size: Large
+    size: Normal
+    storedRotation: 0
+    shape:
+    - 0,0,0,2
     sprite: _CP14/Objects/Tools/mop.rsi
   - type: Sprite
     sprite: _CP14/Objects/Tools/mop.rsi
@@ -30,7 +33,7 @@
   - type: SolutionContainerManager
     solutions:
       absorbed:
-        maxVol: 100
+        maxVol: 50
 
 - type: entity
   id: CP14BaseBroom
@@ -41,7 +44,10 @@
   description: Sweeps up dried footprints and other stains from the floor
   components:
   - type: Item
-    size: Large
+    size: Normal
+    storedRotation: 0
+    shape:
+    - 0,0,0,2
     sprite: _CP14/Objects/Tools/broom.rsi
   - type: Sprite
     sprite: _CP14/Objects/Tools/broom.rsi

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml

@@ -0,0 +1,36 @@
+- type: entity
+  id: CP14BaseWrench
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  name: wrench
+  description: 'A common tool for assembly and disassembly. Remember: lefty latchy, righty removey.'
+  components:
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/wrench_drop.ogg
+  - type: Tag
+    tags:
+    - Wrench
+  - type: Sprite
+    sprite: Objects/Tools/wrench.rsi #TODO
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/wrench.rsi #TODO
+    storedSprite:
+      sprite: Objects/Tools/wrench.rsi #TODO
+      state: storage
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 2.5
+    soundHit:
+      collection: MetalThud
+  - type: Tool
+    qualities:
+      - Anchoring
+    useSound:
+      path: /Audio/Items/ratchet.ogg
+

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml

@@ -6,6 +6,8 @@
   components:
   - type: Item
     size: Tiny
+    shape:
+    - 0,0,0,0
   - type: Tag
     tags:
     - CP14CrossbowBolt

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml

@@ -11,7 +11,7 @@
     - state: unwielded
       map: [ base ]
   - type: Item
-    size: Small
+    size: Normal
   - type: Clothing
     equipDelay: 0.45
     unequipDelay: 0.45