Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Gun accuracy pass (#7526)

Browse Source 
* Gun accuracy pass

* Buff AR decay a little bit

* Make all the full autos decay slightly faster
This commit is contained in:
Rane
2022-04-14 14:42:23 -04:00
committed by GitHub
parent 04019c371d
commit 7ffe9208b9
8 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
View File

@@ -19,10 +19,10 @@
magazineTypes: magazineTypes:
- Box - Box
fireRate: 20 fireRate: 20
minAngle: 10 minAngle: 5
maxAngle: 45 maxAngle: 45
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 20
magNeedsOpenBolt: false magNeedsOpenBolt: false
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/lmg.ogg path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
@@ -66,7 +66,7 @@
minAngle: 0 minAngle: 0
maxAngle: 15 maxAngle: 15
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View File

@@ -19,10 +19,10 @@
magazineTypes: magazineTypes:
- Box - Box
fireRate: 8 fireRate: 8
minAngle: 10 minAngle: 5
maxAngle: 45 maxAngle: 45
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 20
magNeedsOpenBolt: true magNeedsOpenBolt: true
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/lmg.ogg path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
@@ -68,7 +68,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -104,7 +104,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer

30
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View File

@@ -26,10 +26,10 @@
allSelectors: allSelectors:
- Single - Single
fireRate: 8 fireRate: 8
minAngle: 10 minAngle: 5
maxAngle: 60 maxAngle: 60
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 15
magFillPrototype: MagazinePistol magFillPrototype: MagazinePistol
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/pistol.ogg path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
@@ -76,7 +76,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: entity - type: entity
name: colt M1911 name: colt M1911
@@ -105,7 +105,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -132,7 +132,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: entity - type: entity
name: handmade pistol name: handmade pistol
@@ -162,10 +162,10 @@
magazineTypes: magazineTypes:
- Pistol - Pistol
fireRate: 8 fireRate: 8
minAngle: 10 minAngle: 5
maxAngle: 60 maxAngle: 60
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 15
magFillPrototype: MagazinePistol magFillPrototype: MagazinePistol
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/pistol.ogg path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
@@ -216,7 +216,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg
soundEmpty: soundEmpty:
@@ -265,7 +265,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/silenced.ogg path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
@@ -296,7 +296,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -328,7 +328,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -361,7 +361,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: entity - type: entity
name: basilisk name: basilisk
@@ -391,7 +391,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: entity - type: entity
name: olivaw name: olivaw
@@ -421,7 +421,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -449,4 +449,4 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 60 angleDecay: 15

20
Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View File

@@ -36,6 +36,10 @@
fillPrototype: CartridgeMagnum fillPrototype: CartridgeMagnum
caliber: Magnum caliber: Magnum
capacity: 5 capacity: 5
minAngle: 0
maxAngle: 60
angleIncrease: 20
angleDecay: 15
autoCycle: true autoCycle: true
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/revolver.ogg path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
@@ -70,6 +74,10 @@
fillPrototype: CartridgeMagnum fillPrototype: CartridgeMagnum
caliber: Magnum caliber: Magnum
capacity: 6 capacity: 6
minAngle: 0
maxAngle: 60
angleIncrease: 20
angleDecay: 15
soundEmpty: soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg path: /Audio/Weapons/Guns/Empty/empty.ogg
soundGunshot: soundGunshot:
@@ -98,6 +106,10 @@
fillPrototype: CartridgeMagnum fillPrototype: CartridgeMagnum
caliber: Magnum caliber: Magnum
capacity: 7 capacity: 7
minAngle: 0
maxAngle: 60
angleIncrease: 20
angleDecay: 15
soundEmpty: soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg path: /Audio/Weapons/Guns/Empty/empty.ogg
soundGunshot: soundGunshot:
@@ -126,6 +138,10 @@
fillPrototype: CartridgeMagnum fillPrototype: CartridgeMagnum
caliber: Magnum caliber: Magnum
capacity: 7 capacity: 7
minAngle: 0
maxAngle: 60
angleIncrease: 20
angleDecay: 15
soundEmpty: soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg path: /Audio/Weapons/Guns/Empty/empty.ogg
soundGunshot: soundGunshot:
@@ -155,6 +171,10 @@
fillPrototype: CartridgePistol fillPrototype: CartridgePistol
caliber: Pistol caliber: Pistol
capacity: 5 capacity: 5
minAngle: 0
maxAngle: 60
angleIncrease: 20
angleDecay: 15
soundEmpty: soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg path: /Audio/Weapons/Guns/Empty/empty.ogg
soundGunshot: soundGunshot:

18
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -21,7 +21,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 90 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
soundEmpty: soundEmpty:
@@ -66,7 +66,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 20 angleIncrease: 20
angleDecay: 90 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
soundRack: soundRack:
@@ -112,7 +112,7 @@
minAngle: 0 minAngle: 0
maxAngle: 60 maxAngle: 60
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
soundRack: soundRack:
@@ -159,7 +159,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
soundRack: soundRack:
@@ -204,7 +204,7 @@
minAngle: 10 minAngle: 10
maxAngle: 60 maxAngle: 60
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/m41.ogg path: /Audio/Weapons/Guns/Gunshots/m41.ogg
soundRack: soundRack:
@@ -249,7 +249,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
soundRack: soundRack:
@@ -296,7 +296,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -336,7 +336,7 @@
minAngle: 0 minAngle: 0
maxAngle: 45 maxAngle: 45
angleIncrease: 15 angleIncrease: 15
angleDecay: 60 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
soundRack: soundRack:
@@ -381,7 +381,7 @@
minAngle: 0 minAngle: 0
maxAngle: 25 maxAngle: 25
angleIncrease: 15 angleIncrease: 15
angleDecay: 25 angleDecay: 20
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
soundRack: soundRack:

18
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -20,10 +20,10 @@
caliber: Pistol caliber: Pistol
magazineTypes: magazineTypes:
- Smg - Smg
minAngle: 5 minAngle: 0
maxAngle: 60 maxAngle: 60
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 20
magFillPrototype: MagazinePistolSmg magFillPrototype: MagazinePistolSmg
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/smg.ogg path: /Audio/Weapons/Guns/Gunshots/smg.ogg
@@ -69,10 +69,10 @@
caliber: Pistol caliber: Pistol
magazineTypes: magazineTypes:
- Smg - Smg
minAngle: 10 minAngle: 5
maxAngle: 60 maxAngle: 60
angleIncrease: 12 angleIncrease: 10
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer
@@ -111,10 +111,10 @@
caliber: Pistol caliber: Pistol
magazineTypes: magazineTypes:
- Smg - Smg
minAngle: 5 minAngle: 0
maxAngle: 60 maxAngle: 60
angleIncrease: 10 angleIncrease: 10
angleDecay: 60 angleDecay: 20
autoEjectMag: true autoEjectMag: true
- type: Appearance - type: Appearance
visuals: visuals:
@@ -154,10 +154,10 @@
magazineTypes: magazineTypes:
- Smg - Smg
magFillPrototype: MagazineMagnumSmg magFillPrototype: MagazineMagnumSmg
minAngle: 5 minAngle: 0
maxAngle: 60 maxAngle: 60
angleIncrease: 12 angleIncrease: 12
angleDecay: 60 angleDecay: 20
- type: Appearance - type: Appearance
visuals: visuals:
- type: BarrelBoltVisualizer - type: BarrelBoltVisualizer

22
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View File

@@ -20,10 +20,10 @@
caliber: Shotgun caliber: Shotgun
capacity: 7 capacity: 7
fireRate: 2.0 fireRate: 2.0
minAngle: 10 minAngle: 5
maxAngle: 60 maxAngle: 60
angleIncrease: 30 angleIncrease: 30
angleDecay: 30 angleDecay: 15
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
soundEmpty: soundEmpty:
@@ -111,10 +111,10 @@
fillPrototype: ShellShotgun fillPrototype: ShellShotgun
fireRate: 8.0 fireRate: 8.0
capacity: 2 capacity: 2
minAngle: 10 minAngle: 5
maxAngle: 60 maxAngle: 60
angleIncrease: 30 angleIncrease: 30
angleDecay: 30 angleDecay: 15
ammoSpreadRatio: 0.7 ammoSpreadRatio: 0.7
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
@@ -151,8 +151,10 @@
- type: RangedWeapon - type: RangedWeapon
- type: PumpBarrel - type: PumpBarrel
fireRate: 4.0 fireRate: 4.0
minAngle: 10 minAngle: 5
maxAngle: 120 maxAngle: 120
angleIncrease: 30
angleDecay: 15
- type: Appearance - type: Appearance
visuals: visuals:
- type: MagVisualizer - type: MagVisualizer
@@ -176,6 +178,8 @@
- type: PumpBarrel - type: PumpBarrel
capacity: 9 capacity: 9
ammoSpreadRatio: 0.5 ammoSpreadRatio: 0.5
angleIncrease: 30
angleDecay: 15
- type: entity - type: entity
name: Regulator 1000 name: Regulator 1000
@@ -193,6 +197,8 @@
- type: PumpBarrel - type: PumpBarrel
capacity: 7 capacity: 7
ammoSpreadRatio: 0.7 ammoSpreadRatio: 0.7
angleIncrease: 30
angleDecay: 15
- type: entity - type: entity
name: Kammerer name: Kammerer
@@ -210,6 +216,8 @@
- type: PumpBarrel - type: PumpBarrel
capacity: 4 capacity: 4
ammoSpreadRatio: 0.7 ammoSpreadRatio: 0.7
angleIncrease: 30
angleDecay: 15
- type: entity - type: entity
name: sawn-off shotgun name: sawn-off shotgun
@@ -239,10 +247,10 @@
fillPrototype: ShellShotgun fillPrototype: ShellShotgun
fireRate: 8.0 fireRate: 8.0
capacity: 2 capacity: 2
minAngle: 10 minAngle: 7
maxAngle: 90 maxAngle: 90
angleIncrease: 45 angleIncrease: 45
angleDecay: 30 angleDecay: 15
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
soundEmpty: soundEmpty:

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View File

@@ -22,8 +22,8 @@
caliber: LRifle caliber: LRifle
capacity: 10 capacity: 10
fireRate: 1.0 fireRate: 1.0
minAngle: 5 minAngle: 0
maxAngle: 45 maxAngle: 60
angleIncrease: 20 angleIncrease: 20
angleDecay: 15 angleDecay: 15
soundGunshot: soundGunshot:
@@ -88,7 +88,7 @@
caliber: AntiMaterial caliber: AntiMaterial
capacity: 1 capacity: 1
fireRate: 1.0 fireRate: 1.0
minAngle: 25 minAngle: 20
maxAngle: 80 maxAngle: 80
angleIncrease: 20 angleIncrease: 20
angleDecay: 15 angleDecay: 15
@@ -111,7 +111,7 @@
caliber: AntiMaterial caliber: AntiMaterial
capacity: 1 capacity: 1
fireRate: 1.0 fireRate: 1.0
minAngle: 15 minAngle: 10
maxAngle: 60 maxAngle: 60
angleIncrease: 20 angleIncrease: 20
angleDecay: 15 angleDecay: 15