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 c36d4ea830..fd9cee09f4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml @@ -12,6 +12,20 @@ tags: - CP14CrossbowBolt +- type: entity + parent: BaseArrow + id: CP14BaseBigCrossbolt + categories: [ ForkFiltered ] + abstract: true + components: + - type: Item + size: Small + shape: + - 0,0,0,1 + - type: Tag + tags: + - CP14BigCrossbowBolt + - type: entity id: CP14CrossboltIron parent: CP14BaseCrossbolt @@ -106,3 +120,86 @@ - type: PhysicalComposition materialComposition: CP14Mithril: 3 + +- type: entity + id: CP14BigCrossboltIron + parent: CP14BaseBigCrossbolt + name: iron big crossbow bolt + description: A large rod without plumage, for large crossbows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 35 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: big_rod + - type: PhysicalComposition + materialComposition: + CP14Iron: 5 + +- type: entity + id: CP14BigCrossboltGold + parent: CP14BaseBigCrossbolt + name: gold big crossbow bolt + description: A large rod without plumage, for large crossbows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: big_rod + color: "#ffe269" + - type: PhysicalComposition + materialComposition: + CP14Gold: 5 + +- type: entity + id: CP14BigCrossboltCopper + parent: CP14BaseBigCrossbolt + name: copper big crossbow bolt + description: A large rod without plumage, for large crossbows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: big_rod + color: "#e28f08" + - type: PhysicalComposition + materialComposition: + CP14Copper: 5 + +- type: entity + id: CP14BigCrossboltMithril + parent: CP14BaseBigCrossbolt + name: mithril big crossbow bolt + description: A large rod without plumage, for large crossbows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 40 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: big_rod + color: "#38f0b3" + - type: PhysicalComposition + materialComposition: + CP14Mithril: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml index e8770c9cd6..60c6b8d329 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml @@ -7,7 +7,9 @@ - type: Sprite sprite: _CP14/Objects/Weapons/Ranged/bow.rsi - type: Item - size: Normal + size: Huge + shape: + - 0,0,1,3 - type: Clothing equipDelay: 0.45 unequipDelay: 0.45 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/crossbow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/crossbow.yml new file mode 100644 index 0000000000..b4c6ed1569 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/crossbow.yml @@ -0,0 +1,62 @@ +- type: entity + id: CP14BaseCrossbow + name: crossbow + parent: BaseItem + categories: [ ForkFiltered ] + description: The standard crossbow, is a great threat, although many may not find it convenient. But that kind of strength may be worth it. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/crossbow.rsi + layers: + - state: unwielded + map: [ base ] + - type: Item + size: Huge + shape: + - 0,0,1,3 + - type: Clothing + equipDelay: 0.45 + unequipDelay: 0.45 + sprite: _CP14/Objects/Weapons/Ranged/crossbow.rsi + quickEquip: false + breakOnMove: false + slots: + - neck + - type: Wieldable + - type: GunRequiresWield + - type: SpeedModifiedOnWield + walkModifier: 0.7 + sprintModifier: 0.7 + - type: UseDelay + delay: 3 + - type: Gun + fireRate: 0.3 + minAngle: 15 + maxAngle: 30 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + collection: BulletMiss + soundEmpty: null + - type: ItemSlots + slots: + projectiles: + name: Projectiles + startingItem: null + insertSound: /Audio/Weapons/Guns/Misc/arrow_nock.ogg + whitelist: + tags: + - CP14BigCrossbowBolt + - type: ContainerContainer + containers: + projectiles: !type:ContainerSlot + - type: ContainerAmmoProvider + container: projectiles + - type: Appearance + - type: ItemMapper + mapLayers: + unwielded-arrow: + whitelist: + tags: + - CP14BigCrossbowBolt diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 727eebc8e5..af67557339 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -162,6 +162,66 @@ result: CP14CrossboltMithril resultCount: 3 +- type: CP14Recipe + id: CP14BigCrossboltCopper + tag: CP14RecipeAnvil + category: Weapon + craftTime: 1 + requirements: + - !type:SkillRequired + skills: + - CopperMelting + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14BigCrossboltCopper + resultCount: 2 + +- type: CP14Recipe + id: CP14BigCrossboltIron + tag: CP14RecipeAnvil + category: Weapon + craftTime: 1 + requirements: + - !type:SkillRequired + skills: + - IronMelting + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14BigCrossboltIron + resultCount: 2 + +- type: CP14Recipe + id: CP14BigCrossboltGold + tag: CP14RecipeAnvil + category: Weapon + craftTime: 1 + requirements: + - !type:SkillRequired + skills: + - GoldMelting + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14BigCrossboltGold + resultCount: 2 + +- type: CP14Recipe + id: CP14BigCrossboltMithril + tag: CP14RecipeAnvil + category: Weapon + craftTime: 1 + requirements: + - !type:SkillRequired + skills: + - MithrilMelting + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14BigCrossboltMithril + resultCount: 2 + - type: CP14Recipe id: CP14BaseLockpick tag: CP14RecipeAnvil @@ -211,6 +271,23 @@ count: 1 result: CP14BaseLightCrossbow +- type: CP14Recipe + id: CP14BaseCrossbow + tag: CP14RecipeAnvil + category: Weapon + craftTime: 4 + requirements: + - !type:SkillRequired + skills: + - IronMelting + - !type:StackResource + stack: CP14IronBar + count: 5 + - !type:ProtoIdResource + protoId: CP14String + count: 2 + result: CP14BaseCrossbow + - type: CP14Recipe id: CP14ClothingMaskSteelMask tag: CP14RecipeAnvil diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 174eb7d7b5..d01219b63a 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -151,5 +151,8 @@ - type: Tag id: CP14EnergyCrystal +- type: Tag + id: CP14BigCrossbowBolt + - type: Tag id: CP14Sandwich diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/big_rod.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/big_rod.png new file mode 100644 index 0000000000..e19c9deb68 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/big_rod.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json index ad390e53d5..5caf4ef3a7 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "rod" }, + { + "name": "big_rod" + }, { "name": "solution1" } diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/equipped-NECK.png new file mode 100644 index 0000000000..9cdee405c4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-left.png new file mode 100644 index 0000000000..80e6acbb29 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-right.png new file mode 100644 index 0000000000..354120c4ae Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/meta.json new file mode 100644 index 0000000000..58403a0f05 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by lugzag (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unwielded" + }, + { + "name": "unwielded-arrow" + }, + { + "name": "wielded" + }, + { + "name": "wielded-arrow" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded-arrow.png new file mode 100644 index 0000000000..c7e170e163 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded.png new file mode 100644 index 0000000000..3966edae69 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/unwielded.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-arrow.png new file mode 100644 index 0000000000..70085b00a9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..ab3c36b133 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..7897b282b7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded.png new file mode 100644 index 0000000000..df636041e6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/crossbow.rsi/wielded.png differ