diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl index b7d9f1c3a1..dbad76ac9f 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl @@ -32,6 +32,17 @@ ent-CP14Crossbolt = арбалетный болт ent-CP14WeaponRevolverNavy = револьвер "Марин" .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. +ent-CP14WeaponRifleCrush = крушитель + .desc = Легкая, дорогая и непростая в обращении винтовка. +ent-CP14WeaponRifleDurandal = дюрандаль + .desc = Винтовка среднего размера, дорогая и не очень удобная в использовании. +ent-CP14WeaponRifleLebel = лебел + .desc = Тяжелая, дорогая и не очень удобная в использовании винтовка. + +# Ammunition + +ent-CP14CartridgeBulletRifle = винтовочный патрон + # Coins ent-CP14CopperCoin = медная корона .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/Projectiles/riflebullet.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/Projectiles/riflebullet.yml new file mode 100644 index 0000000000..7fead7609b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/Projectiles/riflebullet.yml @@ -0,0 +1,13 @@ +- type: entity + noSpawn: true + parent: BaseBullet + id: CP14BulletRifle + name: bullet + components: + - type: Projectile + damage: + types: + Piercing: 15 + Structural: 10 + - type: StaminaDamageOnCollide + damage: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/rifleCasing.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/rifleCasing.yml new file mode 100644 index 0000000000..b2c64d1a6b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/rifleCasing.yml @@ -0,0 +1,18 @@ +- type: entity + parent: BaseCartridge + id: CP14CartridgeBulletRifle + name: rifle cartridge + components: + - type: Tag + tags: + - Cartridge + - CP14CartridgeBulletRifle + - type: CartridgeAmmo + proto: CP14BulletRifle + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/rifle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/rifle.yml new file mode 100644 index 0000000000..d7efc97ba0 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/rifle.yml @@ -0,0 +1,73 @@ +- type: entity + parent: BaseWeaponSniper + id: CP14BaseWeaponRifle + abstract: true + components: + - type: Item + size: Huge + - type: Wieldable + - type: AmmoCounter + - type: GunWieldBonus + minAngle: -30 + maxAngle: -30 + - type: Gun + selectedMode: SemiAuto + angleDecay: 32 + minAngle: 31 + maxAngle: 32 + availableModes: + - SemiAuto + - type: UseDelayOnShoot + - type: BallisticAmmoProvider + whitelist: + tags: + - CP14CartridgeBulletRifle + capacity: 1 + proto: CP14CartridgeBulletRifle + - type: UseDelay + delay: 2 + +- type: entity + name: crush + parent: CP14BaseWeaponRifle + id: CP14WeaponRifleCrush + description: Lightweight, expensive, and not an easy rifle to use. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Rifle/crush.rsi + state: base + - type: Clothing + sprite: _CP14/Objects/Weapons/Ranged/Rifle/crush.rsi + quickEquip: false + slots: + - Back + +- type: entity + name: durandal + parent: CP14BaseWeaponRifle + id: CP14WeaponRifleDurandal + description: A medium sized, expensive and not user friendly rifle. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi + state: base + - type: Clothing + sprite: _CP14/Objects/Weapons/Ranged/Rifle/rifle.rsi + quickEquip: false + slots: + - Back + +- type: entity + name: lebel + parent: CP14BaseWeaponRifle + id: CP14WeaponRifleLebel + description: Heavy, expensive and not a comfortable rifle to use. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi + state: base + - type: Clothing + sprite: _CP14/Objects/Weapons/Ranged/Rifle/rifle.rsi + quickEquip: false + slots: + - Back diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index a2b52ca4a7..702acbf7fa 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -5,4 +5,7 @@ id: CP14Coin - type: Tag - id: CP14CrossbowBolt \ No newline at end of file + id: CP14CrossbowBolt + +- type: Tag + id: CP14CartridgeBulletRifle diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base-spent.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base-spent.png new file mode 100644 index 0000000000..7a71c9d63c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base-spent.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base.png new file mode 100644 index 0000000000..889344058a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/meta.json new file mode 100644 index 0000000000..d648395516 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Ammunition/Casings/buckshot.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "CrustallPunk14, by Prazat", + "states": [ + { + "name": "base" + }, + { + "name": "base-spent" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/base.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/base.png new file mode 100644 index 0000000000..f36ee54d38 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/bolt-open.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/bolt-open.png new file mode 100644 index 0000000000..f515ef1102 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/bolt-open.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..9a666d90ab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/icon.png new file mode 100644 index 0000000000..f36ee54d38 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-left.png new file mode 100644 index 0000000000..ac07b38c41 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-right.png new file mode 100644 index 0000000000..6c0d8c11b8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/meta.json new file mode 100644 index 0000000000..54a0319772 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrustallPunk14, by Prazat", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..aa67c1db42 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..555e64b0b7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/crush.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/base.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/base.png new file mode 100644 index 0000000000..d2dec325c9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/bolt-open.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/bolt-open.png new file mode 100644 index 0000000000..96373fd39f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/bolt-open.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..9a666d90ab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/icon.png new file mode 100644 index 0000000000..d2dec325c9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-left.png new file mode 100644 index 0000000000..ac07b38c41 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-right.png new file mode 100644 index 0000000000..6c0d8c11b8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/meta.json new file mode 100644 index 0000000000..54a0319772 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrustallPunk14, by Prazat", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..aa67c1db42 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..555e64b0b7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/durandal.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/base.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/base.png new file mode 100644 index 0000000000..9e96204d84 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/bolt-open.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/bolt-open.png new file mode 100644 index 0000000000..2e5e2b7b9f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/bolt-open.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..9a666d90ab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/icon.png new file mode 100644 index 0000000000..9e96204d84 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-left.png new file mode 100644 index 0000000000..ac07b38c41 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-right.png new file mode 100644 index 0000000000..6c0d8c11b8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/meta.json new file mode 100644 index 0000000000..54a0319772 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrustallPunk14, by Prazat", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..aa67c1db42 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..555e64b0b7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Rifle/lebel.rsi/wielded-inhand-right.png differ