From 69af827dbf84c53b99b996ea13782fd963d6879c Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 8 Jul 2024 04:24:02 +0200 Subject: [PATCH 1/3] buffs and nerfs to various weapons angle/ firerate --- .../Weapons/Guns/Revolvers/revolvers.yml | 4 +++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 28 +++++++++---------- .../Objects/Weapons/Guns/SMGs/smgs.yml | 16 +++++------ .../Objects/Weapons/Guns/Snipers/snipers.yml | 20 ++++++++----- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 1fad62ec963..74a616bed85 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -55,6 +55,8 @@ id: N14WeaponRevolverCaptainMagnun description: A true freedom fighter carries his flag everywhere, even on his gun. Uses .44 magnum ammo. components: + - type: Gun + fireRate: 2 - type: Sprite sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi - type: Clothing @@ -89,6 +91,8 @@ id: N14Weaponwildwhisper description: Its said that after a troublemaker get shoot down with this revolver some words are whispered to their ears, no one knows what the question is, but the awnser is always "innocent". Uses .45-70 gov't ammo. components: + - type: Gun + fireRate: 2 - type: Sprite sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/wild_whisper.rsi - type: Clothing diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 1b7fa268df0..a9570d28dda 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -27,7 +27,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots @@ -85,9 +85,9 @@ maxAngle: -38 - type: Gun minAngle: 24 - maxAngle: 45 + maxAngle: 50 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg @@ -144,7 +144,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg selectedMode: FullAuto @@ -204,7 +204,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg fireRate: 5 @@ -259,10 +259,10 @@ minAngle: -21 maxAngle: -43 - type: Gun - minAngle: 24 - maxAngle: 45 + minAngle: 18 + maxAngle: 40 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg @@ -316,13 +316,13 @@ autoEject: true - type: Wieldable - type: GunWieldBonus - minAngle: -22 - maxAngle: -59 + minAngle: -23 + maxAngle: -56 - type: Gun minAngle: 24 maxAngle: 60 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 2 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg @@ -375,12 +375,12 @@ - type: Wieldable - type: GunWieldBonus minAngle: -21 - maxAngle: -43 + maxAngle: -40 - type: Gun minAngle: 24 - maxAngle: 45 + maxAngle: 48 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index ae86072001d..37cfc2a9e6a 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,15 +20,15 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi - type: Gun - fireRate: 10 + fireRate: 9 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg selectedMode: Fullauto availableModes: - Fullauto minAngle: 8 - maxAngle: 16 - angleIncrease: 4 + maxAngle: 48 + angleIncrease: 6 angleDecay: 16 - type: Wieldable - type: GunWieldBonus @@ -82,7 +82,7 @@ availableModes: - FullAuto minAngle: 12 - maxAngle: 24 + maxAngle: 40 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -142,7 +142,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 56 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -202,7 +202,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 56 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -317,7 +317,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 24 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -374,7 +374,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 30 angleIncrease: 4 angleDecay: 16 - type: Wieldable diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 4249141d511..fd465f15514 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -18,13 +18,15 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge308Rifle capacity: 10 proto: N14Cartridge308Rifle + - type: Gun + fireRate: 2 - type: entity name: Anti-Materiel rifle @@ -51,9 +53,11 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 + - type: Gun + fireRate: 1.2 - type: entity - name: .50 NCR rifle + name: .50 NCR rifle parent: N14WeaponAntiMateriel id: N14Weapon50NcrRifle description: A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. @@ -89,8 +93,8 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 - fireRate: 1 + angleDecay: 16 + fireRate: 2 - type: BallisticAmmoProvider whitelist: tags: @@ -111,7 +115,7 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Gun - fireRate: 1 + fireRate: 1.2 - type: entity name: brush gun @@ -150,7 +154,7 @@ tags: - N14Cartridge308Rifle capacity: 1 - proto: N14Cartridge308Rifle + proto: N14Cartridge308Rifle - type: entity name: varmint rifle @@ -172,10 +176,12 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge5.56Rifle capacity: 15 proto: N14Cartridge5.56Rifle + - type: Gun + fireRate: 2 From 23c8679614bebff842ec3b622f8a7f567866f723 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 8 Jul 2024 04:31:59 +0200 Subject: [PATCH 2/3] heavy weapons became more menacing, miniguns dont fire laserbeam style --- .../Entities/Objects/Weapons/Guns/Heavy/minigun.yml | 12 ++++++------ .../Entities/Objects/Weapons/Guns/LMGs/LMGs.yml | 12 ++++++------ .../Objects/Weapons/Guns/Pistols/pistols.yml | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml index 8863a4e9d30..a5ebfee557d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/minigun.yml @@ -14,8 +14,8 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Heavy/minigun.rsi - type: Gun - minAngle: 6 - maxAngle: 8 + minAngle: 4 + maxAngle: 12 fireRate: 12 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/minigun.ogg @@ -47,7 +47,7 @@ zeroVisible: true - type: Appearance - type: MultiHandedItem - - type: HeldSpeedModifier + - type: HeldSpeedModifier - type: entity name: minigun @@ -76,10 +76,10 @@ sprite: _Nuclear14/Objects/Weapons/Guns/Heavy/avengerminigun.rsi - type: Gun minAngle: 3 - maxAngle: 4 + maxAngle: 6 fireRate: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/minigun.ogg - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 + walkModifier: 0.8 + sprintModifier: 0.8 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml index f3d45808c65..c8f94461b2f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml @@ -23,8 +23,8 @@ minAngle: 24 maxAngle: 60 angleIncrease: 4 - angleDecay: 16 - fireRate: 3 + angleDecay: 16 + fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg selectedMode: FullAuto @@ -51,7 +51,7 @@ - type: ClothingSpeedModifier walkModifier: 0.8 sprintModifier: 0.8 - - type: HeldSpeedModifier + - type: HeldSpeedModifier - type: MagazineVisuals magState: mag steps: 1 @@ -83,8 +83,8 @@ minAngle: 24 maxAngle: 60 angleIncrease: 4 - angleDecay: 16 - fireRate: 5 + angleDecay: 16 + fireRate: 6 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg selectedMode: FullAuto @@ -111,7 +111,7 @@ - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 - - type: HeldSpeedModifier + - type: HeldSpeedModifier - type: MagazineVisuals magState: mag steps: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 18df6b29d92..4f909814b43 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -110,7 +110,7 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi - type: Gun - fireRate: 5 + fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg - type: ItemSlots @@ -187,7 +187,7 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi - type: Gun - fireRate: 4 + fireRate: 3 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/revolver.ogg - type: ItemSlots @@ -348,7 +348,7 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi - type: Gun - fireRate: 8 + fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/silenced.ogg params: From a928b3ef07e8e50dde73fcb1baac3529a4c159c5 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 8 Jul 2024 04:33:30 +0200 Subject: [PATCH 3/3] fixes duplicate `-type: Gun` issue --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index fd465f15514..5cd303d5626 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -19,14 +19,13 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 + fireRate: 2 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge308Rifle capacity: 10 proto: N14Cartridge308Rifle - - type: Gun - fireRate: 2 - type: entity name: Anti-Materiel rifle @@ -53,7 +52,6 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 - - type: Gun fireRate: 1.2 - type: entity @@ -177,11 +175,10 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 + fireRate: 2 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge5.56Rifle capacity: 15 proto: N14Cartridge5.56Rifle - - type: Gun - fireRate: 2