From 74fa1251c78c4f655c688aafd1ef2d96c3d9cd4f Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:24:10 +0200 Subject: [PATCH] Modular armour 1 (#936) * armor * fix * fix color * migra * + * * balance * caustic * presets * migr2 * plate * chainmail * fix speed * ehh * ehh2 * ehh3 * fix layers * mask craft --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Clothing/ClothingSpeedModifierSystem.cs | 4 +- .../Locale/en-US/_CP14/modularCraft/slots.ftl | 3 + .../Locale/ru-RU/_CP14/modularCraft/slots.ftl | 3 + .../_CP14/Entities/Clothing/Gloves/gloves.yml | 8 +- .../Entities/Clothing/Head/Produced/armor.yml | 10 +- .../_CP14/Entities/Clothing/Masks/masks.yml | 2 +- .../Clothing/ModularPresets/armour.yml | 119 +++++++++++++ .../ModularArmor/Breastplate/chainmail.yml | 117 ++++++++++++ .../ModularArmor/Breastplate/cuirass.yml | 166 ++++++++++++++++++ .../Breastplate/infantry_cuirass.yml | 151 ++++++++++++++++ .../ModularArmor/Cuisses/chainmail.yml | 70 ++++++++ .../ModularArmor/Cuisses/plate.yml | 85 +++++++++ .../ModularArmor/Greave/chainmail.yml | 70 ++++++++ .../ModularArmor/Greave/plate.yml | 82 +++++++++ .../Clothing/OuterClothing/test_armor.yml | 90 +--------- .../ModularCraft/Armor/Cuisses/chainmail.yml | 78 ++++++++ .../ModularCraft/Armor/Cuisses/plate.yml | 92 ++++++++++ .../ModularCraft/Armor/Greave/chainmail.yml | 79 +++++++++ .../_CP14/ModularCraft/Armor/Greave/plate.yml | 92 ++++++++++ .../ModularCraft/baseModularModifier.yml | 8 + .../Prototypes/_CP14/ModularCraft/slots.yml | 8 + .../_CP14/Recipes/Workbench/Anvil/misc.yml | 76 +++----- .../Workbench/Anvil/modular_breastplate.yml | 150 ++++++++++++++++ .../Workbench/Anvil/modular_cuisses.yml | 100 +++++++++++ .../Workbench/Anvil/modular_greave.yml | 100 +++++++++++ .../chainmail.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 691 bytes .../Chainmail/chainmail.rsi/icon.png | Bin 0 -> 356 bytes .../Chainmail/chainmail.rsi}/inhand-left.png | Bin .../Chainmail/chainmail.rsi}/inhand-right.png | Bin .../Chainmail/chainmail.rsi}/meta.json | 2 +- .../cuirass.rsi/equipped-OUTERCLOTHING.png | Bin .../Breastplate/Cuirass/cuirass.rsi/icon.png | Bin 0 -> 360 bytes .../Cuirass/cuirass.rsi}/inhand-left.png | Bin .../Cuirass/cuirass.rsi}/inhand-right.png | Bin .../Cuirass}/cuirass.rsi/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../Cuirass/infantry_cuirass.rsi/icon.png | Bin 0 -> 329 bytes .../infantry_cuirass.rsi}/inhand-left.png | Bin .../infantry_cuirass.rsi}/inhand-right.png | Bin .../Cuirass/infantry_cuirass.rsi}/meta.json | 0 .../chainmail.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 930 bytes .../Cuisses/Chainmail/chainmail.rsi/icon.png | Bin 0 -> 590 bytes .../Cuisses/Chainmail/chainmail.rsi/meta.json | 18 ++ .../cuirass.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 919 bytes .../Cuisses/Cuirass/cuirass.rsi/icon.png | Bin 0 -> 568 bytes .../Cuisses/Cuirass/cuirass.rsi}/meta.json | 8 - .../chainmail.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1172 bytes .../Greave/Chainmail/chainmail.rsi/icon.png | Bin 0 -> 543 bytes .../Greave/Chainmail/chainmail.rsi/meta.json | 18 ++ .../cuirass.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1110 bytes .../Greave/Cuirass/cuirass.rsi/icon.png | Bin 0 -> 522 bytes .../Greave/Cuirass/cuirass.rsi/meta.json | 18 ++ .../OuterClothing/cuirass.rsi/icon.png | Bin 386 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 1002 -> 0 bytes .../OuterClothing/cuirass_leg.rsi/icon.png | Bin 467 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 895 -> 0 bytes .../cuirass_loincloth.rsi/icon.png | Bin 495 -> 0 bytes .../infantry_cuirass.rsi/icon.png | Bin 358 -> 0 bytes .../infantry_cuirass.rsi/inhand-left.png | Bin 629 -> 0 bytes .../infantry_cuirass.rsi/inhand-right.png | Bin 644 -> 0 bytes Resources/migration.yml | 15 +- 61 files changed, 1684 insertions(+), 158 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/icon.png rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass.rsi => ModularArmor/Breastplate/Chainmail/chainmail.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass.rsi => ModularArmor/Breastplate/Chainmail/chainmail.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_loincloth.rsi => ModularArmor/Breastplate/Chainmail/chainmail.rsi}/meta.json (90%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{ => ModularArmor/Breastplate/Cuirass}/cuirass.rsi/equipped-OUTERCLOTHING.png (100%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/icon.png rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_leg.rsi => ModularArmor/Breastplate/Cuirass/cuirass.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_leg.rsi => ModularArmor/Breastplate/Cuirass/cuirass.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{ => ModularArmor/Breastplate/Cuirass}/cuirass.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{ => ModularArmor/Breastplate/Cuirass}/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png (100%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/icon.png rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_loincloth.rsi => ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_loincloth.rsi => ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/{cuirass_leg.rsi => ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/icon.png rename Resources/Textures/_CP14/Clothing/OuterClothing/{infantry_cuirass.rsi => ModularArmor/Cuisses/Cuirass/cuirass.rsi}/meta.json (66%) create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-right.png diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 8673e856a1..fc2099ba4e 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -123,8 +123,8 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem if (!Resolve(uid, ref component)) return; - component.WalkModifier += walkModifier; - component.SprintModifier += sprintModifier; + component.WalkModifier *= walkModifier; + component.SprintModifier *= sprintModifier; if (_container.TryGetContainingContainer((uid, null, null), out var container)) { diff --git a/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl index 9314098fe9..760bb41f7d 100644 --- a/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl +++ b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl @@ -3,3 +3,6 @@ cp14-modular-slot-garde = garde cp14-modular-slot-blade-inlay = blade inlay cp14-modular-slot-rod = rod cp14-modular-slot-arrow-tip = arrow tip + +cp14-modular-slot-cuisses = cuisses +cp14-modular-slot-greave = greave diff --git a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl index 62102a2d1c..859cdce5f2 100644 --- a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl +++ b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl @@ -3,3 +3,6 @@ cp14-modular-slot-garde = гарда cp14-modular-slot-blade-inlay = инкрустация лезвия cp14-modular-slot-rod = древко cp14-modular-slot-arrow-tip = наконечник стрелы + +cp14-modular-slot-cuisses = набедренник +cp14-modular-slot-greave = поножи diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index 01a9685c68..445f37c510 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -24,4 +24,10 @@ - type: Sprite sprite: _CP14/Clothing/Gloves/girdles.rsi - type: Clothing - sprite: _CP14/Clothing/Gloves/girdles.rsi \ No newline at end of file + sprite: _CP14/Clothing/Gloves/girdles.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.99 + Slash: 0.98 + Piercing: 0.99 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml index f2c8c4e2cf..4b15fde890 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml @@ -11,11 +11,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.95 + Blunt: 0.92 + Slash: 0.93 + Piercing: 0.96 - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 + walkModifier: 0.97 + sprintModifier: 0.97 - type: entity parent: CP14ClothingHeadBase @@ -32,6 +33,7 @@ coefficients: Blunt: 0.87 Slash: 0.91 + Piercing: 0.94 - type: ClothingSpeedModifier walkModifier: 0.95 sprintModifier: 0.95 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml index 5b039fc425..1af453ac4a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml @@ -16,7 +16,7 @@ - type: entity parent: CP14ClothingMaskBase id: CP14ClothingMaskSinner - name: Sinner's mask + name: sinner's mask description: A mask intented to be worn by not the brightest individuals. Executioners put them on themselves and the victim before execution. components: - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml b/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml new file mode 100644 index 0000000000..908d8754ae --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml @@ -0,0 +1,119 @@ +- type: entity + id: CP14ArmorIronCuirassPresets + parent: CP14ArmorIronCuirass + name: full iron cuirass + description: A full iron armour to protect its wearer from other sharp iron. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + state: icon + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - CuissesIronPlate + - GreaveIronPlate + +- type: entity + id: CP14ArmorGoldCuirassPresets + parent: CP14ArmorGoldCuirass + name: full golden cuirass + description: A full armour of purest gold, it is as expensive as it is uncomfortable, it is hard to imagine who would wear it and why. + components: + - type: Sprite + layers: + - state: icon + color: "#ffaf47" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + state: icon + color: "#ffaf47" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + state: icon + color: "#ffaf47" + - type: CP14ModularCraftAutoAssemble + details: + - CuissesGoldPlate + - GreaveGoldPlate + +- type: entity + id: CP14ArmorCopperCuirassPresets + parent: CP14ArmorCopperCuirass + name: full copper cuirass + description: Full copper armour, cheap and surly, some even find it more comfortable than iron armour. + components: + - type: Sprite + layers: + - state: icon + color: "#bd712f" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + state: icon + color: "#bd712f" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + state: icon + color: "#bd712f" + - type: CP14ModularCraftAutoAssemble + details: + - CuissesCopperPlate + - GreaveCopperPlate + +- type: entity + id: CP14ArmorMithrilCuirassPresets + parent: CP14ArmorMithrilCuirass + name: full mithril cuirass + description: Every adventurer's dream, mithril armour is strong, sturdy and almost unrestrictive to movement. If there's an ideal, this is it. + components: + - type: Sprite + layers: + - state: icon + color: "#45d2a4" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + state: icon + color: "#45d2a4" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + state: icon + color: "#45d2a4" + - type: CP14ModularCraftAutoAssemble + details: + - CuissesMithrilPlate + - GreaveMithrilPlate + +- type: entity + id: CP14ArmorIronСhainmailPresets + parent: CP14ArmorIronChainmail + name: full iron chainmail + description: Full iron ringed armour, lightweight and has decent protection. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + state: icon + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - CuissesIronChainmail + - GreaveIronChainmail + +- type: entity + id: CP14ArmorMithrilСhainmailPresets + parent: CP14ArmorMithrilChainmail + name: full mithril chainmail + description: A full mithril armour that may have been slowly and painstakingly assembled by dwarven smiths. A most valuable piece of work. + components: + - type: Sprite + layers: + - state: icon + color: "#45d2a4" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + state: icon + color: "#45d2a4" + - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + state: icon + color: "#45d2a4" + - type: CP14ModularCraftAutoAssemble + details: + - CuissesMithrilChainmail + - GreaveMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml new file mode 100644 index 0000000000..ca09ed5ed3 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml @@ -0,0 +1,117 @@ +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorIronChainmail + name: iron chainmail + description: Ringed armour made of many small metal rings. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.96 + Slash: 0.85 + Piercing: 0.96 + - type: ClothingSpeedModifier + walkModifier: 0.99 + sprintModifier: 0.99 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorIronChainmail + - type: CP14Material + materials: + CP14Iron: 40 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorGoldChainmail + name: golden chainmail + description: Ringed armour made of many small metal rings. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#ffaf47" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#ffaf47" + - type: Armor + modifiers: + coefficients: + Blunt: 0.98 + Slash: 0.92 + Piercing: 0.99 + - type: ClothingSpeedModifier + walkModifier: 0.98 + sprintModifier: 0.98 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorGoldChainmail + - type: CP14Material + materials: + CP14Gold: 40 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorCopperChainmail + name: copper chainmail + description: Ringed armour made of many small metal rings. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#bd712f" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#bd712f" + - type: Armor + modifiers: + coefficients: + Blunt: 0.98 + Slash: 0.90 + Piercing: 0.99 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorCopperChainmail + - type: CP14Material + materials: + CP14Copper: 40 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorMithrilChainmail + name: mithril chainmail + description: Ringed armour made of many small metal rings. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#45d2a4" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#45d2a4" + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.80 + Piercing: 0.95 + - type: ClothingSpeedModifier + walkModifier: 0.99 + sprintModifier: 0.99 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorMithrilChainmail + - type: CP14Material + materials: + CP14Mithril: 40 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml new file mode 100644 index 0000000000..e32de0891c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml @@ -0,0 +1,166 @@ +- type: entity + parent: CP14ClothingOuterClothingBase + id: CP14ModularArmorBase + abstract: true + categories: [ ForkFiltered ] + components: + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + - type: CP14LabeledRenaming + - type: CP14ModularCraftStartPoint + startSlots: + - Cuisses + - Greave + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorIronCuirass + name: iron cuirass + description: Light armour plate on the chest, little protection, little heaviness. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.87 + Slash: 0.95 + Piercing: 0.87 + Heat: 0.92 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorIronCuirass + - type: CP14Material + materials: + CP14Iron: 50 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorGoldCuirass + name: golden cuirass + description: Light armour plate on the chest, little protection, little heaviness. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#ffaf47" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#ffaf47" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#ffaf47" + right: + - state: inhand-right + color: "#ffaf47" + - type: Armor + modifiers: + coefficients: + Blunt: 0.94 + Slash: 0.98 + Piercing: 0.90 + Caustic: 0.90 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorGoldCuirass + - type: CP14Material + materials: + CP14Gold: 50 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorCopperCuirass + name: copper cuirass + description: Light armour plate on the chest, little protection, little heaviness. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#bd712f" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#bd712f" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#bd712f" + right: + - state: inhand-right + color: "#bd712f" + - type: Armor + modifiers: + coefficients: + Blunt: 0.92 + Slash: 0.99 + Piercing: 0.92 + Heat: 0.95 + - type: ClothingSpeedModifier + walkModifier: 0.98 + sprintModifier: 0.98 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorCopperCuirass + - type: CP14Material + materials: + CP14Copper: 50 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorMithrilCuirass + name: mithril cuirass + description: Light armour plate on the chest, little protection, little heaviness. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#45d2a4" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#45d2a4" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#45d2a4" + right: + - state: inhand-right + color: "#45d2a4" + - type: Armor + modifiers: + coefficients: + Blunt: 0.82 + Slash: 0.92 + Piercing: 0.82 + Heat: 0.84 + - type: ClothingSpeedModifier + walkModifier: 0.98 + sprintModifier: 0.98 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorMithrilCuirass + - type: CP14Material + materials: + CP14Mithril: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml new file mode 100644 index 0000000000..94f8a17c9b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml @@ -0,0 +1,151 @@ +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorIronInfantryCuirass + name: iron infantry cuirass + description: The light infantry cuirass, unlike the original, also protects from the back. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.84 + Slash: 0.94 + Piercing: 0.84 + Heat: 0.88 + - type: ClothingSpeedModifier + walkModifier: 0.93 + sprintModifier: 0.93 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorIronInfantryCuirass + - type: CP14Material + materials: + CP14Iron: 60 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorGoldInfantryCuirass + name: golden infantry cuirass + description: The light infantry cuirass, unlike the original, also protects from the back. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + layers: + - state: icon + color: "#ffaf47" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#ffaf47" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#ffaf47" + right: + - state: inhand-right + color: "#ffaf47" + - type: Armor + modifiers: + coefficients: + Blunt: 0.91 + Slash: 0.98 + Piercing: 0.88 + Caustic: 0.86 + - type: ClothingSpeedModifier + walkModifier: 0.88 + sprintModifier: 0.88 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorGoldInfantryCuirass + - type: CP14Material + materials: + CP14Gold: 60 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorCopperInfantryCuirass + name: copper infantry cuirass + description: The light infantry cuirass, unlike the original, also protects from the back. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + layers: + - state: icon + color: "#bd712f" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#bd712f" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#bd712f" + right: + - state: inhand-right + color: "#bd712f" + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.98 + Piercing: 0.90 + Heat: 0.92 + - type: ClothingSpeedModifier + walkModifier: 0.96 + sprintModifier: 0.96 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorCopperInfantryCuirass + - type: CP14Material + materials: + CP14Copper: 60 + +- type: entity + parent: CP14ModularArmorBase + id: CP14ArmorMithrilInfantryCuirass + name: mithril infantry cuirass + description: The light infantry cuirass, unlike the original, also protects from the back. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + layers: + - state: icon + color: "#45d2a4" + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#45d2a4" + - type: Item + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi + inhandVisuals: + left: + - state: inhand-left + color: "#45d2a4" + right: + - state: inhand-right + color: "#45d2a4" + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.89 + Piercing: 0.80 + Heat: 0.81 + - type: ClothingSpeedModifier + walkModifier: 0.96 + sprintModifier: 0.96 + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ArmorMithrilInfantryCuirass + - type: CP14Material + materials: + CP14Mithril: 60 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml new file mode 100644 index 0000000000..e42c8380b4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml @@ -0,0 +1,70 @@ +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesIronChainmail + name: iron chainmail cuisses + description: Ringed armour for the upper legs, the weight is virtually imperceptible. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - CuissesIronChainmail + - type: CP14Material + materials: + CP14Iron: 10 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesGoldChainmail + name: golden chainmail cuisses + description: Ringed armour for the upper legs, the weight is virtually imperceptible. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#ffaf47" + - type: CP14ModularCraftPart + possibleParts: + - CuissesGoldChainmail + - type: CP14Material + materials: + CP14Gold: 10 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesCopperChainmail + name: copper chainmail cuisses + description: Ringed armour for the upper legs, the weight is virtually imperceptible. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#bd712f" + - type: CP14ModularCraftPart + possibleParts: + - CuissesCopperChainmail + - type: CP14Material + materials: + CP14Copper: 10 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesMithrilChainmail + name: mithril chainmail cuisses + description: Ringed armour for the upper legs, the weight is virtually imperceptible. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#45d2a4" + - type: CP14ModularCraftPart + possibleParts: + - CuissesMithrilChainmail + - type: CP14Material + materials: + CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml new file mode 100644 index 0000000000..ff9d0145ad --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml @@ -0,0 +1,85 @@ +- type: entity + parent: BaseItem + id: CP14ModularCuissesBase + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + storedRotation: 0 + shape: + - 0,0,0,0 + - type: CP14ModularCraftStartPoint + startSlots: + - Greave + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesIronPlate + name: iron cuisses + description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - CuissesIronPlate + - type: CP14Material + materials: + CP14Iron: 20 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesGoldPlate + name: golden cuisses + description: Protects the top of the legs, protection is questionable, weight is decent. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#ffaf47" + - type: CP14ModularCraftPart + possibleParts: + - CuissesGoldPlate + - type: CP14Material + materials: + CP14Gold: 20 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesCopperPlate + name: copper cuisses + description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#bd712f" + - type: CP14ModularCraftPart + possibleParts: + - CuissesCopperPlate + - type: CP14Material + materials: + CP14Copper: 20 + +- type: entity + parent: CP14ModularCuissesBase + id: CP14ModularCuissesMithrilPlate + name: mithril cuisses + description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#45d2a4" + - type: CP14ModularCraftPart + possibleParts: + - CuissesMithrilPlate + - type: CP14Material + materials: + CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml new file mode 100644 index 0000000000..a6e7ba15d8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml @@ -0,0 +1,70 @@ +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveIronChainmail + name: iron chainmail greave + description: Ringed greaves, comfortable and even protects a bit. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - GreaveIronChainmail + - type: CP14Material + materials: + CP14Iron: 10 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveGoldChainmail + name: golden chainmail greave + description: Ringed greaves, comfortable and even protects a bit. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#ffaf47" + - type: CP14ModularCraftPart + possibleParts: + - GreaveGoldChainmail + - type: CP14Material + materials: + CP14Gold: 10 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveCopperChainmail + name: copper chainmail greave + description: Ringed greaves, comfortable and even protects a bit. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#bd712f" + - type: CP14ModularCraftPart + possibleParts: + - GreaveCopperChainmail + - type: CP14Material + materials: + CP14Copper: 10 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveMithrilChainmail + name: mithril chainmail greave + description: Ringed greaves, comfortable and even protects a bit. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + layers: + - state: icon + color: "#45d2a4" + - type: CP14ModularCraftPart + possibleParts: + - GreaveMithrilChainmail + - type: CP14Material + materials: + CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml new file mode 100644 index 0000000000..e04a96c303 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml @@ -0,0 +1,82 @@ +- type: entity + parent: BaseItem + id: CP14ModularGreaveBase + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + storedRotation: 0 + shape: + - 0,0,0,0 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveIronPlate + name: iron greave + description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - GreaveIronPlate + - type: CP14Material + materials: + CP14Iron: 20 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveGoldPlate + name: golden greave + description: Protects the lower part of the legs, also makes it difficult to move, though the use of gold as armour seems questionable. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#ffaf47" + - type: CP14ModularCraftPart + possibleParts: + - GreaveGoldPlate + - type: CP14Material + materials: + CP14Gold: 20 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveCopperPlate + name: copper greave + description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#bd712f" + - type: CP14ModularCraftPart + possibleParts: + - GreaveCopperPlate + - type: CP14Material + materials: + CP14Copper: 20 + +- type: entity + parent: CP14ModularGreaveBase + id: CP14ModularGreaveMithrilPlate + name: mithril greave + description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + layers: + - state: icon + color: "#45d2a4" + - type: CP14ModularCraftPart + possibleParts: + - GreaveMithrilPlate + - type: CP14Material + materials: + CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml index 47a19eb1a6..bee4c7d79b 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml @@ -12,94 +12,10 @@ modifiers: coefficients: Blunt: 0.90 - Slash: 0.85 + Slash: 0.92 Piercing: 0.95 - Heat: 0.90 - Caustic: 0.80 + Heat: 0.94 + Caustic: 0.90 - 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 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml new file mode 100644 index 0000000000..230bccb7df --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml @@ -0,0 +1,78 @@ +- type: modularPart + id: BaseCuissesChainmail + modifiers: + - !type:Inherit + copyFrom: + - BaseClothingArmor + +- type: modularPart + id: CuissesIronChainmail + slots: + - Cuisses + sourcePart: CP14ScrapIron + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.04 + Slash: -0.10 + Piercing: -0.01 + +- type: modularPart + id: CuissesGoldChainmail + slots: + - Cuisses + sourcePart: CP14ScrapGold + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.03 + - !type:EditClothingSpeed + walkModifier: 0.99 + sprintModifier: 0.99 + +- type: modularPart + id: CuissesCopperChainmail + slots: + - Cuisses + sourcePart: CP14ScrapCopper + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.05 + +- type: modularPart + id: CuissesMithrilChainmail + slots: + - Cuisses + sourcePart: CP14ScrapMithril + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.05 + Slash: -0.16 + Piercing: -0.03 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml new file mode 100644 index 0000000000..a9e17d7a15 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml @@ -0,0 +1,92 @@ +- type: modularPart + id: BaseCuissesPlate + modifiers: + - !type:Inherit + copyFrom: + - BaseClothingArmor + +- type: modularPart + id: CuissesIronPlate + slots: + - Cuisses + sourcePart: CP14ScrapIron + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesPlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.05 + Slash: -0.07 + Piercing: -0.07 + Heat: -0.05 + - !type:EditClothingSpeed + walkModifier: 0.94 + sprintModifier: 0.94 + +- type: modularPart + id: CuissesGoldPlate + slots: + - Cuisses + sourcePart: CP14ScrapGold + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesPlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.01 + Piercing: -0.05 + - !type:EditClothingSpeed + walkModifier: 0.94 + sprintModifier: 0.94 + +- type: modularPart + id: CuissesCopperPlate + slots: + - Cuisses + sourcePart: CP14ScrapCopper + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesPlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.03 + Slash: -0.03 + Piercing: -0.03 + Heat: -0.03 + - !type:EditClothingSpeed + walkModifier: 0.98 + sprintModifier: 0.98 + +- type: modularPart + id: CuissesMithrilPlate + slots: + - Cuisses + sourcePart: CP14ScrapMithril + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseCuissesPlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.10 + Slash: -0.10 + Piercing: -0.10 + Heat: -0.10 + - !type:EditClothingSpeed + walkModifier: 0.98 + sprintModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml new file mode 100644 index 0000000000..1dbc6516aa --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml @@ -0,0 +1,79 @@ +- type: modularPart + id: BaseGreaveChainmail + modifiers: + - !type:Inherit + copyFrom: + - BaseClothingArmor + +- type: modularPart + id: GreaveIronChainmail + slots: + - Greave + sourcePart: CP14ScrapIron + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGreaveChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.03 + Slash: -0.10 + Piercing: -0.01 + +- type: modularPart + id: GreaveGoldChainmail + slots: + - Greave + sourcePart: CP14ScrapGold + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreaveChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.04 + - !type:EditClothingSpeed + walkModifier: 0.99 + sprintModifier: 0.99 + +- type: modularPart + id: GreaveCopperChainmail + slots: + - Greave + sourcePart: CP14ScrapCopper + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreaveChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.06 + Piercing: -0.01 + +- type: modularPart + id: GreaveMithrilChainmail + slots: + - Greave + sourcePart: CP14ScrapMithril + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreaveChainmail + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.05 + Slash: -0.18 + Piercing: -0.02 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml new file mode 100644 index 0000000000..e80eb459b8 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml @@ -0,0 +1,92 @@ +- type: modularPart + id: BaseGreavePlate + modifiers: + - !type:Inherit + copyFrom: + - BaseClothingArmor + +- type: modularPart + id: GreaveIronPlate + slots: + - Greave + sourcePart: CP14ScrapIron + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGreavePlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.05 + Slash: -0.07 + Piercing: -0.07 + Heat: -0.05 + - !type:EditClothingSpeed + walkModifier: 0.96 + sprintModifier: 0.96 + +- type: modularPart + id: GreaveGoldPlate + slots: + - Greave + sourcePart: CP14ScrapGold + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreavePlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.01 + Slash: -0.01 + Piercing: -0.05 + - !type:EditClothingSpeed + walkModifier: 0.94 + sprintModifier: 0.94 + +- type: modularPart + id: GreaveCopperPlate + slots: + - Greave + sourcePart: CP14ScrapCopper + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreavePlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.03 + Slash: -0.03 + Piercing: -0.03 + Heat: -0.03 + - !type:EditClothingSpeed + walkModifier: 0.98 + sprintModifier: 0.98 + +- type: modularPart + id: GreaveMithrilPlate + slots: + - Greave + sourcePart: CP14ScrapMithril + rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseGreavePlate + - !type:EditArmor + modifiers: + coefficients: + Blunt: -0.10 + Slash: -0.10 + Piercing: -0.10 + Heat: -0.10 + - !type:EditClothingSpeed + walkModifier: 0.98 + sprintModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml index 47cbc5507c..ff4e2b9a99 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml @@ -90,3 +90,11 @@ - type: SolutionContainerVisuals maxFillLevels: 1 fillBaseName: solution + +- type: modularPart + id: BaseClothingArmor + modifiers: + - !type:AddComponents + components: + - type: Item + size: Small diff --git a/Resources/Prototypes/_CP14/ModularCraft/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/slots.yml index 8f0ba7a5f1..5bc9921390 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/slots.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/slots.yml @@ -17,3 +17,11 @@ - type: modularSlot id: ArrowTip name: cp14-modular-slot-arrow-tip + +- type: modularSlot + id: Cuisses + name: cp14-modular-slot-cuisses + +- type: modularSlot + id: Greave + name: cp14-modular-slot-greave diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 903f6fb41e..6656c73f7a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -49,54 +49,6 @@ knowledge: MetallForging result: CP14PlatePie -- type: CP14Recipe - id: CP14ClothingOuterClothingCuirass - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14IronBar - count: 5 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ClothingOuterClothingCuirass - -- type: CP14Recipe - id: CP14ClothingOuterClothingInfantryCuirass - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14IronBar - count: 6 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ClothingOuterClothingInfantryCuirass - -- type: CP14Recipe - id: CP14ClothingOuterClothingCuirassLoincloth - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14IronBar - count: 6 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ClothingOuterClothingCuirassLoincloth - -- type: CP14Recipe - id: CP14ClothingOuterClothingCuirassLeg - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14IronBar - count: 7 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ClothingOuterClothingCuirassLeg - - type: CP14Recipe id: CP14Nail20 tag: CP14RecipeAnvil @@ -139,15 +91,27 @@ - type: CP14Recipe id: CP14ClothingOuterClothingCopperArmor tag: CP14RecipeAnvil - craftTime: 2 + craftTime: 4 requirements: - !type:StackResource stack: CP14CopperBar - count: 6 + count: 4 - !type:KnowledgeRequired knowledge: MetallForging result: CP14ClothingOuterClothingCopperArmor +- type: CP14Recipe + id: CP14ClothingGlovesGirdles + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ClothingGlovesGirdles + - type: CP14Recipe id: CP14CrossboltCopper tag: CP14RecipeAnvil @@ -253,3 +217,15 @@ - !type:KnowledgeRequired knowledge: MetallForging result: CP14BaseLightCrossbow + +- type: CP14Recipe + id: CP14ClothingMaskSteelMask + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ClothingMaskSteelMask diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml new file mode 100644 index 0000000000..038472bb12 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml @@ -0,0 +1,150 @@ + +# Cuirass + +- type: CP14Recipe + id: CP14ArmorIronCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 5 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorIronCuirass + +- type: CP14Recipe + id: CP14ArmorGoldCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 5 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorGoldCuirass + +- type: CP14Recipe + id: CP14ArmorCopperCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 5 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorCopperCuirass + +- type: CP14Recipe + id: CP14ArmorMithrilCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 5 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorMithrilCuirass + +# Infantry cuirass + +- type: CP14Recipe + id: CP14ArmorIronInfantryCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 6 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorIronInfantryCuirass + +- type: CP14Recipe + id: CP14ArmorGoldInfantryCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 6 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorGoldInfantryCuirass + +- type: CP14Recipe + id: CP14ArmorCopperInfantryCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 6 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorCopperInfantryCuirass + +- type: CP14Recipe + id: CP14ArmorMithrilInfantryCuirass + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 6 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorMithrilInfantryCuirass + +# Chainmail + +- type: CP14Recipe + id: CP14ArmorIronChainmail + tag: CP14RecipeAnvil + craftTime: 8 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 4 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorIronChainmail + +- type: CP14Recipe + id: CP14ArmorGoldChainmail + tag: CP14RecipeAnvil + craftTime: 8 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 4 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorGoldChainmail + +- type: CP14Recipe + id: CP14ArmorCopperChainmail + tag: CP14RecipeAnvil + craftTime: 8 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 4 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorCopperChainmail + +- type: CP14Recipe + id: CP14ArmorMithrilChainmail + tag: CP14RecipeAnvil + craftTime: 8 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 4 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ArmorMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml new file mode 100644 index 0000000000..74458cdee3 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml @@ -0,0 +1,100 @@ + +# Cuirass + +- type: CP14Recipe + id: CP14ModularCuissesIronPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesIronPlate + +- type: CP14Recipe + id: CP14ModularCuissesGoldPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesGoldPlate + +- type: CP14Recipe + id: CP14ModularCuissesCopperPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesCopperPlate + +- type: CP14Recipe + id: CP14ModularCuissesMithrilPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesMithrilPlate + +# Chainmail + +- type: CP14Recipe + id: CP14ModularCuissesIronChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesIronChainmail + +- type: CP14Recipe + id: CP14ModularCuissesGoldChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesGoldChainmail + +- type: CP14Recipe + id: CP14ModularCuissesCopperChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesCopperChainmail + +- type: CP14Recipe + id: CP14ModularCuissesMithrilChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularCuissesMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml new file mode 100644 index 0000000000..0989eaf98e --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml @@ -0,0 +1,100 @@ + +# Cuirass + +- type: CP14Recipe + id: CP14ModularGreaveIronPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveIronPlate + +- type: CP14Recipe + id: CP14ModularGreaveGoldPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveGoldPlate + +- type: CP14Recipe + id: CP14ModularGreaveCopperPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveCopperPlate + +- type: CP14Recipe + id: CP14ModularGreaveMithrilPlate + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 2 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveMithrilPlate + +# Chainmail + +- type: CP14Recipe + id: CP14ModularGreaveIronChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveIronChainmail + +- type: CP14Recipe + id: CP14ModularGreaveGoldChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveGoldChainmail + +- type: CP14Recipe + id: CP14ModularGreaveCopperChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveCopperChainmail + +- type: CP14Recipe + id: CP14ModularGreaveMithrilChainmail + tag: CP14RecipeAnvil + craftTime: 6 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularGreaveMithrilChainmail diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e007d000cf7c160828b03550b036aa926763e3cf GIT binary patch literal 691 zcmV;k0!;mhP)Px%ZAnByRCt{2+D(hvKo|$`e_tq4Pw`SCt|TN&P`r2u6k&_t#Y_7Q`gz*#P6aa%8Ml{NK&4ZY1RVMtZj|4t8AAiB0sk6W&i+ZXFnhO&$gR^?=LYNo(t6}!Zd4v zqU7NF%LirQbJ6(1jSU;I>Cl}&RQ%_ne^8Vh)O-Q;`WraTDRj-icrp^LMw+7JP=9@b z@njUm)-?l8uPasG&Ub!Ov1A2mzJS%##gDI_p=$>E-8NQJ7izwc${qj!-P`q(eF=P06_NW7~WzI?|LTHh<*9~5>Bs+ zdZUFwrwu#<2AwvnMhi}_yY+PV8{u6uJPLh(867>cN05xiK81*gh=_=Yh=_=Yi2f(0 zSql!G1C&uLS%<$LP%K$N=EX~diHU9Z1Rg^?S@Zk$7iL$3z1t<-f%s@w%2jxad1?b< z+s#1D7jSXekDke9g%UUT-P`v;m?TYO5W>!fF~5EPk|>^Vb~w&7Ye76atL6(ys@qH0 z`7ox;dmkr!LnN+Ju3|hH!Me-V-ej^#s@sdVnB#Wh!fLGVB~;2)42S2^^(9&X0PbCp zNoxfFi0&sOm1qDiF8gqLUFe#T%It@3GTG=}P<$hlk$A(3=j+qR(Wf1ch=_=Yh=~40 Ze*iaeC~8OO{4oFk002ovPDHLkV1nLPx$9!W$&R9J=Wl(C9~KomvqF53)FB4 zZWU2U;8oSYHEhcy-%(1ywoL4{dl5$o@*=~0{r&qPX(=VZn1MJ-P}LPx$B1uF+R9J=Wl)Z1lFc8HbRfQ0W#F&Hz1PT%g%EG{sp-U(JZY0#LGZIxR8tkwT zA!TDQL&3HAsxQsZ!N1A5d%1hEeFiKRi^Wocq~nTd6bdyqjY5%hTyg84TRfC$-f|r5 zib9L;iUKXi0o4S_K+qk^;`6UfP0gv_s;*K4jd~M%FTShUdoddIrg6>M?-HHCU@S(_ zj|rYJEuZIGESGP_bswn)Mp29;c?M_ei(J1KV*WZK)gu`Qx0VK%%`h`QBCp~s+>13!=DUP0qF?%CY9@cFTAeFn5L`L z!0}?qN9KG4fp3$h7Z51%4xE@wUPPX6wHRgoEf$OA-*5ncgkEk1cY);q0000Px$14%?dR9J=Wl(7%NKorJ5B8}KsXo(OKAr^zBgTZl`T2V-03KIt+Y@-~Bx&td z2lK^DE1#BuMzbe8pTT1%m{wiV_lI2^=N_HxXTYpBVAd=Eh;JY&8pnjXdvug?=5-9b z@>)C%9~sC3trjF#uifgrkMY^t70tvzI9MWCOfnF-P#r)Z#eX1TJe~^9&rfGM`%e%A b@i*K7^)g|{5UN!&00000NkvXXu0mjfp7Di+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fd67fd52fa710fbedbf2041a1df14cd9e0ba093b GIT binary patch literal 930 zcmV;T16}-yP)Px&TuDShRCt{2nqN!XP#DIa#x0br=-RQR>C!)9S<#iD7Xc{J@0!?1AShAAP9mW2!gnu zyd(-i=EKmhWMxl{N> =s)58LM1B;Tg~>sYy9lO36DFtK-r(uqc|nm=V{?aQ2dCX0w?6j?_?;-Avc7@ilOtzr zv9N@#Z2&l$_`R@5CR3=aZ;Xv^ZEyNok1GLct|S1!@yQVu3ro&8ONN>&33{Uz*(q@A zPnze|=SqMgt5DJzcm=`6^+t_nNiN*_V{<7H@z-QlRZ1E>O)Unramrr$IV(mt!lH) zj#4bH*_u}MoC^!4q2@|MI%=+D|1UOzAP9mW2!bF8f*=Tj2tZyEefjWF<2NoY6Cp2& z!s{1F0JlCp0Q|YSirf~TL?tT=?l=J8?84--$$h&xtW)Fc!o;h$w|4cYcNZ0!Ruur? z*UwF`g7__hr_D7D&C6@Md3kNWS$!X?tZ$&-?_+-9WvtaYj`W{dO{)q@I)iuRRdjm5 z_k$mU=H<0-%|Lf~v|nJ7bsZ*3I)lZ+(oj!Ako5xDloQJErc+!|r@Bs{ub^H~!p z0Y+ON^5|z_kh(R(=t&541z0~0JC>39a(CSHx{jXF))BNPDR7I7rd4g$FA!ye6yr`q z0B(B)^hPaEL&nrsVAPOgDCrF1qGZit^9;RF8^lG)n)KG06l);77JX<(c9J6Px%2uVaiR9J=Wmcee?KoEw18_NO7? z^kRYBrfLPoh68LGQeq(+_mJ3X2o-A*sfYTzSoS}jncbZkEs&Fwlauq0;kNndY_H1i zl*{;ecb9%k-meDZWfotBmjoY9C}#HoX7>R^p@5xo8I_XA4Q_wMS^YAhY6ibAiTv4K zmH%6E`;y43nz2@22eTmn6h#S@<8urrbge#|P*jf3Q4}R+pP6gm-P`v_eb6nozf|S#T-RZimtCeGx^R`goMZdM2^fxGYS^-$ZRwtLgeW1;0TmXq15WItP7@b z%)A4XP5}UBqY2=l-TaXUx9@NO;`YgDs{11^wSScabiEZ5B15Uw(e2p)9*WH$yQxjG z_1&JGCaLSKcvCGfA3?I>WQ72d)u+!t^<*Gzg1HNlGxf)A8gLz|X2eQW1pst9ms{O8 ca{e!V1Hfa&6FqK)F#rGn07*qoM6N<$f?J;m82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/meta.json new file mode 100644 index 0000000000..a8f36b90d5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Changed by Nimfar11", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..211e37e81c43d07308fe58b33823b2708cdf1692 GIT binary patch literal 919 zcmV;I18Dq-P)Px&QAtEWRCt{2n%`^FP!z|%jT%ZUo2_V;nf@3H7If$;L`GmB^jZG{|2qEzefDWE zrUQqFNU>vEo2^z{gJUZtwv7+=FAHJxZ}KiM^0KhoY!Cg$PtPsh?YLRaWS|!AOdWLjb{}E%xg2oP zwTF+289~=KrVY3}hM!~NObN!;Hja)D-LbXO zI(GK};4pAqTx7F37+c#@?SsnE3 zF1G<;^n(r>Mt^PxXj;X|W^?ZS|MdAI%tkGx7Rt`Er_TY5qL3CPhc^v*^Z|_7;ME3l z-1>7n!0Y{<-G$kxr2w!`hh;)iS-|vxDH~kvF#24PQVV4Va1TBATwE}XNu8i^f*=Tj zAP9mW2!bF8f{1~lB!;TPCrwzpxZa-?B~f^AHw$1?rw4%FmzRl`#e*>Nvf#A?08Y;> zt}=P(7l^D=YuAJt@mGf}(MatOP zM!(<3((=93+1ZgZdv$npy(%axt9Y`piH;3?`1WPkytoRj8R;%h_6r1+uH!^mS;bmu zeXJ)T%6^f`abTMj-G@_SAg~7u(V9N zI?ObfUaM^)YEM$+78y;eIILeF$p$ILKMesuEDafRUjc6c(n~g*Lt2yu*Kv4;*{BWE zqBLOT@=1bh^&`?VK-a5|Wp$85Kfo;N^@EgUb)f6jME`e;;q|PhRU95qCxu!lJDOH; tyx)1&b4P9wYw?R{6G0FJK@h~k^B2v{jXYdy^ThxF002ovPDHLkV1nlIuRQ<& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2e62062cd8ad8d6db217ef627a9ed767f4696367 GIT binary patch literal 568 zcmV-80>}M{P)Px$@<~KNR9J=WRk3cTcL9PoTk`*@yHBu|6)R_qwm>BpzCI&u$ zwMz$k<4-3;9HCMdwT#}~L3@l>N{4Q9jfqwz1dw{8$0w~C`41B$Tv$NaV5QIJs z4?mJGBdINDx3}{ojVr=)XD?s8WkKlQ;G^giNgAW7>C=;wPb6)rAxzR3EyJAlp6uf2 zxPL1>r_-GVp^soB$eQE?+U@P!>2z^)+z01>RxcO{v<$O&j-pe{>nJIZ6G+k+LFmKj zbn)=PBLKkr5APs6R{@Z}e)R^x@68B8A4wXMbV&(ZKmB4;!gCeVvh&63mzn};4X>Y` z^9DF?6y^XRJXcB5xZs>lmz)B5229H?ez9}oRq9HVnBy1Ryv)_)l0vZn0000Px(PDw;TRCt{2nn7L*GwYw;`fl}niD^bpYfM#(z8b1pWSnbc{Uu80Xe0*CHC8Sk^!yu^x04Pcv+YcUIyIy*E zNF8b>7OhWmfHU=K_3GI6#@T6Lvmgk4QqV|lq>)Ud{M!;KBsbEO;m8D`A86G65Fot* zP89Zg3Pw{Owg<(u@n_K|IUu=_hS6#ag}m<@=NfCAosx~9>Q8E?>eC#MNMZM@uK@st z{wqo^583vEhe)PA1pt&vKa#|$c=c=bD(-A<&7~g}?Z~;tJ}-QMi}Q0l|KWSQJvqkm z@-p6@9HUmRLRnRyd=f|B4u^ETW|J);=%1V%qx9ksYisK$y*Na-`!|-tOEc*UZ-m?% z5Tn%?nf~camN^kPs11=@->WgnwrL2j0{L74rrCyRwh@iQM%tp0*sv|1D~JwBLQ&#F z4X=YMm7~7XMqLU?TVc*MHdp~Hqp71@J_vEH*@J80!L`6PLXRIkVdFF$+rIto8%;*X(pAyYS%W)t{$bB9TZW5{X12kw_#GiDV|ynJf#s4qz5$ zwTpCol+I*XG!lb5Jssp3pa|}w2-9q%+v|`{g-OTa?$cPu+ir*4lrx;0c5WCL%~E-7 zorLhAs3YXy2y(75CtsgTq!{&7mdfKtPuQK!EdWIfn$@Fdi=To()aJRCGo#gj(bUPJ^WfH4L`{NF z5F8g&2CoI1)^Cw?d!3=vCnZ8fZ4sIQlh)PUoxNev#O}_XC8RnByE}W9OK)sH(Y=81 zD===CRjXGKjl^*8?tSao{!`K6X6D)cQ{20I--^#_?5@{**XrA!R{TFQ?simaSIq0Ed=g>fwt|` z3t+I9aoa^H&>*G9oq@e|0;bu9=(@WIoSRpaIFgB!1t6>_aaJxL^r_V;%cUJ m%VDVUzgZ%YNF)-;2g!eBu|2E&*hEtR0000Px$*-1n}R9J=WmA_8oKoG`1Z>%Uz#k#pTvZ6yoielvokSrZ_3aaD{@^rkxQKzMG zK@))jL7-r4r??&dNC<(QP!L;$kh@(-hkue~X}{T-(eBJFkdu>>lk?rtR5#S?+wAe_ z0i|MjNlVv9qob*;zk+ITr`ZA#fpZgvVJv*{a}1~1LNYCALPRqepSnr{01!sO>wn@e zX{BO0(`8Y{|`1EmD4A2zH?6#x(h*ICd7o4M|fhf+S7N&@eBAN(_XDS>sM z)P_tiYJi3~j=?uf+}zNTO&A3TCqC|O|E|9cOT{w6i4P)?1$zsTz^Wm&mIOFAVO3fH zfa8{?@CuU%^}t5SvM^{1Sht6Y4ZZl@=mY`wnCWbKvTf_W_@ zX`y*uUvu5|40xS_VH6Z(?mk6%5D|$aExh!ui9{M4L?Th~r~Dj0K0N?1aeOksXmq3j hNdGg=&AFZ<&kMNDz35Z^$h`mn002ovPDHLkV1ll5_aFcO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/meta.json new file mode 100644 index 0000000000..a8f36b90d5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Changed by Nimfar11", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5337bf9f4e585303200d8adacf0178aa15559590 GIT binary patch literal 1110 zcmV-c1gZOpP)Px(5J^NqRCt{2n$K$+M-<1u8XF-C$L@+avedOm@Pd#LAv!DsK~6gLkQnMqeaK(e zzaTAXpe2_Yln_De#3vIO8Asif3f)O!;R@F)^$?A+UazEiE3HUiJ|HA!#`Asqc7A!@ z0~88{LZMJ76qC_&c{WY`w3udv8Ad5k!!SzBG%IBNMM~pDJPFgRuv+bTFUUB~9jZPF zyWIp3?C9>rIqdd1xz8B&4-BKkG%a7$7=4lhGHD%lyEzo{&o|Sou;%Fz*$ArsxO%ES%>nCK?ELr>0Km5X zLiObyE8l;BO!j*KK(+cONt}vbzj1PmJGVEd(qE8mXqpvvw|Ebovorku$8UIhcz~s) zCA>X6K;z^X+NuWayA*o;g_vbE`eaK8`iF-HsJ__4+S)BtU+kgV{TGW1i=p(T4?^Ap zh}~{p8UA`M&%_EG)q%*X@7EY-+a#oSfvrLjoIBv$K_Z^KQkRG)hjm+pqHLEWG%YpM z@H@C(-|vY!>Q+cP3Y%ty4R!$6Zds_+p2tkH(jSy949X%q2t9iEn2pj9w*B(!&m?`) zBFMSpdVXK|2H*~UlmEYv#co+H=MH`-Y~o|5gX;Tsth|x#uP!g+-4{C|(}$kR_r*u1 zJPQ43>JO6ojgtd!weWd5|ED=w_8=j8x4p0VfQUvD? zx)o}w@MTL++2%2VviFkcxJD ze9Z3L-URSDC!kil{-Aza#~~FNGK>0HyJaDYsF0VH z)wP(=>vYb*7UMC$T`Q|MW4G3FF~@05v_)#s(6m(Gyc!p;p9iCI0-C2sy`VIjAfy}+ zb@Edb$l5&Bc4oJmuv->cbQ-)Gv&c!1S_DTeDuZdkCbgR--HY>~)5iruWo?lf0ps@7 zo$cLW(!|d8t~;vTtk~J!bv=3`+sU2RfinY8XcefC7QyU;v+_5_)< z?k3{NvDsp>{Yf|Uhs1%;XMoplUSX?HbOE4V-;XXZIY4M^6^icbH?I(s9vfuqD5M=w zukZJ~dAf#CVuM@(*KS#J-6=SCV7DwJ;z^ft2Y$OK2^yi^m_JXzlQb3i2mroBfj#Gt z(76fZRN3-Iy8pN5ZFBC-?ZE{?FA-0Qlb*}DgYrfi)%R_ZEujtf#^UGgfUn60g+ifF cD86C-2QTU-Fyo&qt^fc407*qoM6N<$f(ud`x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd4c9f30707586412b03e210d0c7bbf6feb04d7 GIT binary patch literal 522 zcmV+l0`>igP)Px$#7RU!R9J=WmA_BIKorNnJsLupxGqxCG#W`78XPcbqBDaN{0IDX{s%gs{X+5EBy<6Z7AZL?`6)CG!69hEy`W zqRs5>_Vt)IUP3gvRVacn21->Zin8#8pCPP55uI zBb^uFEjT?nlaG&W42J^%z?0LBG@7BfyKkY{yb5{a39W!`m?Rv9V>uzivW})n)kuHr zJU~$t=!Qw0Zj0+b5Gp|1)1hT^007T@j*>3;Om(N*;)+Q`3Rq@2`8NEifL$QehD1(E zfP^p%K{G1)eYWD``7XSkgTd>|?%ObxOvCFrU@VA|&BIuLb%)eW3ZPVlmMsDRZf=_^ zx>YFtSlDlHp98jCCR#R!gZ;zE_SkuV=et;EZ#3!~TakMO7z@ByfQ!rXwLxvWOlH2k z2z3FaDyo$lsa9%4H_U~(x?vJ6n?s{fA5*HX3$Z=bN{zeNe7;0@{e|y>>Ax@nFxzLz zw#$>~g!J76&)&}vz6}`*Msx2APx$JV``BR9HvtlsOB+KoEr|eZT`jVC((DS}?n#6wthFF)*E6BJg^EZZpRce`C=3yM z^?;u@aMCkyxtw7>p9tM8RK#OM6QyF=-Lek*2g)+ycu?9vr`=_y*#K+5bA*?xg=-+2 z$-!_mfbqC5e6MgJs$d3;XcEj?9gKLw5hf#K28me5?RPRztu~nvivxB_izh&PXhM{N z6alY+XW|Z(zcoM^px^Kc|JO3W2N6wppP++ZB7h$~Lkb$^0pC2oM28Q5Mk<8w=K3e! gl>tRS5%8VB9bMs=A@JhHTL1t607*qoM6N<$f?&d-kN^Mx diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index e15293f9f55d9f45b1a2fb3c2019161ccefdda44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1002 zcmVPx&q)9|URCr$Pn!Sn?K@i7#13!>MIRnpKPfD>xp~#y-y8FN^mV94>uX9XK?#Hu_C)|d-!^y}1RzK! zAqjvK_A>xU1X4(_ihb8JRZ>u_02pyym>*K7Ky3RW09P*GDEj@2<@iU#FA6h1-U!{^ zf%3n>;E8(p=&q*W+-2{zp_&qya6p zVaN3?fP2#K0X6_yh0!{I-ue2wIrTaKL2%h1Kcw(Q0Bkb!Ni!rr>3vecv28!qkIhXr z_`KffADk=p%*?2F|8|R`5Bnkj`q!AgHq7`2!_ zX9dKh*~Y%I0@@h0m_BC(#H88AzOn+^7`2!_X9dKh*~Y%I0@@h0m_BC(NNLjMN6H$Y z)F-sB>X%3XFtT&|u5#;%u9Srk4hU?MQ9JAw|Ni?+RG?)8z}}y}8%xA>Aa%i@LDPT% zKv$&cs}Cd_fNQ_aELcc)WjRsS+hAunR0NUi4YB}$s7+dCu{8CzI6#=&@V0^|rK+ud zU;<|WfKi*g&3b*^05BL|oq&^)EC8;YYBB)sJTMUeGX+pOhl_JC?)Ee-QvQ);reE1k@FM zf1;)L8Ght}_9?!Nl;PG5`tXCb!K1njD=ve9H=`gL0E?WCb)iI(7K= YAG(ivUvTre_W%F@07*qoM6N<$f;^GWh5!Hn diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/icon.png deleted file mode 100644 index ca452a520f7cfee199df29b985a1e8975d76ec1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP)Px$jY&j7R9HvtRl!QbKoFf?M0%?iO)a8W5T#HQDiY93&-w>`oqwQbPl6N+Ed^18 ziXt_s7kd-&5_y3s(_}+tl~4*h$Jx!iH*aQNN;Kyv%^9B@0jGddz$xGquvVa6-;ch3 zzG!)=oN{r_4~KnqUG+tv0eo+_K@X4jRH>|_2uvoQ#OGQP)&u|yAat7ysKV!k5RfV` zcsLGbcz~Q193NUKfDg`2&m-SIp)h!lfnQ#qrv$b(x9PTXL*4GRx~}>nP-+`Hk+)hS z|LB;!>Us>!M3@W|2|q?OdV5mUR$by2Tdj8FtyKw~a!3W_ShOnqi+~9{R%INh$FNug zcn5e4S@IXQ1JVUyIHo6P>xO?C0p<)hOa@35wgXu&04kVXhISFv3P65zC;tI(J+|It z9(Og4Xhi@Z=oZl%+|8H`7WANbI30o3lGOxY!E){(Bh3aQ0w@Re;qvMtw|?%0hqBJR;T#Px&IY~r8RCr$PTHi|)Q53#HNZ3MbMP_Ll3ZWHIporj8Pd(Is&|lYoP!B!zBuFF_ zQ7M6v=9aEhORz~uF!2qXxZJt3d(Zvh?67BEWSx7@_nq&2b7$b35jEu3$dKo+L;!KX zkSidMz>ph24ncVYIFG>e*l4zQd{Qb}zxy04+gilGcCo3}_uB;yD^ugy*B>3#i=Qnf z%K<3}a6|$A!t|7S|NBf~+nsZN)#l!QS^jY}F6JcNTy?KuG;J?_TH0LX`V=mvRoiRd8{D z{sE+O(6JGR>jGy1^y-_H?sd;4IhQpy_fY{%S8`nFEC5J?1pe9pdfjtL&}9u_m>kOf z?-G+GfJ?x-tq}q0RP4qmgs`)$Ljb7PtxctjAD< z&I2*HLlP_jbdmrkz{|H*^IIt!qdGR4r1*XGaZO=j1ea}U#6?tZ0VudWFOa%B3{2_} z$C^n962P1nz?{Id=TC!T_N&_CM^7>&A8RHdh^*PKKTQXaP@$M2KtId%x^IrGY;Ju> z+8zfN^avN`Z|Agp$71xHf*gQABtlNeV?cphfY^A!0?^O`65%u@xryuRsTb%o5Mkmv z3jk1Cf;b4dE$NWtX)m?QZQmYcTy3~P0#ucJKM|4$K+ik5fUJL7wl8xH%?;3$C?|Qu zbans{2Px$sYygZR9Hvtmdi^5Q543H1QH^I71^jgBq4fiS_m;b1JwIu zo}9ZY(YHlGoMxf0=A}~O^mtyT+iq{*-MK{En_4MRyZu77+NtQvs@ifN znx8II6LGv~46wbm@7eYSxy^HGQzV*5^ z8cz^fF{lOkc_?#0ci`gkY~T+yLxti14DH`41l`Om(&FjfSx@UUjI3B3?R@YQWr!3Jcc>L@2*;a lNa8p~3@}jgzqAnnd;o-%^C2LeDOdmi002ovPDHLkV1m#T+5i9m diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png deleted file mode 100644 index 5a8ce6d78f8e95d2006542f773c63014c86db0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#`ZP)Px$AW1|)R9HvtmO%>vK@`WIi{!?IWfR#Fxi~0oadGAw_^3`wY7Z_VMI?6Dg`4EE zdRtG!Qg3M6)XZ^rX8ynV&3oI%AmR~=I3E;%GN2471ImE30mEo`*V_dW@nqmDPS01X zDSKb`L`=i*TD1=I#SBuZbO7LdJ^{VwLP!H(Fb3giUk6&D_n`oY7AV|t?I#X|@fn^QZ`?4ouie9LAT1E%6)dnq>_k#(9V9VAA(=aSW-5 zdpm2R7qg>4n|W_XY>tUxN0Nhxbaw;GmW|iUKfJ7AUYje@G~tk&h~grTGnvU&g0m-E z&e&kdKlAIeW3lBys>h8!pEv)1M{MS-&OgE3d+HW5Tw$Cjd_l0|4#O{@D}q4AoQ6J! zCu|p@9o!w<6^fYd^*Ll$+RED94PCeX6U(~R13z!hwEX<>XWl1~SkT`K9XlvnO9>gc@gW zINZE=%k8_yCtp|!_p*M`)A!k5?{}XSVo&TFsKK#I)Bf-y_i`*ke`okOtDtl7zGp#c`!g%9QVcSQs1?TqbO67_C;0=F~pEt>#u_1h+uGGAp zF^wS)W1in|Yw(^>BEzcSduMyiD~9`4N^9L^$>YQ*%|9LFc7g9f#3>FbhT}jc!-x4R zjJzceGHdLfB51V6yXcaSW-5 zdpm2R7qg>4n|W_XY>tUxN0Nhxbaw;GmW|iUKfJ7AUYjezr`X!7;p8%LMnF+LNF5hi^U1R#}oj>>gO*fygvh%?Ds0Y7TnG@Jq{2HPa3Yb5rozOj?D`3Hx z*LZ;Uz;cG|4BH(Zu_9jjX4nx=|Xj&=tN{yaQYXF2J$?wyMhIrtxWx4hF? zE7Xvgz4FOKv$Y(vpG!9I+R7*0WVBnesF$sbERLq_bv8Ah(oES0uMQkJ!?44~Ad$)O zHG@iFX+lyOLyXJ}1Hu0EEqo{by?JvAtia0PAOjDl&sC-qFE1Tv;bhhYs;x|LVn4{i qAlv%m_3Z;Kh77Wv;r9G;2lx|b#{}50sRaU)6@#a%pUXO@geCyv7!gGP diff --git a/Resources/migration.yml b/Resources/migration.yml index 7f7525a564..8ce8d08a02 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -150,10 +150,10 @@ CP14TwoHandedSwordScythe: null #2025-17-01 CP14ClothingCloakBrassArmor: CP14ClothingOuterClothingCopperArmor -CP14ClothingCloakCuirass: CP14ClothingOuterClothingCuirass -CP14ClothingCloakInfantryCuirass: CP14ClothingOuterClothingInfantryCuirass -CP14ClothingCloakCuirassLoincloth: CP14ClothingOuterClothingCuirassLoincloth -CP14ClothingCloakCuirassLeg: CP14ClothingOuterClothingCuirassLeg +CP14ClothingCloakCuirass: CP14ArmorIronCuirass +CP14ClothingCloakInfantryCuirass: CP14ArmorIronCuirass +CP14ClothingCloakCuirassLoincloth: CP14ArmorIronCuirass +CP14ClothingCloakCuirassLeg: CP14ArmorIronCuirass #2025-21-01 CP14PlateWooden: CP14Plate @@ -289,6 +289,13 @@ CP14IronDoorBankVault: null CP14BankStorageMarker: null CP14SpawnPointCommandant: null +#2025-07-03 +CP14ClothingOuterClothingCuirass: CP14ArmorIronCuirass +CP14ClothingOuterClothingInfantryCuirass: CP14ArmorIronCuirass +CP14ClothingOuterClothingCuirassLoincloth: CP14ArmorIronCuirass +CP14ClothingOuterClothingCuirassLeg: CP14ArmorIronCuirass + + # <---> CrystallEdge migration zone end