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 0000000000..e007d000cf Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/icon.png new file mode 100644 index 0000000000..13b0c961eb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/meta.json similarity index 90% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/meta.json index 021ba28b91..440e28ba10 100644 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by Prazat", + "copyright": "Changed by Nimfa11", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/icon.png new file mode 100644 index 0000000000..f56b168131 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/icon.png new file mode 100644 index 0000000000..2ed0ab85bc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi/icon.png differ 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 0000000000..fd67fd52fa Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/icon.png new file mode 100644 index 0000000000..825cc396fe Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi/icon.png differ 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 0000000000..211e37e81c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png differ 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 0000000000..2e62062cd8 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/meta.json similarity index 66% rename from Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/meta.json index 021ba28b91..1b8697e691 100644 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi/meta.json @@ -13,14 +13,6 @@ { "name": "equipped-OUTERCLOTHING", "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..5443920f6f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/icon.png new file mode 100644 index 0000000000..85e6df73f5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi/icon.png differ 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 0000000000..5337bf9f4e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/equipped-OUTERCLOTHING.png differ 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 0000000000..6dd4c9f307 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/meta.json new file mode 100644 index 0000000000..1b8697e691 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png deleted file mode 100644 index 108aa439d8..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass.rsi/icon.png and /dev/null differ 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 e15293f9f5..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/equipped-OUTERCLOTHING.png and /dev/null differ 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 ca452a520f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_leg.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index b07d8398a7..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/icon.png deleted file mode 100644 index e92bdf63d5..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/cuirass_loincloth.rsi/icon.png and /dev/null 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 deleted file mode 100644 index 5a8ce6d78f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/icon.png and /dev/null 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 deleted file mode 100644 index b4c641189c..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-left.png and /dev/null 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 deleted file mode 100644 index 12ed535e52..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/infantry_cuirass.rsi/inhand-right.png and /dev/null differ 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