Content pack (#83)

* content pack * d * update * Update meta.json * +2 clothing update * +more clothings * remove canvas * blacksmith arpon * +hairs and marking localization
2024-04-13 01:05:58 +03:00
parent 485873839b
commit 0f3ec01281
59 changed files with 434 additions and 57 deletions
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml
@@ -0,0 +1,62 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CPClothingCloakBase
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - cloak
+  - type: Sprite
+    state: icon
+
+- type: entity
+  parent: CPClothingCloakBase
+  id: CPClothingCloakArmoredRed
+  name: бронированная красная накидка
+  description: Огромные металлические наплечники дают дополнительную защиту от отрубания головы.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/redguardarmor.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/redguardarmor.rsi
+  - type: Armor #same as regular sec armor
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.80
+
+- type: entity
+  parent: 
+  - CPClothingCloakBase
+  - ClothingSlotBase
+  id: CPClothingCloakBlacksmithArpon
+  name: фартук кузнеца
+  description: Свободные кожанные полоски, все еще фактически являющиеся одеждой. 
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi
+
+- type: entity
+  parent: CPClothingCloakBase
+  id: CPClothingCloakHoodieYellow
+  name: желтый короткий плащ с капюшоном
+  description: Защищает ваши плечи и голову от холода и интереса противоположного пола.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi
+  - type: ToggleableClothing
+    clothingPrototype: CPClothingHeadHoodieYellow
+    requiredSlot:
+    - cloak
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml
@@ -0,0 +1,30 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CPClothingHeadBase
+  components:
+  - type: Clothing
+    equipDelay: 0.3
+    unequipDelay: 0.3
+    slots:
+    - HEAD
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Small
+    storedRotation: -90
+
+- type: entity
+  parent: CPClothingHeadBase
+  id: CPClothingHeadHoodieYellow
+  noSpawn: true
+  name: желтый капюшон
+  description: Вы получаете +2 к броскам скрытности от внимания противоположного пола.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/yellowhoodie.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/yellowhoodie.rsi
+  - type: Tag
+    tags:
+    - HidesHair
--- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml
@@ -1,30 +0,0 @@
- type: entity
-  abstract: true
-  parent: Clothing
-  id: CPClothingCloakBase
-  components:
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    slots:
-    - cloak
-  - type: Sprite
-    state: icon
-
- type: entity
-  parent: CPClothingCloakBase
-  id: CPClothingOuterArmoredCloak
-  name: бронированная накидка
-  description: Огромные металлические наплечники дают дополнительную защиту от отрубания головы.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi
-  - type: Armor #same as regular sec armor
-    modifiers:
-      coefficients:
-        Blunt: 0.70
-        Slash: 0.70
-        Piercing: 0.70
-        Heat: 0.80
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml
@@ -0,0 +1,23 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CPClothingPantsBase
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - pants
+  - type: Sprite
+    state: icon
+    
+- type: entity
+  parent: CPClothingPantsBase
+  id: CPClothingPantsHarlequinRed
+  name: красно-желтые штаны арлекина
+  description: С одной стороны кроваво красные, с другой стороны солнечно желтые. Дуальность жизни и смерти всегда хороший повод для шуток.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Pants/harlequin.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Pants/harlequin.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml
@@ -0,0 +1,24 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CPClothingShirtBase
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - shirt
+  - type: Sprite
+    state: icon
+     
+- type: entity
+  parent: CPClothingShirtBase
+  id: CPClothingShirtHarlequineRed  
+  name: красная рубаха арлекина
+  description: На ней не видно пятен крови, которые остаются после неудачных шуток.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/harlequine_red.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/harlequine_red.rsi
+     
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml
@@ -0,0 +1,25 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CPClothingShoesBase
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - FEET
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Normal
+    
+- type: entity
+  parent: CPClothingShoesBase
+  id: CPClothingShoesBlack
+  name: простые черные ботинки
+  description: Влагу они не удержат, но это лучше чем ходить босиком.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shoes/black.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shoes/black.rsi
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml
@@ -20,4 +20,12 @@
  markingCategory: FacialHair
  sprites:
    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: dwarf
+      state: dwarf
+
+- type: marking
+  id: CPHumanFacialHairGoateeMush
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: goateemush
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -78,6 +78,14 @@
    - sprite: _CP14/Mobs/Customization/human_hair.rsi
      state: braid
      
+- type: marking
+  id: CPHumanHairCrazyBald
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: crazybald
+      
 - type: marking
  id: CPHumanHairBigDoubleBun
  bodyPart: Hair
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
@@ -10,7 +10,10 @@
 - type: startingGear
  id: CPTestGear
  equipment:
-    cloak: CPClothingOuterArmoredCloak
+    cloak: CPClothingCloakHoodieYellow
+    shirt: CPClothingShirtHarlequineRed
+    pants: CPClothingPantsHarlequinRed
+    shoes: CPClothingShoesBlack
  innerClothingSkirt: ClothingUniformJumpskirtCargo
  satchel: ClothingBackpackSatchelCargoFilled
  duffelbag: ClothingBackpackDuffelCargoFilled
--- a/Resources/Prototypes/_CP14/Tiles/natural.yml
+++ b/Resources/Prototypes/_CP14/Tiles/natural.yml
@@ -1,8 +1,36 @@
 - type: tile
-  id: FloorPlanetGrassCP
-  name: травяной покров
-  sprite: /Textures/_CP14/Tiles/Grass/grass.png
-  variants: 8
+  id: CPFloorPlanetGrass
+  name: cp-tiles-planet-grass
+  sprite: /Textures/Tiles/Planet/Grass/grass.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 1
+  edgeSprites:
+    SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
+    NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
+    NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png
+    SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png
+    South: /Textures/Tiles/Planet/Grass/double_edge.png
+    East: /Textures/Tiles/Planet/Grass/double_edge.png
+    North: /Textures/Tiles/Planet/Grass/double_edge.png
+    West: /Textures/Tiles/Planet/Grass/double_edge.png
+  baseTurf: CPFloorPlanetDirt
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepGrass
+  heatCapacity: 10000
+  weather: true
+  indestructible: true
+
+- type: tile
+  id: CPFloorPlanetStone
+  name: cp-tiles-planet-stone
+  sprite: /Textures/_CP14/Tiles/cave.png
+  variants: 14
  placementVariants:
  - 1.0
  - 1.0
@@ -12,20 +40,46 @@
  - 1.0
  - 1.0
  - 1.0
-  edgeSpritePriority: 1
-  edgeSprites:
-    SouthEast: /Textures/_CP14/Tiles/Grass/single_edge.png
-    NorthEast: /Textures/_CP14/Tiles/Grass/single_edge.png
-    NorthWest: /Textures/_CP14/Tiles/Grass/single_edge.png
-    SouthWest: /Textures/_CP14/Tiles/Grass/single_edge.png
-    South: /Textures/_CP14/Tiles/Grass/double_edge.png
-    East: /Textures/_CP14/Tiles/Grass/double_edge.png
-    North: /Textures/_CP14/Tiles/Grass/double_edge.png
-    West: /Textures/_CP14/Tiles/Grass/double_edge.png
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
  baseTurf: FloorPlanetGrass
  isSubfloor: true
  footstepSounds:
-    collection: FootstepGrass
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+  indestructible: true
+
+- type: tile
+  id: CPFloorPlanetDirt
+  name: cp-tiles-planet-dirt
+  sprite: /Textures/_CP14/Tiles/cavedrought.png
+  variants: 16
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: FloorPlanetGrass
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepAsteroid
  heatCapacity: 10000
  weather: true
  indestructible: true