diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/vampire_cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/vampire_cloak.yml index 4e633c581a..69dd52c8d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/vampire_cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/vampire_cloak.yml @@ -37,7 +37,7 @@ - type: entity parent: CP14ClothingCloakVampireBase id: CP14ClothingCloakVampireDevourers - name: сrimson vampire cloak + name: crimson vampire cloak description: A traditional vampire cloak worn by members of the Devourers clan. Hides the owner from prying eyes, granting invisibility. components: - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index c5761bac76..bf07fe4008 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -33,12 +33,15 @@ Blunt: 0.85 Slash: 0.80 Piercing: 0.90 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: CP14ClothingOuterClothingBase id: CP14ClothingOuterClothingFish name: fish suit - description: smells horible.... + description: Smells horible.... components: - type: Sprite sprite: _CP14/Clothing/OuterClothing/fish_suit.rsi @@ -53,3 +56,77 @@ - type: FactionClothing faction: CP14Fishies +- type: entity + parent: CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingChainmail + name: chainmail + description: Ringed armour made of many small metal rings. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/chainmail.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/chainmail.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.80 + Piercing: 0.90 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: CP14MagicManacostModify + globalModifier: 1.1 + - type: PhysicalComposition + materialComposition: + CP14Iron: 60 + +- 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.80 + Slash: 0.90 + Piercing: 0.80 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: CP14MagicManacostModify + globalModifier: 1.15 + - type: PhysicalComposition + materialComposition: + CP14Iron: 60 + +- type: entity + parent: CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingInfantryCuirass + name: infantry cuirass + description: Heavy armour for strong creatures. It is not easy to wear, but the protection is sometimes worth it. + 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.75 + Slash: 0.80 + Piercing: 0.75 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + - type: CP14MagicManacostModify + globalModifier: 1.2 + - type: PhysicalComposition + materialComposition: + CP14Iron: 90 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml index 1a328b7d72..2aabfc4dd3 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml @@ -164,4 +164,40 @@ service: !type:CP14BuyItemsService product: CP14BowCombat count: 1 - priceMarkup: 3 \ No newline at end of file + priceMarkup: 3 + +- type: cp14TradingPosition + id: CP14ClothingOuterClothingChainmail + faction: HelmirChild + uiPosition: 16 + priceMarkup: 3 + icon: + sprite: _CP14/Clothing/OuterClothing/chainmail.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingOuterClothingChainmail + count: 1 + +- type: cp14TradingPosition + id: CP14ClothingOuterClothingCuirass + faction: HelmirChild + uiPosition: 17 + priceMarkup: 3 + icon: + sprite: _CP14/Clothing/OuterClothing/cuirass.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingOuterClothingCuirass + count: 1 + +- type: cp14TradingPosition + id: CP14ClothingOuterClothingInfantryCuirass + faction: HelmirChild + uiPosition: 18 + priceMarkup: 3 + icon: + sprite: _CP14/Clothing/OuterClothing/infantry_cuirass.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingOuterClothingInfantryCuirass + count: 1 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..ffd50a91d6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/icon.png new file mode 100644 index 0000000000..af153e7511 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-left.png new file mode 100644 index 0000000000..b0da7a42f7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-right.png new file mode 100644 index 0000000000..3aab6bb55e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/meta.json new file mode 100644 index 0000000000..00755a6e08 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/chainmail.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Changed by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d92787d238 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png new file mode 100644 index 0000000000..dc21f92595 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-left.png new file mode 100644 index 0000000000..d7c85e7a33 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-right.png new file mode 100644 index 0000000000..45e77b3eac Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json new file mode 100644 index 0000000000..97fbf27b62 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, changed by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9f32e23966 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png new file mode 100644 index 0000000000..d6df52d175 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-left.png new file mode 100644 index 0000000000..f8d875bbe7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-right.png new file mode 100644 index 0000000000..45e77b3eac Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json new file mode 100644 index 0000000000..97fbf27b62 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, changed by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}