diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 030756e360..14b76ccbf2 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -141,7 +141,7 @@ - id: CP14ModularGripIronLongGuard amount: 2 - id: CP14BaseLightCrossbow - - id: CP14Crossbolt + - id: CP14CrossboltIron amount: 5 - id: CP14EnergyCrystalSmall - id: CP14CrystalLampBlueEmpty diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index 6bdd81595b..a42e52c6cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -46,9 +46,9 @@ parent: CP14ClothingBeltQuiver id: CP14ClothingBeltQuiverCrossbolt categories: [ ForkFiltered ] - suffix: Full. Crossbolt + suffix: Full. Iron. Crossbolt components: - type: StorageFill contents: - - id: CP14Crossbolt + - id: CP14CrossboltIron amount: 32 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml index 6233a28559..f907b19273 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml @@ -13,10 +13,10 @@ - CP14CrossbowBolt - type: entity - id: CP14Crossbolt + id: CP14CrossboltIron parent: CP14BaseCrossbolt - name: crossbow bolt - description: Rod with a sharpened spike. No plumage, they're not bows. + name: iron crossbow bolt + description: Rod with a pointed spike in iron. No plumage, they're not bows. components: - type: Projectile deleteOnCollide: false @@ -30,4 +30,79 @@ - state: rod - state: solution1 map: ["enum.SolutionContainerLayers.Fill"] - visible: false \ No newline at end of file + visible: false + - type: CP14Material + materials: + CP14Iron: 3 + +- type: entity + id: CP14CrossboltGold + parent: CP14BaseCrossbolt + name: gold crossbow bolt + description: Rod with a pointed spike in gold. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#ffaf47" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Gold: 3 + +- type: entity + id: CP14CrossboltCopper + parent: CP14BaseCrossbolt + name: copper crossbow bolt + description: Rod with a pointed spike in copper. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#bd712f" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Copper: 3 + +- type: entity + id: CP14CrossboltMithril + parent: CP14BaseCrossbolt + name: mithril crossbow bolt + description: Rod with a pointed spike in mithril. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#45d2a4" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Mithril: 3 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 41fd1b4b53..903f6fb41e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -149,7 +149,7 @@ result: CP14ClothingOuterClothingCopperArmor - type: CP14Recipe - id: CP14Crossbolt + id: CP14CrossboltCopper tag: CP14RecipeAnvil craftTime: 1 requirements: @@ -158,7 +158,46 @@ count: 1 - !type:KnowledgeRequired knowledge: MetallForging - result: CP14Crossbolt + result: CP14CrossboltCopper + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltIron + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltIron + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltGold + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltGold + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltMithril + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltMithril resultCount: 3 - type: CP14Recipe diff --git a/Resources/migration.yml b/Resources/migration.yml index 3e62834fcf..b772e730f9 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -253,6 +253,10 @@ CP14WoodenClosetBankerFilled: CP14WoodenClosetMerchantFilled C14IronCabinet: CP14IronCabinet C14IronCabinetCargo: CP14IronCabinetCargo +#2025-17-02 +CP14Crossbolt: CP14CrossboltIron + + # <---> CrystallEdge migration zone end