Clothing update (#231)

* added cotton shirts * pants update * add new cloaks * Update misc_startinggear.yml * glasses update * Update migration.yml * remove yellow hoodie helmet
2024-06-11 13:48:01 +03:00
parent 50470c3aaa
commit 36da152d73
63 changed files with 343 additions and 115 deletions
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml
@@ -46,7 +46,7 @@
  parent: CP14ClothingCloakBase
  id: CP14ClothingCloakFurcapeBlack
  name: furcape
-  description: Brutal woolen wool cape
+  description: Brutal woolen wool cape.
  components:
  - type: Sprite
    sprite: _CP14/Clothing/Cloak/furcape2.rsi
@@ -57,7 +57,7 @@
  parent: CP14ClothingCloakBase
  id: CP14ClothingCloakFurcapeBlue
  name: furcape
-  description: Brutal woolen wool cape
+  description: Brutal woolen wool cape.
  components:
  - type: Sprite
    sprite: _CP14/Clothing/Cloak/furcape.rsi
@@ -66,19 +66,22 @@

 - type: entity
  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakHoodieYellow
-  name: yellow short hooded cape
-  description: Protects your shoulders and head from the cold and the interest of the opposite sex.
+  id: CP14ClothingCloakSimpleWhite
+  name: white cloak
+  description: Long coat with a high collar.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi
+    sprite: _CP14/Clothing/Cloak/Simple/white.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi
-  - type: ToggleableClothing
-    clothingPrototype: CP14ClothingHeadHoodieYellow
-    requiredSlot:
-    - cloak
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
+    sprite: _CP14/Clothing/Cloak/Simple/white.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakSimpleDarkBlue
+  name: dark cloak
+  description: Long coat with a high collar.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml
@@ -14,21 +14,6 @@
    size: Small
    storedRotation: -90

- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadHoodieYellow
-  noSpawn: true
-  name: yellow hood
-  description: You gain +2 to stealth rolls against the attention of the opposite sex.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/yellowhoodie.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/yellowhoodie.rsi
-  - type: Tag
-    tags:
-    - HidesHair
-
 - type: entity
  parent: CP14ClothingHeadBase
  id: CP14ClothingHeadMetalHeadband
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml
@@ -13,14 +13,25 @@

 - type: entity
  parent: CP14ClothingPantsBase
-  id: CP14ClothingPantsHarlequinRed
-  name: red-and-yellow harlequin pants
-  description: Blood red on one side, sunny yellow on the other. The duality of life and death is always a good joke.
+  id: CP14ClothingPantsTrouserWhite
+  name: white trouser
+  description: Wide, loose pants made of plain canvas cloth.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Pants/harlequin.rsi
+    sprite: _CP14/Clothing/Pants/Trousers/white.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Pants/harlequin.rsi
+    sprite: _CP14/Clothing/Pants/Trousers/white.rsi
+
+- type: entity
+  parent: CP14ClothingPantsBase
+  id: CP14ClothingPantsTrouserDarkBlue
+  name: dark trouser
+  description: Wide, loose pants made of plain canvas cloth.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Pants/Trousers/dark_blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Pants/Trousers/dark_blue.rsi

 - type: entity
  parent: CP14ClothingPantsBase
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml
@@ -13,14 +13,69 @@

 - type: entity
  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtHarlequineRed
-  name: red harlequin shirt
-  description: It doesn't show the bloodstains that are left behind after bad jokes.
+  id: CP14ClothingShirtCottonBlue
+  name: cotton blue shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/harlequine_red.rsi
+    sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/harlequine_red.rsi
+    sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonBlueDark
+  name: cotton dark shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonPurple
+  name: cotton purple shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonRed
+  name: cotton red shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Cotton/red.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Cotton/red.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonWhite
+  name: cotton white shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Cotton/white.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Cotton/white.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonYellow
+  name: cotton yellow shirt
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi

 - type: entity
  parent: CP14ClothingShirtBase
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -25,8 +25,8 @@
      sprite: Mobs/Customization/masking_helpers.rsi
      state: unisex_full
      visible: false
-    - map: [ "pants" ]
    - map: [ "shirt" ]
+    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
    - map: [ "enum.HumanoidVisualLayers.LHand" ]
@@ -315,16 +315,8 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    #- shader: StencilClear
-    #  sprite: _CP14/Mobs/Species/Human/parts.rsi
-    #  state: l_leg
-    #- shader: StencilMask
-    #  map: [ "enum.HumanoidVisualLayers.StencilMask" ]
-    #  sprite: Mobs/Customization/masking_helpers.rsi
-    #  state: unisex_full
-    #  visible: false
-    - map: [ "pants" ]
    - map: [ "shirt" ]
+    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
    - map: [ "enum.HumanoidVisualLayers.LHand" ]
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml
@@ -1,40 +1,53 @@
 # Cloak
 - type: loadout
-  id: CP14HoodieYellow
-  equipment: CP14HoodieYellow
+  id: CP14ClothingCloakBlacksmithArpon
+  equipment: CP14ClothingCloakBlacksmithArpon

 - type: startingGear
-  id: CP14HoodieYellow
-  equipment:
-    cloak: CP14ClothingCloakHoodieYellow
-
- type: loadout
-  id: CP14BlacksmithArpon
-  equipment: CP14BlacksmithArpon
-
- type: startingGear
-  id: CP14BlacksmithArpon
+  id: CP14ClothingCloakBlacksmithArpon
  equipment:
    cloak: CP14ClothingCloakBlacksmithArpon

+
 - type: loadout
-  id: CP14FurcapeBlack
-  equipment: CP14FurcapeBlack
+  id: CP14ClothingCloakFurcapeBlack
+  equipment: CP14ClothingCloakFurcapeBlack

 - type: startingGear
-  id: CP14FurcapeBlack
+  id: CP14ClothingCloakFurcapeBlack
  equipment:
    cloak: CP14ClothingCloakFurcapeBlack

+
 - type: loadout
-  id: CP14FurcapeBlue
-  equipment: CP14FurcapeBlue
+  id: CP14ClothingCloakFurcapeBlue
+  equipment: CP14ClothingCloakFurcapeBlue

 - type: startingGear
-  id: CP14FurcapeBlue
+  id: CP14ClothingCloakFurcapeBlue
  equipment:
    cloak: CP14ClothingCloakFurcapeBlue

+
+- type: loadout
+  id: CP14ClothingCloakSimpleWhite
+  equipment: CP14ClothingCloakSimpleWhite
+
+- type: startingGear
+  id: CP14ClothingCloakSimpleWhite
+  equipment:
+    cloak: CP14ClothingCloakSimpleWhite
+
+
+- type: loadout
+  id: CP14ClothingCloakSimpleDarkBlue
+  equipment: CP14ClothingCloakSimpleDarkBlue
+
+- type: startingGear
+  id: CP14ClothingCloakSimpleDarkBlue
+  equipment:
+    cloak: CP14ClothingCloakSimpleDarkBlue
+
 # Eyes

 - type: loadout
@@ -91,51 +104,104 @@
 # Pants

 - type: loadout
-  id: CP14HarlequinRed
-  equipment: CP14HarlequinRed
+  id: CP14ClothingPantsTrouserWhite
+  equipment: CP14ClothingPantsTrouserWhite

 - type: startingGear
-  id: CP14HarlequinRed
+  id: CP14ClothingPantsTrouserWhite
  equipment:
-    pants: CP14ClothingPantsHarlequinRed
+    pants: CP14ClothingPantsTrouserWhite
+

 - type: loadout
-  id: CP14Aristocratic
-  equipment: CP14Aristocratic
+  id: CP14ClothingPantsTrouserDarkBlue
+  equipment: CP14ClothingPantsTrouserDarkBlue

 - type: startingGear
-  id: CP14Aristocratic
+  id: CP14ClothingPantsTrouserDarkBlue
+  equipment:
+    pants: CP14ClothingPantsTrouserDarkBlue
+
+
+- type: loadout
+  id: CP14ClothingPantsAristocratic
+  equipment: CP14ClothingPantsAristocratic
+
+- type: startingGear
+  id: CP14ClothingPantsAristocratic
  equipment:
    pants: CP14ClothingPantsAristocratic

+
 - type: loadout
-  id: CP14Loincloth
-  equipment: CP14Loincloth
+  id: CP14ClothingPantsLoincloth
+  equipment: CP14ClothingPantsLoincloth

 - type: startingGear
-  id: CP14Loincloth
+  id: CP14ClothingPantsLoincloth
  equipment:
    pants: CP14ClothingPantsLoincloth
    
 # Shirt

 - type: loadout
-  id: CP14ShirtHarlequineRed
-  equipment: CP14ShirtHarlequineRed
+  id: CP14ClothingShirtCottonBlue
+  equipment: CP14ClothingShirtCottonBlue

 - type: startingGear
-  id: CP14ShirtHarlequineRed
+  id: CP14ClothingShirtCottonBlue
  equipment:
-    shirt: CP14ClothingShirtHarlequineRed
+    shirt: CP14ClothingShirtCottonBlue
+

 - type: loadout
-  id: CP14ShirtSteampunk
-  equipment: CP14ShirtSteampunk
+  id: CP14ClothingShirtCottonBlueDark
+  equipment: CP14ClothingShirtCottonBlueDark

 - type: startingGear
-  id: CP14ShirtSteampunk
+  id: CP14ClothingShirtCottonBlueDark
  equipment:
-    shirt: CP14ClothingShirtSteampunk
+    shirt: CP14ClothingShirtCottonBlueDark
+
+
+- type: loadout
+  id: CP14ClothingShirtCottonPurple
+  equipment: CP14ClothingShirtCottonPurple
+
+- type: startingGear
+  id: CP14ClothingShirtCottonPurple
+  equipment:
+    shirt: CP14ClothingShirtCottonPurple
+
+
+- type: loadout
+  id: CP14ClothingShirtCottonRed
+  equipment: CP14ClothingShirtCottonRed
+
+- type: startingGear
+  id: CP14ClothingShirtCottonRed
+  equipment:
+    shirt: CP14ClothingShirtCottonRed
+
+
+- type: loadout
+  id: CP14ClothingShirtCottonWhite
+  equipment: CP14ClothingShirtCottonWhite
+
+- type: startingGear
+  id: CP14ClothingShirtCottonWhite
+  equipment:
+    shirt: CP14ClothingShirtCottonWhite
+
+
+- type: loadout
+  id: CP14ClothingShirtCottonYellow
+  equipment: CP14ClothingShirtCottonYellow
+
+- type: startingGear
+  id: CP14ClothingShirtCottonYellow
+  equipment:
+    shirt: CP14ClothingShirtCottonYellow

 # Shoes

--- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml
@@ -3,10 +3,11 @@
  name: cp14-loadout-test-cloak
  minLimit: 0
  loadouts:
-  - CP14HoodieYellow
-  - CP14BlacksmithArpon
-  - CP14FurcapeBlack
-  - CP14FurcapeBlue
+  - CP14ClothingCloakSimpleWhite
+  - CP14ClothingCloakSimpleDarkBlue
+  - CP14ClothingCloakBlacksmithArpon
+  - CP14ClothingCloakFurcapeBlack
+  - CP14ClothingCloakFurcapeBlue

 - type: loadoutGroup
  id: CP14TestEyes
@@ -41,16 +42,21 @@
  id: CP14TestPants
  name: cp14-loadout-test-pants
  loadouts:
-  - CP14HarlequinRed
-  - CP14Aristocratic
-  - CP14Loincloth
+  - CP14ClothingPantsTrouserWhite
+  - CP14ClothingPantsTrouserDarkBlue
+  - CP14ClothingPantsAristocratic
+  - CP14ClothingPantsLoincloth

 - type: loadoutGroup
  id: CP14TestShirt
  name: cp14-loadout-test-shirt
  loadouts:
-  - CP14ShirtSteampunk
-  - CP14ShirtHarlequineRed
+  - CP14ClothingShirtCottonWhite
+  - CP14ClothingShirtCottonBlue
+  - CP14ClothingShirtCottonBlueDark
+  - CP14ClothingShirtCottonPurple
+  - CP14ClothingShirtCottonRed
+  - CP14ClothingShirtCottonYellow

 - type: loadoutGroup
  id: CP14TestShoes
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml
@@ -1,9 +1,10 @@
 - type: startingGear
  id: CP14DeathMatchGear
  equipment:
-    shirt: CP14ClothingShirtHarlequineRed
-    pants: CP14ClothingPantsHarlequinRed
-    shoes: CP14ClothingShoesBlack
+    cloak: CP14ClothingCloakFurcapeBlue
+    shirt: CP14ClothingShirtCottonBlueDark
+    pants: CP14ClothingPantsLoincloth
+    shoes: CP14ClothingShoesSandals
  inhand:
    - CP14BaseDagger
    - CP14BaseDagger