diff --git a/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg new file mode 100644 index 00000000000..9be3215667b Binary files /dev/null and b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg differ diff --git a/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg new file mode 100644 index 00000000000..8b3b5f9eecc Binary files /dev/null and b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg differ diff --git a/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg new file mode 100644 index 00000000000..de2d5d9c797 Binary files /dev/null and b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg differ diff --git a/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg new file mode 100644 index 00000000000..995efd9ffb0 Binary files /dev/null and b/Resources/Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl index 34fa8f0f472..75fec9fea81 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl @@ -59,3 +59,11 @@ ent-WeaponRevolverPython357AP = Питон .357 ent-ADTWeaponPistolX01 = X-01 Мультифазовый энергетический пистолет .desc = Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени. .suffix = Пистолет + +ent-ADTMagazineRifleFNFAL = Магазин 6.5х39 мм TSF + .desc = Магазин под патрон 6.5х39 мм, с вместимостью в 20 единиц. + .suffix = { "" } + +ent-ADTGunRifleFNFAL = AR-6.5 "Свободоносец" + .desc = Автоматическая винтовка, разработанная дочерней компанией NanoTrasen, данная оружие стал одним из наиболее распространенных и широко используемых стрелковых оружий во второй половине 25 века. Свободоносец известен своей универсальностью, надежностью и высокой огневой мощью. Внешне очень схож на немало известную FN FAL, но конструктивно это два разные оружия, из-за этого он и был прозван "Свободоносец" или "Правая рука свободы". + .suffix = { "" } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml new file mode 100644 index 00000000000..ec93510baaa --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml @@ -0,0 +1,121 @@ +- type: entity + name: FN FAL + parent: BaseItem + id: ADTGunRifleFNFAL + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineRifleFNFAL + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 1 + whitelist: + tags: + - ADTMagazineRifleFNFAL + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + fireRate: 7 + selectedMode: Burst + availableModes: + #- FullAuto + - SemiAuto + - Burst + soundGunshot: + collection: FN_Fal_choot + - type: Item + size: Large + + + + ## рандомизатор звуков для разнообразия звуков выстрела +- type: soundCollection + id: FN_Fal_choot + files: + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg + +# Base mags +- type: entity + id: ADTBaseMagazineRifleFNFAL + name: "extended magazine (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - ADTMagazineRifleFNFAL + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +# Magazines FN_FAL +- type: entity + id: ADTMagazineRifleFNFAL + name: "extended magazine (.20 rifle)" + parent: ADTBaseMagazineRifleFNFAL + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 46de7fbc350..0f42458c923 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1110,3 +1110,6 @@ - type: Tag id: ADTExtMagazineRifle + +- type: Tag + id: ADTMagazineRifleFNFAL diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/base.png new file mode 100644 index 00000000000..93cd59fc298 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/icon.png new file mode 100644 index 00000000000..52767a2887e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/mag-1.png new file mode 100644 index 00000000000..e6fbf7b460f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/meta.json new file mode 100644 index 00000000000..6735ab60d14 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.", + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/base.png new file mode 100644 index 00000000000..626b3c02b39 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/bolt-open.png new file mode 100644 index 00000000000..b201f443d60 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5978502b9b9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/icon.png new file mode 100644 index 00000000000..c95498806c9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-left.png new file mode 100644 index 00000000000..a946ab1118f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-right.png new file mode 100644 index 00000000000..fe0955aad10 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/mag-0.png new file mode 100644 index 00000000000..123d1a6d619 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/meta.json new file mode 100644 index 00000000000..b5acfdd4262 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png index db219702857..f36bc399c53 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png index 2c0192c6e65..98b6176eaf1 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png index 1388323fa93..08dfd24c082 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png index fc983610030..c82673a0f71 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png index f36bc399c53..36b36dd3981 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png index 98b6176eaf1..c85a025e9d0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png index 08dfd24c082..d4a1c3e4020 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png index c82673a0f71..e6f5791b496 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png differ