From 5c55cb3378246269223855eb8c330e87b708ae42 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 9 Mar 2024 02:24:58 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=B9=D0=BA=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=83=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=BF=D1=80=D0=B8=D0=B2=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guns/Ammunition/Cartridges/bibis.yml | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml new file mode 100644 index 00000000000..3ae0af98a48 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml @@ -0,0 +1,146 @@ +- type: Tag + id: ADTCartridgeBibis + +- type: Tag + id: ADTMagazineRifleBibis + +- 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: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.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 + +- type: entity + id: ADTBulletBibis + name: bibis ball + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 0.1 + - type: StaminaDamageOnCollide + damage: 5 + +- 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/ltrifle.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 + + +# 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: 100 + - 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"] From ec34d008dddff80c3956ea3c6c2d4e8f6fc4935c Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 9 Mar 2024 04:35:06 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=B9=D0=BA=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=80=D0=B8=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Audio/Weapons/Guns/Gunshots/airsoft.ogg | Bin 0 -> 12861 bytes Resources/Changelog/ChangelogADT.yml | 8 ++++++++ .../ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl | 16 ++++++++++++++++ .../Guns/Ammunition/Cartridges/bibis.yml | 10 +++++++--- .../airsoft_bibis.rsi/base-spent.png | Bin 0 -> 194 bytes .../Guns/Ammunition/airsoft_bibis.rsi/base.png | Bin 0 -> 194 bytes .../Ammunition/airsoft_bibis.rsi/meta.json | 17 +++++++++++++++++ 7 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/airsoft.ogg 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/Audio/Weapons/Guns/Gunshots/airsoft.ogg b/Resources/Audio/Weapons/Guns/Gunshots/airsoft.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7df380cf7c6f13a25d8f1bdfc0ca543dfd24449d GIT binary patch literal 12861 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 literal 0 HcmV?d00001 diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index e3f8f0dcb5b..3297835e2ec 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1409,3 +1409,11 @@ Entries: - {message: "Пистолет киборга СБ можно персонализировать.", type: Add} id: 55702 #костыль отображения в Обновлениях time: '2024-03-08T08:20:00.0000000+00:00' + +- author: Пётр Игнатьевич + changes: + - {message: "Добавлены шарики для страйкбола и страйкбольный автомат. Пока только щитспавном", type: Add} + - {message: "Исправлено то, что секрет запускался только при 20 игроках. Режим ядерных и зомби получил чуть больше шанса в секрете", type: Tweak} + - {message: "Добавлены кассеты с музыкой", type: Add} + id: 55705 #костыль отображения в Обновлениях + time: '2024-03-09T08:20:00.0000000+00:00' 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 082320a5109..af1732f63c7 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl @@ -224,3 +224,19 @@ ent-ADTWeaponLauncherSchmel = РПО "Шмель-3М" ent-ADTWeaponLauncherSapog = РПГ-32 "Сапог" .desc = Базовое противотанковое оружие пехоты СССП - ручной гранатомет, способный запускать кумулятивные и термобарические гранаты. .suffix = { "СССП, Гранатомёт" } + +ent-ADTCartridgeStrikeballBibis = страйкбольный шарик + .desc = Маленький пластиковый шарик, используемый для страйкбола. + .suffix = { "Страйкбол" } + +ent-ADTBulletBibis = страйкбольный шарик + .desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы. + .suffix = { "Страйкбол" } + +ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер" + .desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол. + .suffix = { "Страйкбол" } + +ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата + .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. + .suffix = { "Страйкбол" } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml index 3ae0af98a48..b1c586f2c5e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml @@ -18,7 +18,7 @@ deleteOnSpawn: true - type: Sprite noRot: false - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] @@ -47,6 +47,10 @@ Blunt: 0.1 - type: StaminaDamageOnCollide damage: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: depleted-uranium - type: entity name: Lecter Strikeball @@ -66,7 +70,7 @@ - type: Gun fireRate: 10 soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + path: /Audio/Weapons/Guns/Gunshots/airsoft.ogg - type: ItemSlots slots: gun_magazine: @@ -113,7 +117,7 @@ whitelist: tags: - ADTCartridgeBibis - capacity: 100 + capacity: 200 - type: ContainerContainer containers: ballistic-ammo: !type:Container 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" + } + ] +}