From d62da9c0b1d6a10da9df0e6f1c1c522a98fc12c7 Mon Sep 17 00:00:00 2001 From: iertis Date: Fri, 15 Nov 2024 17:45:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=B0=D0=B1=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=83=D1=88=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weapons/guns/ammunition/explosives.ftl | 12 +++ .../weapons/guns/projectiles/projectiles.ftl | 10 ++ .../Guns/Ammunition/Magazines/grenade.yml | 12 +-- .../Weapons/Guns/Projectiles/hitscan.yml | 2 +- .../Entities/Structures/Shuttles/cannons.yml | 2 +- .../Prototypes/Recipes/Lathes/security.yml | 16 +-- Resources/Prototypes/Research/arsenal.yml | 6 +- .../Weapons/Guns/Ammunition/explosives.yml | 101 ++++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 95 ++++++++++++++++ Resources/Prototypes/_Sunrise/tags.yml | 21 ++-- 10 files changed, 250 insertions(+), 27 deletions(-) diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/explosives.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/explosives.ftl index e9b7bcdce25..37b2d054595 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/explosives.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/explosives.ftl @@ -1,3 +1,15 @@ ent-CartridgeRocketNT = выстрел НТ-69 .desc = { ent-CartridgeRocket.desc } .suffix = НТ +ent-BaseArtilleryShell = базовый артиллерийский снаряд + .desc = Базовый артиллерийский снаряд. +ent-ShellFragArtillery = осколочный артиллерийский снаряд + .desc = Артиллерийский снаряд. +ent-ShellBatonArtillery = шоковый артиллерийский снаряд + .desc = { ent-ShellFragArtillery.desc } +ent-ShellBlastArtillery = фугасный артиллерийский снаряд + .desc = { ent-ShellFragArtillery.desc } +ent-ShellFlashArtillery = ослепляющий артиллерийский снаряд + .desc = { ent-ShellFragArtillery.desc } +ent-ShellEMPArtillery = ЭМИ артиллерийский снаряд + .desc = { ent-ShellFragArtillery.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/projectiles/projectiles.ftl index 262c8d3247d..54b60e94309 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -6,3 +6,13 @@ ent-BaseBulletRubber = резиновая пуля .desc = { ent-BaseBullet.desc } ent-RadiationBullet = поток радиоактивных частиц .desc = { ent-BaseBullet.desc } +ent-BulletShellFragArtillery = осколочный артиллерийский снаряд + .desc = { ent-BaseBullet.desc } +ent-BulletShellBatonArtillery = шоковый артиллерийский снаряд + .desc = { ent-BaseBullet.desc } +ent-BulletShellBlastArtillery = фугасный артиллерийский снаряд + .desc = { ent-BaseBullet.desc } +ent-BulletShellFlashArtillery = ослепляющий артиллерийский снаряд + .desc = { ent-BaseBullet.desc } +ent-BulletShellEMPArtillery = ЭМИ артиллерийский снаряд + .desc = { ent-BaseBullet.desc } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml index 389a4033cba..cfa4354abca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml @@ -11,7 +11,7 @@ mayTransfer: true whitelist: tags: - - Grenade + - ArtilleryGrenade #Sunrise-edit capacity: 5 soundRack: path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg @@ -52,7 +52,7 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeFrag + proto: ShellFragArtillery #Sunrise-edit - type: entity id: MagazineGrenadeEMP @@ -60,7 +60,7 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeEMP + proto: ShellEMPArtillery #Sunrise-edit - type: entity id: MagazineGrenadeFlash @@ -68,7 +68,7 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeFlash + proto: ShellFlashArtillery #Sunrise-edit - type: entity id: MagazineGrenadeBlast @@ -76,7 +76,7 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeBlast + proto: ShellBlastArtillery #Sunrise-edit - type: entity id: MagazineGrenadeBaton @@ -84,4 +84,4 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeBaton + proto: ShellBatonArtillery #Sunrise-edit diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 47f2dc2ef6d..9e5a963ee73 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -129,7 +129,7 @@ damage: types: Heat: 45 - Structural: 10 + Structural: 100 #Sunrise-edit muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_beam_heavy2 diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 47ac2ae7c94..f797e876c89 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -209,7 +209,7 @@ - type: BallisticAmmoProvider whitelist: tags: - - Grenade + - ArtilleryShell #Sunrise-edit capacity: 2 soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 8469a9f5445..a9f3c5a1cc3 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -640,7 +640,7 @@ Plastic: 500 Gold: 250 Uranium: 50 - + - type: latheRecipe id: MagazineGrenadeEmpty result: MagazineGrenadeEmpty @@ -650,8 +650,8 @@ Plastic: 50 - type: latheRecipe - id: GrenadeEMP - result: GrenadeEMP + id: ShellEMPArtillery + result: ShellEMPArtillery completetime: 3 materials: Steel: 150 @@ -659,8 +659,8 @@ Glass: 20 - type: latheRecipe - id: GrenadeBlast - result: GrenadeBlast + id: ShellBlastArtillery + result: ShellBlastArtillery completetime: 3 materials: Steel: 450 @@ -668,8 +668,8 @@ Gold: 150 - type: latheRecipe - id: GrenadeFlash - result: GrenadeFlash + id: ShellFlashArtillery + result: ShellFlashArtillery completetime: 3 materials: Steel: 150 @@ -787,4 +787,4 @@ materials: Steel: 1500 Glass: 750 - Silver: 150 \ No newline at end of file + Silver: 150 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4eef7ea0feb..0ebd870ea32 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -193,8 +193,8 @@ - PowerCageSmall - PowerCageMedium - MagazineGrenadeEmpty - - GrenadeFlash - - GrenadeBlast + - ShellFlashArtillery + - ShellBlastArtillery - ShuttleGunSvalinnMachineGunCircuitboard - ShuttleGunPerforatorCircuitboard - ShuttleGunFriendshipCircuitboard @@ -277,7 +277,7 @@ tier: 3 cost: 15000 recipeUnlocks: - - GrenadeEMP + - ShellEMPArtillery - PowerCageHigh - ShuttleGunDusterCircuitboard technologyPrerequisites: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 29e01d7251f..2fcb716896a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -18,3 +18,104 @@ state: rpg - type: StaticPrice price: 20 + +# Shells that used for friendship and duster + +- type: entity + id: BaseArtilleryShell + name: base shell + parent: [BaseItem] + abstract: true + components: + - type: Tag + tags: + - ArtilleryShell + - type: Item + size: Small + - type: Sprite + + +- type: entity + id: ShellFragArtillery + name: artillery frag shell + parent: BaseArtilleryShell + components: + - type: CartridgeAmmo + proto: BulletShellFragArtillery + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: frag + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: frag + suffix: false + +- type: entity + id: ShellBatonArtillery + name: baton shell + parent: BaseArtilleryShell + components: + - type: CartridgeAmmo + proto: ShellBatonArtillery + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: baton + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: baton + suffix: false + +- type: entity + id: ShellBlastArtillery + name: blast shell + parent: BaseArtilleryShell + components: + - type: CartridgeAmmo + proto: BulletShellBlastArtillery + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: blast + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: blast + suffix: false + +- type: entity + id: ShellFlashArtillery + name: flash shell + parent: BaseArtilleryShell + components: + - type: CartridgeAmmo + proto: BulletShellFlashArtillery + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: flash + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: flash + suffix: false + +- type: entity + id: ShellEMPArtillery + name: EMP shell + parent: BaseArtilleryShell + components: + - type: CartridgeAmmo + proto: BulletShellEMPArtillery + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: emp + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: frag + suffix: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 0f6f35d87e1..466ef4bfa9a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -94,3 +94,98 @@ - type: Reflective reflective: - Energy + +# Shells that used for friendship and duster + +- type: entity + id: BulletShellFragArtillery + name: artillery frag shell + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + totalIntensity: 175 # about a ~6 tile radius + intensitySlope: 1 + maxIntensity: 10 + +- type: entity + id: BulletShellBatonArtillery + name: baton shell + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: Projectile + deleteOnCollide: false + damage: + types: + Blunt: 1 + soundHit: + path: /Audio/Effects/gen_hit.ogg + - type: StaminaDamageOnCollide + damage: 80 + +- type: entity + id: BulletShellBlastArtillery + name: blast shell + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + totalIntensity: 150 # a ~2 tile radius + intensitySlope: 5 + maxIntensity: 10 + +- type: entity + id: BulletShellFlashArtillery + name: flash shell + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: FlashOnTrigger + range: 7 + - type: SpawnOnTrigger + proto: GrenadeFlashEffect + - type: ActiveTimerTrigger + timeRemaining: 0.3 + - type: DeleteOnTrigger + +- type: entity + id: BulletShellEMPArtillery + name: EMP shell + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: frag + - type: EmpOnTrigger + range: 5 + energyConsumption: 50000 + disableDuration: 10 + - type: Ammo + muzzleFlash: null + - type: PointLight + radius: 3.5 + color: blue + energy: 0.5 diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml index bd04ca02e49..0b3e02fb7f4 100644 --- a/Resources/Prototypes/_Sunrise/tags.yml +++ b/Resources/Prototypes/_Sunrise/tags.yml @@ -3,7 +3,7 @@ - type: Tag id: IgnoreMelee - + - type: Tag id: NoInjectable @@ -36,7 +36,7 @@ - type: Tag id: SyndieAgentUplink - + - type: Tag id: AnomalyCore @@ -147,10 +147,10 @@ - type: Tag id: BluespaceBox - + - type: Tag id: SyndicateRapier - + # Material bag: - type: Tag @@ -167,20 +167,25 @@ - type: Tag id: Board - + # Mechs - type: Tag id: Ripley - + - type: Tag id: Clarke - type: Tag id: Gygax - + - type: Tag id: Durand - + - type: Tag id: Phazon + +# For friendship and duster + +- type: Tag + id: ArtilleryShell