diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index e91a7fa4c7..6bdd81595b 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -30,3 +30,25 @@ - type: StorageContainerVisuals maxFillLevels: 3 fillBaseName: fill- + +- type: entity + parent: CP14ClothingBeltQuiver + id: CP14ClothingBeltQuiverArrow + categories: [ ForkFiltered ] + suffix: Full. Arrow + components: + - type: StorageFill + contents: + - id: CP14Arrow + amount: 16 + +- type: entity + parent: CP14ClothingBeltQuiver + id: CP14ClothingBeltQuiverCrossbolt + categories: [ ForkFiltered ] + suffix: Full. Crossbolt + components: + - type: StorageFill + contents: + - id: CP14Crossbolt + amount: 32 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml index af55b7e8bd..f2c8c4e2cf 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml @@ -13,6 +13,25 @@ coefficients: Blunt: 0.90 Slash: 0.95 + - type: ClothingSpeedModifier + walkModifier: 0.96 + sprintModifier: 0.96 + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadBascinet + name: bascinet + description: Protects most of the head, but the face is still not worth catching blows. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Produced/Armor/bascinet.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Produced/Armor/bascinet.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.87 + Slash: 0.91 - type: ClothingSpeedModifier walkModifier: 0.95 - sprintModifier: 0.95 \ No newline at end of file + sprintModifier: 0.95 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index dc13b14567..41fd1b4b53 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -185,6 +185,18 @@ knowledge: MetallForging result: CP14ClothingHeadCapellina +- type: CP14Recipe + id: CP14ClothingHeadBascinet + tag: CP14RecipeAnvil + craftTime: 5 + requirements: + - !type:StackResource + stack: CP14IronBar #Add skin as well? + count: 4 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ClothingHeadBascinet + - type: CP14Recipe id: CP14BaseLightCrossbow tag: CP14RecipeAnvil diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..fd42127258 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/icon.png new file mode 100644 index 0000000000..c96dc915c2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-left.png new file mode 100644 index 0000000000..23d5b65a9e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-right.png new file mode 100644 index 0000000000..ffd06ca251 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/meta.json new file mode 100644 index 0000000000..f67ae3f7c6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by MIXnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9848f8f6bf Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET_open.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET_open.png new file mode 100644 index 0000000000..0f92bb6251 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/equipped-HELMET_open.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon.png new file mode 100644 index 0000000000..61b810b153 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon_open.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon_open.png new file mode 100644 index 0000000000..ed916ff3d9 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/icon_open.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-left.png new file mode 100644 index 0000000000..3accbf7b66 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-right.png new file mode 100644 index 0000000000..ecb5b93ebc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/meta.json new file mode 100644 index 0000000000..6078080439 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_hunds.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by MIXnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET_open", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a8a62a2acc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/icon.png new file mode 100644 index 0000000000..6e67e999e5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-left.png new file mode 100644 index 0000000000..6c230c206d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-right.png new file mode 100644 index 0000000000..d5c2bf2bc7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/meta.json new file mode 100644 index 0000000000..f67ae3f7c6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/bascinet_mask.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by MIXnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}