Балансировка Дробовиков (#2422)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -130,6 +130,8 @@
     fireRate: 3
     soundGunshot:
       collection: m3 # Sunrise-Edit
+  - type: GunSpreadModifier # Sunrise-add #Port WZ #37731
+    spread: 0.6 # Sunrise-add
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -220,6 +222,8 @@
     fireRate: 3
     soundGunshot:
       collection: m3 # Sunrise-Edit
+  - type: GunSpreadModifier # Sunrise-add #Port WZ #37731
+    spread: 1.4 # Sunrise-add
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -1,6 +1,33 @@
+- type: entity
+  name: BaseWeaponShotgun
+  parent: BaseWeaponShotgun
+  id: BaseWeaponShotgunSunrise
+  description: A rooty tooty point and shooty.
+  abstract: true
+  components:
+  - type: Gun
+    fireRate: 2
+    useKey: true
+    selectedMode: SemiAuto
+  - type: MeleeWeapon
+    angle: 60
+    range: 1.1
+    damage:
+      types:
+        Blunt: 12
+        Structural: 8
+    bluntStaminaDamageFactor: 2.0
+    attackRate: 0.85
+    autoAttack: false
+  - type: AltFireMelee
+    attackType: Heavy
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.9
+    sprintModifier: 0.9
+
 - type: entity
   name: XM1014
-  parent: BaseWeaponShotgun
+  parent: BaseWeaponShotgunSunrise
   id: WeaponXM1014
   components:
   - type: Sprite
@@ -38,36 +65,39 @@
   - type: Clothing
     sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/paladin-12/tiny.rsi
   - type: BallisticAmmoProvider
-    capacity: 5
+    capacity: 6
     soundRack:
       path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/pump.ogg
     soundInsert:
       path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/insert.ogg
   - type: Wieldable
   - type: UseDelay
-    delay: 0.5
+    delay: 0.25
   - type: GunRequiresWield
   - type: Gun
-    fireRate: 2.25
+    fireRate: 2
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Shotguns/paladin_12/paladin12_shot.ogg
       params:
         volume: 1
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.95
+    sprintModifier: 0.95
 
 - type: entity
   name: Spas-12
-  parent: BaseWeaponShotgun
+  parent: BaseWeaponShotgunSunrise
   id: WeaponShotgunSPAS12
   components:
   - type: Sprite
-    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/big.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi
   - type: Item
     size: Large
     shape:
     - 0,0,4,1
-    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi
   - type: Clothing
-    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi
   - type: BallisticAmmoProvider
     capacity: 8
   - type: Wieldable
@@ -78,10 +108,13 @@
     fireRate: 2
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Shotguns/spas_12/spas12_shot.ogg
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.95
+    sprintModifier: 0.95
 
 - type: entity
   name: Trenchgun L-4034
-  parent: BaseWeaponShotgun
+  parent: BaseWeaponShotgunSunrise
   id: WeaponShotgunTrenchgun4034
   components:
   - type: Sprite
@@ -107,7 +140,9 @@
     delay: 0.5
   - type: GunRequiresWield
   - type: Gun
-    fireRate: 1.25
+    fireRate: 1
+  - type: GunSpreadModifier
+    spread: 0.6
   - type: Construction
     graph: ShotgunTrenchgun4034Sawn
     node: start
@@ -120,6 +155,23 @@
   components:
   - type: Sprite
     sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/big.rsi
+  - type: Gun
+    fireRate: 1
+    useKey: true
+    selectedMode: SemiAuto
+  - type: GunSpreadModifier
+    spread: 1.4
+  - type: MeleeWeapon
+    angle: 60
+    range: 1
+    damage:
+      types:
+        Blunt: 8
+    bluntStaminaDamageFactor: 2.0
+    attackRate: 1
+    autoAttack: false
+  - type: AltFireMelee
+    attackType: Light
   - type: Item
     size: Normal
     shape:
@@ -128,7 +180,12 @@
   - type: Clothing
     sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/tiny.rsi
   - type: BallisticAmmoProvider
-    capacity: 4
+    capacity: 5
+  - type: UseDelay
+    delay: 0.25
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.95
+    sprintModifier: 0.95
   - type: Construction
     graph: ShotgunTrenchgun4034Sawn
     node: shotgun4034sawn
@@ -169,3 +226,19 @@
   - type: GunRequiresWield
   - type: Gun
     fireRate: 2
+  - type: GunSpreadModifier
+    spread: 1.2
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.95
+    sprintModifier: 0.95
+  - type: MeleeWeapon
+    angle: 60
+    range: 1
+    damage:
+      types:
+        Blunt: 8
+    bluntStaminaDamageFactor: 2.0
+    attackRate: 1
+    autoAttack: false
+  - type: AltFireMelee
+    attackType: Light

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "sprite wielded by KaiserMaus , original by unknown",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}