From 7e25ab6a137b4bc264ae090892c1eae6d1a2b99f Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 25 Aug 2024 20:15:52 +0300 Subject: [PATCH 1/8] =?UTF-8?q?[=D0=9F=D0=95=D0=A0=D0=95=D0=9D=D0=9E=D0=A1?= =?UTF-8?q?]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=B9=D0=BA=D0=B1=D0=BE=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BB=D0=B5=D0=BA=D1=82=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Objects/Weapons/Guns/guns.ftl | 15 ++++++ .../Guns/Ammunition/Cartridges/strikball.yml | 30 ++++++++++++ .../Guns/Ammunition/Magazines/fill.txt | 1 - .../Guns/Ammunition/Magazines/strikeball.yml | 48 +++++++++++++++++++ .../Objects/Weapons/Guns/Rifels/fill.txt | 1 - .../Objects/Weapons/Guns/Rifels/rifles.yml | 47 ++++++++++++++++++ Resources/Prototypes/ADT/tags.yml | 3 ++ 7 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/fill.txt create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fill.txt diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl new file mode 100644 index 00000000000..da7b965f3bf --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl @@ -0,0 +1,15 @@ +ent-ADTCartridgeStrikeballBibis = страйкбольный шарик + .desc = Маленький пластиковый шарик, используемый для страйкбола. + .suffix = { "Страйкбол" } + +ent-ADTBulletBibis = страйкбольный шарик + .desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы. + .suffix = { "Страйкбол" } + +ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер" + .desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол. + .suffix = { "Страйкбол" } + +ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата + .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. + .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml new file mode 100644 index 00000000000..f4be5b01f8e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml @@ -0,0 +1,30 @@ +- type: entity + id: ADTBaseCartridgeStrikeball + name: bibis + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - ADTCartridgeBibis + - type: CartridgeAmmo + deleteOnSpawn: true + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + - type: StaticPrice + price: 1 + +- type: entity + id: ADTCartridgeStrikeballBibis + name: bibis + parent: ADTBaseCartridgeStrikeball + components: + - type: CartridgeAmmo + proto: ADTBulletBibis \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml new file mode 100644 index 00000000000..b7026ff91ee --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml @@ -0,0 +1,48 @@ +# Empty mags +- type: entity + id: ADTBaseMagazineBibis + name: "magazine bibis" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - ADTMagazineRifleBibis + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - ADTCartridgeBibis + capacity: 200 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_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 +- type: entity + id: ADTMagazineRifleBibis + name: "magazine bibis" + parent: ADTBaseMagazineBibis + components: + - type: BallisticAmmoProvider + proto: ADTCartridgeStrikeballBibis + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml index 9f8e0627c14..6a67696065d 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml @@ -50,3 +50,50 @@ slots: - Back - suitStorage + +- type: entity + name: Lecter Strikeball + parent: BaseWeaponRifle + id: ADTWeaponRifleLecterBibis + description: A high end military grade assault rifle. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + - type: Gun + fireRate: 10 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineRifleBibis + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - ADTMagazineRifleBibis + gun_chamber: + name: Chamber + startingItem: ADTCartridgeStrikeballBibis + priority: 1 + whitelist: + tags: + - ADTCartridgeBibis + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 63c3b15c74b..80a5b1b38b0 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -33,3 +33,6 @@ - type: Tag id: ADTSteelSheet + +- type: Tag + id: ADTCartridgeBibis \ No newline at end of file From 3db5f25e2e5360f9742c8981c6610c3136346293 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 25 Aug 2024 21:30:22 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BC=20?= =?UTF-8?q?=D1=8F=D0=BC=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Guns/Projectiles/projectiles.yml | 36 ++++++++++++++++++ Resources/Prototypes/ADT/tags.yml | 7 +++- .../airsoft_bibis.rsi/base-spent.png | Bin 0 -> 194 bytes .../Ammunition/airsoft_bibis.rsi/base.png | Bin 0 -> 194 bytes .../Ammunition/airsoft_bibis.rsi/meta.json | 17 +++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base-spent.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 9dc4683fc46..c9474e9385c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -50,3 +50,39 @@ soundHit: collection: WeakHit forceSound: true + +- type: entity + id: BaseBulletRubber + name: base bullet rubber + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber + - type: Projectile + damage: + types: + Blunt: 3 + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg + - type: StaminaDamageOnCollide + damage: 22 # 5 hits to stun sounds reasonable + +- type: entity + id: ADTBulletBibis + name: bibis ball + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 0.1 + - type: StaminaDamageOnCollide + damage: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: depleted-uranium \ No newline at end of file diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 80a5b1b38b0..60bb958df55 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -33,6 +33,9 @@ - type: Tag id: ADTSteelSheet - + +- type: Tag + id: ADTCartridgeBibis + - type: Tag - id: ADTCartridgeBibis \ No newline at end of file + id: ADTMagazineRifleBibis \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base-spent.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base-spent.png new file mode 100644 index 0000000000000000000000000000000000000000..0a8113e3d2832d7edd26912afd8b61fb58ca2795 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}HJ&bxArbCx zr(NVcpupo&+N30TRQApSi^V0)Zzjyt5u8#dzck3=|M}`ldrzL(@ptaXb2u=Y0MUnd z=C5mN-%Ttttq{ulN;Eg>iqS(IJNge1822WQ%mvv4FO#s)AMeG0o literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..0a8113e3d2832d7edd26912afd8b61fb58ca2795 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}HJ&bxArbCx zr(NVcpupo&+N30TRQApSi^V0)Zzjyt5u8#dzck3=|M}`ldrzL(@ptaXb2u=Y0MUnd z=C5mN-%Ttttq{ulN;Eg>iqS(IJNge1822WQ%mvv4FO#s)AMeG0o literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json new file mode 100644 index 00000000000..023731bcb32 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy", + "states": [ + { + "name": "base" + }, + { + "name": "base-spent" + } + ] +} From c482f1392e9a1d3a7a380339f151738b50a744fb Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 26 Aug 2024 10:23:23 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=82=D0=B5=D0=B3=D0=B0=20=D0=B2=20=D0=BF=D0=BE=D1=8F=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index c01bb7ad17a..6e2bf7a14cb 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -475,6 +475,7 @@ - Sidearm - MagazinePistol - MagazineMagnum + - ADTMagazineRifleBibis # ADT Tweak - CombatKnife - Truncheon components: @@ -485,6 +486,7 @@ - Handcuff - BallisticAmmoProvider - CartridgeAmmo + - ADTCartridgeBibis # ADT Tweak - DoorRemote - Whistle - HolosignProjector From 5c3e51b499e38da40e95bfbb6902edffe3665e1d Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 27 Aug 2024 13:23:35 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=20?= =?UTF-8?q?=D0=B2=20=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BF=D0=BA=D0=B8=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20ADT=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B6=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BB=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Objects/Weapons/Guns/guns.ftl | 15 --------------- .../ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl | 3 +++ .../Guns/Ammunition/Cartridges/strikeball.ftl | 3 +++ .../Guns/Ammunition/Magazines/strikeball.ftl | 3 +++ .../Guns/Ammunition/Projectiles/strikeball.ftl | 3 +++ .../Weapons/Guns/Projectiles/projectiles.yml | 4 ++-- 6 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl deleted file mode 100644 index da7b965f3bf..00000000000 --- a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/guns.ftl +++ /dev/null @@ -1,15 +0,0 @@ -ent-ADTCartridgeStrikeballBibis = страйкбольный шарик - .desc = Маленький пластиковый шарик, используемый для страйкбола. - .suffix = { "Страйкбол" } - -ent-ADTBulletBibis = страйкбольный шарик - .desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы. - .suffix = { "Страйкбол" } - -ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер" - .desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол. - .suffix = { "Страйкбол" } - -ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата - .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. - .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl new file mode 100644 index 00000000000..5931b6985ea --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl @@ -0,0 +1,3 @@ +ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер" + .desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол. + .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl new file mode 100644 index 00000000000..66620439d5a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl @@ -0,0 +1,3 @@ +ent-ADTCartridgeStrikeballBibis = страйкбольный шарик + .desc = Маленький пластиковый шарик, используемый для страйкбола. + .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl new file mode 100644 index 00000000000..e4e1d602e03 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl @@ -0,0 +1,3 @@ +ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата + .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. + .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl new file mode 100644 index 00000000000..201d95d9e23 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl @@ -0,0 +1,3 @@ +ent-ADTBulletBibis = страйкбольный шарик + .desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы. + .suffix = { "Страйкбол" } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index c9474e9385c..0b069990844 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -52,7 +52,7 @@ forceSound: true - type: entity - id: BaseBulletRubber + id: ADTBaseBulletRubber name: base bullet rubber parent: BaseBullet noSpawn: true @@ -73,7 +73,7 @@ - type: entity id: ADTBulletBibis name: bibis ball - parent: BaseBulletRubber + parent: ADTBaseBulletRubber noSpawn: true components: - type: Projectile From 94b8cd177040bef7e60c78ac8634ebd4bf1f6554 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 27 Aug 2024 15:47:24 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=A0=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guns/{strikeball.ftl => rifles.ftl} | 0 .../{strikeball.ftl => cartridges.ftl} | 0 .../{strikeball.ftl => magazines.ftl} | 0 .../{strikeball.ftl => projectiles.ftl} | 0 .../Ammunition/Projectiles/BulletBibis.yml | 0 .../Weapons/Guns/Projectiles/projectiles.yml | 39 +----------------- .../airsoft_bibis.rsi/base-spent.png | Bin .../{ => Casings}/airsoft_bibis.rsi/base.png | Bin .../{ => Casings}/airsoft_bibis.rsi/meta.json | 0 9 files changed, 1 insertion(+), 38 deletions(-) rename Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/{strikeball.ftl => rifles.ftl} (100%) rename Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/{strikeball.ftl => cartridges.ftl} (100%) rename Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/{strikeball.ftl => magazines.ftl} (100%) rename Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{strikeball.ftl => projectiles.ftl} (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml rename Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/{ => Casings}/airsoft_bibis.rsi/base-spent.png (100%) rename Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/{ => Casings}/airsoft_bibis.rsi/base.png (100%) rename Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/{ => Casings}/airsoft_bibis.rsi/meta.json (100%) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/rifles.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/strikeball.ftl rename to Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/rifles.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/strikeball.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.ftl diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 0b069990844..7d0e679087a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,4 +1,3 @@ - - type: entity id: ADTProjectileIonRifle parent: BulletDisabler @@ -49,40 +48,4 @@ Heat: 25 soundHit: collection: WeakHit - forceSound: true - -- type: entity - id: ADTBaseBulletRubber - name: base bullet rubber - parent: BaseBullet - noSpawn: true - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: rubber - - type: Projectile - damage: - types: - Blunt: 3 - soundHit: - path: /Audio/Weapons/Guns/Hits/snap.ogg - - type: StaminaDamageOnCollide - damage: 22 # 5 hits to stun sounds reasonable - -- type: entity - id: ADTBulletBibis - name: bibis ball - parent: ADTBaseBulletRubber - noSpawn: true - components: - - type: Projectile - damage: - types: - Blunt: 0.1 - - type: StaminaDamageOnCollide - damage: 5 - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: depleted-uranium \ No newline at end of file + forceSound: true \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base-spent.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base-spent.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base-spent.png rename to Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base-spent.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/base.png rename to Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi/meta.json rename to Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/meta.json From e0de8755aabc43a3d529dfe31919d1fe181d2dc7 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 27 Aug 2024 15:57:33 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=97=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=B2?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D1=82=D0=B8=D0=BF=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=B6=D0=B5=D0=BA=D1=82=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ammunition/Projectiles/BulletBibis.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml index e69de29bb2d..cd0665361f1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml @@ -0,0 +1,35 @@ +- type: entity + id: ADTBaseBulletRubber + name: base bullet rubber + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber + - type: Projectile + damage: + types: + Blunt: 3 + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg + - type: StaminaDamageOnCollide + damage: 22 # 5 hits to stun sounds reasonable + +- type: entity + id: ADTBulletBibis + name: bibis ball + parent: ADTBaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 0.1 + - type: StaminaDamageOnCollide + damage: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: depleted-uranium \ No newline at end of file From ca69523ae739884e2defa8724cf5c0c1d5282bbe Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 27 Aug 2024 16:02:29 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=94=D0=B0,=20=D0=BF=D0=BE=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=8F=D0=BB=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml index f4be5b01f8e..58be1cb9596 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml @@ -12,7 +12,7 @@ deleteOnSpawn: true - type: Sprite noRot: false - sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi + sprite: ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] From 8e3e2ed5ab868cb978a1f28adce78a8290d8f359 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 27 Aug 2024 16:54:29 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=BD=D1=83=20=D0=B2=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=20=D1=82=D0=B0=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ammunition/Projectiles/BulletBibis.yml | 19 ----------------- .../Guns/Ammunition/Projectiles/fill.txt | 1 - .../Weapons/Guns/Projectiles/projectiles.yml | 21 ++++++++++++++++++- 3 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/fill.txt diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml index cd0665361f1..fb77865b4f8 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml @@ -1,22 +1,3 @@ -- type: entity - id: ADTBaseBulletRubber - name: base bullet rubber - parent: BaseBullet - noSpawn: true - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: rubber - - type: Projectile - damage: - types: - Blunt: 3 - soundHit: - path: /Audio/Weapons/Guns/Hits/snap.ogg - - type: StaminaDamageOnCollide - damage: 22 # 5 hits to stun sounds reasonable - - type: entity id: ADTBulletBibis name: bibis ball diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7d0e679087a..e3a9e0171d5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -48,4 +48,23 @@ Heat: 25 soundHit: collection: WeakHit - forceSound: true \ No newline at end of file + forceSound: true + +- type: entity + id: ADTBaseBulletRubber + name: base bullet rubber + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber + - type: Projectile + damage: + types: + Blunt: 3 + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg + - type: StaminaDamageOnCollide + damage: 22 # 5 hits to stun sounds reasonable \ No newline at end of file