Изменил корабельные пушки (#640)

Co-authored-by: Vigers Ray <[email protected]>
space-sunrise · Nov 15, 2024 · ba7530e · ba7530e
1 parent fdce70c
commit ba7530e
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 19 deletions.
diff --git a/...Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/explosives.ftl b/...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/...cale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/projectiles/projectiles.ftl b/...cale/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
@@ -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,36 +52,36 @@
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    proto: GrenadeFrag
+    proto: ShellFragArtillery #Sunrise-edit
 
 - type: entity
   id: MagazineGrenadeEMP
   name: EMP grenade cartridge
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    proto: GrenadeEMP
+    proto: ShellEMPArtillery #Sunrise-edit
 
 - type: entity
   id: MagazineGrenadeFlash
   name: flash grenade cartridge
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    proto: GrenadeFlash
+    proto: ShellFlashArtillery #Sunrise-edit
 
 - type: entity
   id: MagazineGrenadeBlast
   name: blast grenade cartridge
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    proto: GrenadeBlast
+    proto: ShellBlastArtillery #Sunrise-edit
 
 - type: entity
   id: MagazineGrenadeBaton
   name: baton grenade cartridge
   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
@@ -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
@@ -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
@@ -640,7 +640,7 @@
     Plastic: 500
     Gold: 250
     Uranium: 50
-     
+
 - type: latheRecipe
   id: MagazineGrenadeEmpty
   result: MagazineGrenadeEmpty
@@ -650,26 +650,26 @@
     Plastic: 50
 
 - type: latheRecipe
-  id: GrenadeEMP
-  result: GrenadeEMP
+  id: ShellEMPArtillery
+  result: ShellEMPArtillery
   completetime: 3
   materials:
     Steel: 150
     Plastic: 100
     Glass: 20
 
 - type: latheRecipe
-  id: GrenadeBlast
-  result: GrenadeBlast
+  id: ShellBlastArtillery
+  result: ShellBlastArtillery
   completetime: 3
   materials:
     Steel: 450
     Plastic: 300
     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
+    Silver: 150
diff --git 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
@@ -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
@@ -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
@@ -314,3 +314,6 @@
 
 - type: Tag
   id: SolarAssemblyFlatpack
+
+- type: Tag
+  id: ArtilleryShell