New battery guns and some resprites (#6295)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-03-13 00:29:16 +02:00
parent 5d2d9fe050
commit a816bd809c
116 changed files with 404 additions and 201 deletions
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -99,6 +99,36 @@
  - type: BatteryBarrel
    fireCost: 25

+- type: entity
+  name: PDW-10 pulse pistol
+  parent: BatteryGunBase
+  id: PulsePistolPdw
+  description: A state of the art energy pistol favoured as a sidearm by the NT-ERT operatives.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
+  - type: BatteryBarrel
+    fireCost: 25
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions: 
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
  name: cog laser carbine
  parent: BatteryGunBase
@@ -120,6 +150,36 @@
  - type: BatteryBarrel
    fireCost: 12

+- type: entity
+  name: DEAC-12 pulse carbine
+  parent: BatteryGunBase
+  id: PulseCarbineDeac
+  description: A high tech energy carbine favoured by the NT-ERT operatives.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi
+  - type: BatteryBarrel
+    fireCost: 12
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions: 
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
  name: laser cannon
  parent: BatteryGunBase
@@ -139,7 +199,7 @@
    size: 24
    sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
  - type: BatteryBarrel
-    fireCost: 600
+    fireCost: 200
    ammoPrototype: RedHeavyLaser
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -189,20 +189,22 @@
  name: lamia
  parent: PistolBase
  id: PistolLamia
-  description: A heavy pistol of Ironhammer enforcers.
+  description: A heavy pistol chambered in .40 Magnum.
  components:
  - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
    layers:
    - state: base
      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: bolt-closed
+      map: ["enum.RangedBarrelVisualLayers.Bolt"]
    - state: mag-0
      map: ["enum.RangedBarrelVisualLayers.Mag"]
  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
  - type: Item
    size: 12
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
  - type: RangedWeapon
  - type: MagazineBarrel
    caliber: Magnum
@@ -210,7 +212,7 @@
    - Pistol
    magFillPrototype: MagazineMagnum
    autoEjectMag: true
-    fireRate: 5
+    fireRate: 3
    minAngle: 0
    maxAngle: 45
    angleIncrease: 20
@@ -227,6 +229,7 @@
      path: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg
  - type: Appearance
    visuals:
+    - type: BarrelBoltVisualizer
    - type: MagVisualizer
      magState: mag
      steps: 1
@@ -360,6 +363,36 @@
    angleIncrease: 20
    angleDecay: 60

+- type: entity
+  name: basilisk
+  parent: PistolBase
+  id: PistolBasilisk
+  description: A fully automatic handgun chambered in .40 magnum. Can use both pistol and SMG type magazines.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: Item
+    size: 12
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: RangedWeapon
+  - type: MagazineBarrel
+    caliber: Magnum
+    currentSelector: Automatic
+    allSelectors:
+    - Automatic
+    magazineTypes:
+    - Pistol
+    - Smg
+    magFillPrototype: MagazineMagnum
+    autoEjectMag: true
+    fireRate: 6
+    minAngle: 0
+    maxAngle: 45
+    angleIncrease: 20
+    angleDecay: 60
+
 - type: entity
  name: olivaw
  parent: PistolBase
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -11,6 +11,19 @@
    muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png
    impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png

+- type: entity
+  name: pulse
+  id: Pulse
+  abstract: true
+  components:
+  - type: Hitscan
+    damage:
+      types:
+        Heat: 25
+    spriteName: Objects/Weapons/Guns/Projectiles/pulse.png
+    muzzleFlash: Objects/Weapons/Guns/Projectiles/pulse_muzzle.png
+    impactFlash: Objects/Weapons/Guns/Projectiles/pulse_impact.png
+
 - type: entity
  name: red heavy laser
  id: RedHeavyLaser
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -48,6 +48,8 @@
    layers:
      - state: base
        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: bolt-closed
+        map: ["enum.RangedBarrelVisualLayers.Bolt"]
      - state: mag-0
        map: ["enum.RangedBarrelVisualLayers.Mag"]
  - type: Icon
@@ -75,6 +77,7 @@
      path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
  - type: Appearance
    visuals:
+    - type: BarrelBoltVisualizer
    - type: MagVisualizer
      magState: mag
      steps: 1
@@ -91,6 +94,8 @@
    layers:
      - state: base
        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: bolt-closed
+        map: ["enum.RangedBarrelVisualLayers.Bolt"]
      - state: mag-0
        map: ["enum.RangedBarrelVisualLayers.Mag"]
  - type: Icon
@@ -118,6 +123,7 @@
      path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
  - type: Appearance
    visuals:
+    - type: BarrelBoltVisualizer
    - type: MagVisualizer
      magState: mag
      steps: 1