diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index 2cb26219ad..e91a7fa4c7 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -6,7 +6,7 @@ categories: [ ForkFiltered ] components: - type: Sprite - sprite: Clothing/Belt/quiver.rsi + sprite: _CP14/Clothing/Belt/quiver.rsi layers: - state: icon - map: [ "enum.StorageContainerVisualLayers.Fill" ] @@ -25,6 +25,7 @@ whitelist: tags: - CP14CrossbowBolt + - CP14Arrow - type: Appearance - type: StorageContainerVisuals maxFillLevels: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml new file mode 100644 index 0000000000..e2fc06b480 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml @@ -0,0 +1,31 @@ +- type: entity + parent: BaseArrow + id: CP14BaseArrow + categories: [ ForkFiltered ] + abstract: true + components: + - type: Tag + tags: + - CP14Arrow + +- type: entity + id: CP14Arrow + parent: CP14BaseArrow + name: arrow + description: Wooden rod with iron tip and plumage. Simple and dangerous. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi + layers: + - state: tail + - state: rod + - state: tip + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml new file mode 100644 index 0000000000..3138c4af1e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml @@ -0,0 +1,80 @@ +- type: entity + parent: BaseItem + id: CP14BaseBow + abstract: true + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/bow.rsi + - type: Item + size: Normal + - type: Clothing + equipDelay: 0.45 + unequipDelay: 0.45 + sprite: _CP14/Objects/Weapons/Ranged/bow.rsi + quickEquip: false + breakOnMove: false + slots: + - neck + - type: Wieldable + wieldSound: + path: /Audio/Items/bow_pull.ogg + - type: UseDelay + delay: 1 + - type: GunRequiresWield + - type: Gun + minAngle: 0 + maxAngle: 5 + fireRate: 1 + 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: + - CP14Arrow + - type: ContainerContainer + containers: + projectiles: !type:ContainerSlot + - type: ContainerAmmoProvider + container: projectiles + +- type: entity + name: combat bow + description: A standard ranged weapon, and even without magic. + id: CP14BowCombat + parent: CP14BaseBow + components: + - type: Sprite + layers: + - state: unwielded + map: [ base ] + - state: unwielded-arrow + map: [ arrow ] + visible: false + - type: Appearance + - type: ItemMapper + spriteLayers: + - arrow + mapLayers: + arrow: + whitelist: + tags: + - CP14Arrow + - type: GenericVisualizer + visuals: + enum.WieldableVisuals.Wielded: + arrow: + True: { state: wielded-arrow } + False: { state: unwielded-arrow } + base: + True: { state: wielded } + False: { state: unwielded } diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 22b42e7671..4284d5ebc9 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -78,3 +78,6 @@ - type: Tag id: CP14SpellScroll + +- type: Tag + id: CP14Arrow diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..35f68e3208 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-1.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-1.png new file mode 100644 index 0000000000..ee8ce2b2f5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-1.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-2.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-2.png new file mode 100644 index 0000000000..0d2d4a1849 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-3.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-3.png new file mode 100644 index 0000000000..9db05ae0e6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/fill-3.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/icon.png new file mode 100644 index 0000000000..b2e306cb9b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json new file mode 100644 index 0000000000..3150579e54 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by discord: odlieerr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-left.png new file mode 100644 index 0000000000..9e7a633a0f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-right.png new file mode 100644 index 0000000000..ac19bffbbd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json new file mode 100644 index 0000000000..2a98eafa31 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by odlieerr (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tail" + }, + { + "name": "rod" + }, + { + "name": "tip" + }, + { + "name": "solution1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png new file mode 100644 index 0000000000..1b934c3201 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/solution1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/solution1.png new file mode 100644 index 0000000000..20e77e7f1f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/solution1.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png new file mode 100644 index 0000000000..96195c746f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png new file mode 100644 index 0000000000..bf5ae60899 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/equipped-NECK.png new file mode 100644 index 0000000000..5184e09047 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-left.png new file mode 100644 index 0000000000..60419a8d94 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-right.png new file mode 100644 index 0000000000..f178d00405 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/meta.json new file mode 100644 index 0000000000..9d31d94d6b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by discord: odlieerr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unwielded" + }, + { + "name": "unwielded-arrow" + }, + { + "name": "wielded" + }, + { + "name": "wielded-arrow" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded-arrow.png new file mode 100644 index 0000000000..d5b2e60bd9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded.png new file mode 100644 index 0000000000..e92f51ee30 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/unwielded.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-arrow.png new file mode 100644 index 0000000000..c846336869 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..6c138aaec4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..ccaf5002f0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded.png new file mode 100644 index 0000000000..db525bcee6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/bow.rsi/wielded.png differ