Slots separate (#778)

* fix #67

* more all armor to new slot

* smart skeletons

Resources/Prototypes/InventoryTemplates/human_inventory_template.yml

@@ -19,8 +19,8 @@
       slotTexture: suit
       slotFlags: OUTERCLOTHING
       stripTime: 6
-      uiWindowPos: 1,1
-      strippingWindowPos: 1,2
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,1
       displayName: Suit
     - name: gloves
       slotTexture: gloves
@@ -37,8 +37,8 @@
     - name: mask
       slotTexture: mask
       slotFlags: MASK
-      uiWindowPos: 1,2
-      strippingWindowPos: 1,1
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,2
       displayName: Mask
     - name: eyes
       slotTexture: glasses

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml

@@ -22,110 +22,4 @@
   - type: Sprite
     sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakBrassArmor
-  name: brass armor
-  description: Quality brass armour, has good protection and is not too heavy.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Armor/brass_armor.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Armor/brass_armor.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.85
-        Slash: 0.85
-        Piercing: 0.95
-        Heat: 0.90
-        Caustic: 0.80
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.95
- 
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakCuirass
-  name: cuirass
-  description: Light armour plate on the chest, little protection, little heaviness.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.85
-        Slash: 0.90
-        Piercing: 0.90
-        Heat: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakInfantryCuirass
-  name: infantry cuirass
-  description: The light infantry cuirass, unlike the original, also protects from the back.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Armor/infantry_cuirass.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Armor/infantry_cuirass.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.85
-        Slash: 0.85
-        Piercing: 0.90
-        Heat: 0.90
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.96
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakCuirassLoincloth
-  name: cuirass loincloth
-  description: A heavier version of the cuirass, covering only the top of the legs.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass_loincloth.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass_loincloth.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.75
-        Slash: 0.80
-        Piercing: 0.85
-        Heat: 0.90
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.94
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakCuirassLeg
-  name: cuirass leg
-  description: A heavier cuirass that completely covers the legs.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass_leg.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Armor/cuirass_leg.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.80
-        Heat: 0.85
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.92
+    sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml

@@ -0,0 +1,13 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CP14ClothingOuterClothingBase
+  categories: [ ForkFiltered ]
+  components:
+  - type: Clothing
+    equipDelay: 2
+    unequipDelay: 2
+    slots:
+    - outerClothing
+  - type: Sprite
+    state: icon

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml

@@ -0,0 +1,105 @@
+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingCopperArmor
+  name: copper armor
+  description: Quality copper armour, has good protection and is not too heavy.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/brass_armor.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/brass_armor.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.95
+        Heat: 0.90
+        Caustic: 0.80
+  - type: ClothingSpeedModifier
+    walkModifier: 0.96
+    sprintModifier: 0.95
+ 
+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingCuirass
+  name: cuirass
+  description: Light armour plate on the chest, little protection, little heaviness.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/cuirass.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/cuirass.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.90
+        Piercing: 0.90
+        Heat: 0.95
+  - type: ClothingSpeedModifier
+    walkModifier: 0.98
+    sprintModifier: 0.98
+
+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingInfantryCuirass
+  name: infantry cuirass
+  description: The light infantry cuirass, unlike the original, also protects from the back.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/infantry_cuirass.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/infantry_cuirass.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.90
+        Heat: 0.90
+  - type: ClothingSpeedModifier
+    walkModifier: 0.97
+    sprintModifier: 0.96
+
+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingCuirassLoincloth
+  name: cuirass loincloth
+  description: A heavier version of the cuirass, covering only the top of the legs.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/cuirass_loincloth.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/cuirass_loincloth.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.75
+        Slash: 0.80
+        Piercing: 0.85
+        Heat: 0.90
+  - type: ClothingSpeedModifier
+    walkModifier: 0.96
+    sprintModifier: 0.94
+
+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingCuirassLeg
+  name: cuirass leg
+  description: A heavier cuirass that completely covers the legs.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/cuirass_leg.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/cuirass_leg.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.75
+        Slash: 0.75
+        Piercing: 0.80
+        Heat: 0.85
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.92

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -26,15 +26,16 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "shoes" ]
     - map: [ "shirt" ]
     - map: [ "pants" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
     - map: [ "enum.HumanoidVisualLayers.RHand" ]
     - map: [ "gloves" ]
     - map: [ "ears" ]
+    - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
     - map: [ "belt1" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml

@@ -24,17 +24,18 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "shoes" ]
     - map: [ "shirt" ]
     - map: [ "pants" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
     - map: [ "enum.HumanoidVisualLayers.RHand" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # Bark Before clothing
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ] # Bark Before clothing
     - map: [ "gloves" ]
     - map: [ "ears" ]
+    - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
     - map: [ "belt1" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml

@@ -18,15 +18,16 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "shoes" ]
     - map: [ "shirt" ]
     - map: [ "pants" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
     - map: [ "enum.HumanoidVisualLayers.RHand" ]
     - map: [ "gloves" ]
     - map: [ "ears" ]
+    - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
     - map: [ "belt1" ]
@@ -105,6 +106,7 @@
   - type: Inventory
     templateId: CP14Human
   - type: TransferMindOnGib
+  - type: CP14KnowledgeStorage
 
 - type: entity
   parent: CP14BaseSpeciesDummy

Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml

@@ -19,16 +19,17 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "shoes" ]
     - map: [ "shirt" ]
     - map: [ "pants" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
     - map: [ "enum.HumanoidVisualLayers.RHand" ]
     - map: [ "gloves" ]
     - map: [ "ears" ]
     - map: [ "cloak" ]
+    - map: [ "outerClothing" ]
     - map: [ "eyes" ]
     - map: [ "belt1" ]
     - map: [ "belt2" ]

Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml

@@ -60,10 +60,16 @@
       uiWindowPos: 2,1
       strippingWindowPos: 2,3
       displayName: Ring
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,1
+      displayName: Armor
     - name: cloak
       slotTexture: cloak
       slotFlags: CLOAK
-      uiWindowPos: 2,2
+      uiWindowPos: 2,3
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar

Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml

@@ -27,39 +27,39 @@
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
-  id: CP14ClothingCloakCuirass
+  id: CP14ClothingOuterClothingCuirass
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14IronBar: 5
-  result: CP14ClothingCloakCuirass
+  result: CP14ClothingOuterClothingCuirass
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
-  id: CP14ClothingCloakInfantryCuirass
+  id: CP14ClothingOuterClothingInfantryCuirass
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14IronBar: 6
-  result: CP14ClothingCloakInfantryCuirass
+  result: CP14ClothingOuterClothingInfantryCuirass
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
-  id: CP14ClothingCloakCuirassLoincloth
+  id: CP14ClothingOuterClothingCuirassLoincloth
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14IronBar: 6
-  result: CP14ClothingCloakCuirassLoincloth
+  result: CP14ClothingOuterClothingCuirassLoincloth
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
-  id: CP14ClothingCloakCuirassLeg
+  id: CP14ClothingOuterClothingCuirassLeg
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14IronBar: 7
-  result: CP14ClothingCloakCuirassLeg
+  result: CP14ClothingOuterClothingCuirassLeg
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
@@ -101,12 +101,12 @@
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe
-  id: CP14ClothingCloakBrassArmor
+  id: CP14ClothingOuterClothingCopperArmor
   tag: CP14RecipeAnvil
   craftTime: 2
   stacks:
     CP14CopperBar: 6
-  result: CP14ClothingCloakBrassArmor
+  result: CP14ClothingOuterClothingCopperArmor
   knowledgeRequired: MetallForging
 
 - type: CP14Recipe

Resources/Textures/_CP14/Clothing/OuterClothing/brass_armor.rsi/meta.json

@@ -11,7 +11,7 @@
             "name": "icon"
         },
         {
-            "name": "equipped-CLOAK",
+            "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
         {

Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-CLOAK",
+      "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-CLOAK",
+      "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-CLOAK",
+      "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-CLOAK",
+      "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
     {

Resources/migration.yml

@@ -217,7 +217,12 @@ CP14BaseBattleStaff: null
 CP14BaseTwoHandedSword: null
 CP14TwoHandedSwordScythe: null
 
-
+#2025-17-01
+CP14ClothingCloakBrassArmor: CP14ClothingOuterClothingCopperArmor
+CP14ClothingCloakCuirass: CP14ClothingOuterClothingCuirass
+CP14ClothingCloakInfantryCuirass: CP14ClothingOuterClothingInfantryCuirass
+CP14ClothingCloakCuirassLoincloth: CP14ClothingOuterClothingCuirassLoincloth
+CP14ClothingCloakCuirassLeg: CP14ClothingOuterClothingCuirassLeg
 # <---> CrystallEdge migration zone end