From 2b2ba4a34e2ef37e0a87cc3c8574556d383a7774 Mon Sep 17 00:00:00 2001 From: riot Date: Sat, 19 Aug 2023 02:47:43 -0500 Subject: [PATCH] balance --- code/modules/projectiles/ammo_datums.dm | 4 ++-- code/modules/projectiles/guns/misc.dm | 2 +- code/modules/projectiles/guns/pistols.dm | 12 ++++++------ code/modules/projectiles/guns/rifles.dm | 7 ++++--- code/modules/projectiles/guns/specialist.dm | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index e2753e53741c..d34438b9e1d5 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1074,7 +1074,7 @@ name = "heavy rifle bullet" damage = 55 - penetration = ARMOR_PENETRATION_TIER_4 + penetration = ARMOR_PENETRATION_TIER_3 /datum/ammo/bullet/rifle/type71/ap name = "heavy armor-piercing rifle bullet" @@ -1617,7 +1617,7 @@ /datum/ammo/bullet/sniper/upp name = "armor-piercing sniper bullet" - damage = 90 + damage = 80 penetration = ARMOR_PENETRATION_TIER_10 /datum/ammo/bullet/sniper/anti_materiel diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 5e4e36597567..5503ab03a1da 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -212,7 +212,7 @@ /obj/item/weapon/gun/pkp/set_gun_config_values() ..() - fire_delay = FIRE_DELAY_TIER_SMG + fire_delay = FIRE_DELAY_TIER_10 burst_amount = BURST_AMOUNT_TIER_6 burst_delay = FIRE_DELAY_TIER_9 accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 8ab8f7e20f7f..c17ca5bca739 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -284,13 +284,13 @@ /obj/item/weapon/gun/pistol/np92/set_gun_config_values() ..() - fire_delay = FIRE_DELAY_TIER_12 + set_fire_delay(FIRE_DELAY_TIER_12) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 scatter = SCATTER_AMOUNT_TIER_6 burst_scatter_mult = SCATTER_AMOUNT_TIER_6 scatter_unwielded = SCATTER_AMOUNT_TIER_6 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_3 /obj/item/weapon/gun/pistol/np92/suppressed name = "\improper NPZ92 pistol" @@ -337,13 +337,13 @@ /obj/item/weapon/gun/pistol/t73/set_gun_config_values() ..() - set_fire_delay(FIRE_DELAY_TIER_12) + set_fire_delay(FIRE_DELAY_TIER_11) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 scatter = SCATTER_AMOUNT_TIER_6 burst_scatter_mult = SCATTER_AMOUNT_TIER_6 scatter_unwielded = SCATTER_AMOUNT_TIER_6 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_6 /obj/item/weapon/gun/pistol/t73/leader @@ -377,13 +377,13 @@ /obj/item/weapon/gun/pistol/t73/leader/set_gun_config_values() ..() - fire_delay = FIRE_DELAY_TIER_10 + set_fire_delay(FIRE_DELAY_TIER_11) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_6 accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_6 scatter = SCATTER_AMOUNT_TIER_7 burst_scatter_mult = SCATTER_AMOUNT_TIER_6 scatter_unwielded = SCATTER_AMOUNT_TIER_7 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_6 //------------------------------------------------------- //KT-42 //Inspired by the .44 Auto Mag pistol diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 1a7d1b825a7c..298d813de97b 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1303,7 +1303,7 @@ /obj/item/weapon/gun/rifle/type71/set_gun_config_values() ..() - set_fire_delay(FIRE_DELAY_TIER_9) + set_fire_delay(FIRE_DELAY_TIER_8) set_burst_amount(BURST_AMOUNT_TIER_4) set_burst_delay(FIRE_DELAY_TIER_9) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 @@ -1311,7 +1311,7 @@ scatter = SCATTER_AMOUNT_TIER_6 burst_scatter_mult = SCATTER_AMOUNT_TIER_10 scatter_unwielded = SCATTER_AMOUNT_TIER_4 - damage_mult = BASE_BULLET_DAMAGE_MULT //10~ more damage than m41, as well as higher ap from bullet, a bit lower dps if my calculations are correct due to the fire-delay + damage_mult = BASE_BULLET_DAMAGE_MULT //10~ more damage than m41, as well as higher ap from bullet, slightly higher DPS, 133>137.5 recoil_unwielded = RECOIL_AMOUNT_TIER_3 /obj/item/weapon/gun/rifle/type71/handle_starting_attachment() @@ -1420,6 +1420,7 @@ aim_slowdown = SLOWDOWN_ADS_QUICK //Carbine is more lightweight wield_delay = WIELD_DELAY_VERY_FAST bonus_overlay_x = 2 + force = 20 //integrated melee mod from stock, which doesn't fit on the gun but is still clearly there on the sprite attachable_allowed = list( /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, @@ -1447,7 +1448,7 @@ /obj/item/weapon/gun/rifle/type71/carbine/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_11)//same fire rate as m41 - damage_mult = BASE_BULLET_DAMAGE_MULT - BULLET_DAMAGE_MULT_TIER_4//3~ less damage than m41, with higher ap from bullet type + damage_mult = BASE_BULLET_DAMAGE_MULT - BULLET_DAMAGE_MULT_TIER_4//same damage as m41 reg bullets probably scatter_unwielded = SCATTER_AMOUNT_TIER_5 recoil_unwielded = RECOIL_AMOUNT_TIER_4 diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 2d262e521d64..4f826ad1c8b5 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -492,7 +492,7 @@ /obj/item/weapon/gun/rifle/sniper/svd/set_gun_config_values() ..() - set_fire_delay(FIRE_DELAY_TIER_7) + set_fire_delay(FIRE_DELAY_TIER_6) set_burst_amount(BURST_AMOUNT_TIER_1) accuracy_mult = BASE_ACCURACY_MULT * 3 scatter = SCATTER_AMOUNT_TIER_8