Merge pull request #869 from PubliclyExecutedPig/energy

Adds a new gun to replace the Eshotgun

Author: StarlightHost

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -351,7 +351,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingNeckCloakHosElite
-    - id: WeaponEnergyShotgun
+    - id: WeaponEnergySMG
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -6,6 +6,7 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
+      - id: WeaponEnergyShotgun
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
@@ -35,6 +36,7 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
+      - id: WeaponEnergyShotgun
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
       - id: Flash

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -786,12 +786,12 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletLaserSpread
+    proto: BulletLaserSpreadNarrow
     fireCost: 150
   - type: BatteryWeaponFireModes
     fireModes:
-    - proto: BulletLaserSpread
-      fireCost: 150
+    #- proto: BulletLaserSpread
+      #fireCost: 150
     - proto: BulletLaserSpreadNarrow
       fireCost: 200
     - proto: BulletDisablerSmgSpread

Resources/Prototypes/_StarLight/Catalog/Fills/Lockers/security.yml

@@ -122,6 +122,7 @@
     contents:
       - id: FlashlightSeclite
         amount: 2
+      - id: WeaponEnergyShotgun
       - id: WeaponDisabler
         amount: 2
       - id: ClothingBeltSecurityFilled

Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -760,4 +760,64 @@
       magState: mag
       steps: 5
       zeroVisible: true
-    - type: Appearance
+    - type: Appearance
+
+- type: entity
+  name: proto-5x energy gun
+  parent: [BaseWeaponBattery, BaseGrandTheftContraband]
+  id: WeaponEnergySMG
+  description: A one-of-a-kind prototype energy sub-machine gun. It offers high energy firepower and a powerful self recharge.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/energy_smg.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/energy_smg.rsi
+  - type: Gun
+    fireRate: 4.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+      params:
+         volume: -2
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletEnergySMGLaser
+    fireCost: 50
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: BulletEnergySMGLaser
+      fireCost: 50
+    - proto: BulletEnergySMGDisabler
+      fireCost: 25
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,3,1
+    #sprite: _Starlight/Objects/Weapons/Guns/Battery/energy_smg.rsi
+    #heldPrefix: energy
+  - type: Tag
+    tags:
+    - HighRiskItem
+  #- type: StealTarget
+    #stealGroup: WeaponEnergyShotgun
+  #- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
+  - type: Battery
+    maxCharge: 1500
+    startingCharge: 1500
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 100
+    autoRechargePause: true
+    autoRechargePauseTime: 10

Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -145,4 +145,47 @@
   - type: Projectile
     damage:
       types:
-        Poison: 10
+        Poison: 10
+
+- type: entity
+  name : laser bolt
+  id: BulletEnergySMGLaser
+  parent: BulletEnergyTurretBase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Ammo
+    muzzleFlash: MuzzleFlashEffectHeavyLaser
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: heavylaser
+      shader: unshaded
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 16
+  
+- type: entity
+  name : disabler bolt
+  id: BulletEnergySMGDisabler
+  parent: BulletEnergyTurretBase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Ammo
+    muzzleFlash: MuzzleFlashEffectOmnilaser
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: StaminaDamageOnCollide
+    damage: 20
+  - type: Projectile
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Heat: 0
+    soundHit:
+      collection: WeakHit
+    forceSound: true