Shotgun nerfs (#8590)

- Bojevic firerate dropped from 3 to 2
- Pellet damage from 13 to 8 (3 shotting players instead of 2 shot)
- Slightly more spread in line with the design doc. Slug spread I made as accurate as an SMG (so not quite full-screen mob hits but pretty close).
This commit is contained in:
metalgearsloth
2022-06-03 17:57:39 +10:00
committed by GitHub
parent 89338af63c
commit 49dfa9034a
6 changed files with 9 additions and 8 deletions

View File

@@ -54,8 +54,8 @@ public sealed partial class GunSystem : SharedGunSystem
{ {
if (cartridge.Count > 1) if (cartridge.Count > 1)
{ {
var angles = LinearSpread(mapAngle - Angle.FromDegrees(cartridge.Spread / 2f), var angles = LinearSpread(mapAngle - cartridge.Spread / 2,
mapAngle + Angle.FromDegrees(cartridge.Spread / 2f), cartridge.Count); mapAngle + cartridge.Spread / 2, cartridge.Count);
for (var i = 0; i < cartridge.Count; i++) for (var i = 0; i < cartridge.Count; i++)
{ {

View File

@@ -35,7 +35,7 @@ public sealed class CartridgeAmmoComponent : AmmoComponent
/// How much the ammo spreads when shot, in degrees. Does nothing if count is 0. /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("spread")] [ViewVariables(VVAccess.ReadWrite), DataField("spread")]
public float Spread = 10f; public Angle Spread = Angle.FromDegrees(5);
/// <summary> /// <summary>
/// How many prototypes are spawned when shot. /// How many prototypes are spawned when shot.

View File

@@ -44,7 +44,7 @@ public class GunComponent : Component
/// <summary> /// <summary>
/// How much the spread increases every time the gun fires. /// How much the spread increases every time the gun fires.
/// </summary> /// </summary>
[ViewVariables, DataField("angleIncrease")] [ViewVariables(VVAccess.ReadWrite), DataField("angleIncrease")]
public Angle AngleIncrease = Angle.FromDegrees(0.5); public Angle AngleIncrease = Angle.FromDegrees(0.5);
/// <summary> /// <summary>

View File

@@ -10,6 +10,7 @@
- ShellShotgun - ShellShotgun
- type: CartridgeAmmo - type: CartridgeAmmo
count: 6 count: 6
spread: 15
soundEject: soundEject:
collection: ShellEject collection: ShellEject
- type: Sprite - type: Sprite
@@ -46,7 +47,7 @@
- type: CartridgeAmmo - type: CartridgeAmmo
proto: PelletShotgunSlug proto: PelletShotgunSlug
count: 4 count: 4
spread: 2.5 spread: 5
- type: entity - type: entity
id: ShellShotgunFlare id: ShellShotgunFlare

View File

@@ -10,7 +10,7 @@
- type: Projectile - type: Projectile
damage: damage:
types: types:
Piercing: 13 Piercing: 8 # Should have the same or less damage than a regular pellet
- type: entity - type: entity
id: PelletShotgunBeanbag id: PelletShotgunBeanbag
@@ -41,7 +41,7 @@
- type: Projectile - type: Projectile
damage: damage:
types: types:
Piercing: 13 Piercing: 8
- type: entity - type: entity
id: PelletShotgunFlash id: PelletShotgunFlash

View File

@@ -51,7 +51,7 @@
sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
size: 24 size: 24
- type: Gun - type: Gun
fireRate: 3 fireRate: 2
selectedMode: FullAuto selectedMode: FullAuto
availableModes: availableModes:
- FullAuto - FullAuto