From 2dac8b91db9bf9f6fe6a65dc5858fca7ee6c579b Mon Sep 17 00:00:00 2001 From: "Marcus D. Johnston" <93160383+Aurrain@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:14:15 -0700 Subject: [PATCH] Weapon Tweaks (#93) --- code/__DEFINES/ammo.dm | 8 +++---- code/__DEFINES/combat.dm | 24 +++++++++---------- .../projectiles/guns/ballistic/automatic.dm | 6 ++++- .../projectiles/guns/ballistic/rifle.dm | 4 ++-- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/code/__DEFINES/ammo.dm b/code/__DEFINES/ammo.dm index da81c76180e..2497711487e 100644 --- a/code/__DEFINES/ammo.dm +++ b/code/__DEFINES/ammo.dm @@ -51,12 +51,12 @@ #define CASING_POWER_LIGHT_PISTOL 1 #define CASING_POWER_MEDIUM_PISTOL 2 #define CASING_POWER_HEAVY_PISTOL 4 -#define CASING_POWER_HEAVIER_PISTOL 10 +#define CASING_POWER_HEAVIER_PISTOL 12 #define CASING_POWER_LIGHT_RIFLE 4 #define CASING_POWER_MEDIUM_RIFLE 8 -#define CASING_POWER_HEAVY_RIFLE 12 -#define CASING_POWER_SHOTGUN 8 -#define CASING_POWER_GRENADE 12 +#define CASING_POWER_HEAVY_RIFLE 15 +#define CASING_POWER_SHOTGUN 10 +#define CASING_POWER_GRENADE 15 /// Modifiers for different loads #define CASING_POWER_MOD_HANDLOAD 0.5 diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index f27aa6f098b..52797db39c3 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -693,7 +693,7 @@ GLOBAL_LIST_INIT(main_body_parts, list( #define RUBBERY_RECOIL_RIFLE_GAUSS (BULLET_RECOIL_RIFLE_GAUSS * RUBBERY_RECOIL_MULT) #define RUBBERY_WOUND_RIFLE_GAUSS (BULLET_WOUND_RIFLE_GAUSS * 2) -#define BULLET_DAMAGE_SHOTGUN_PELLET 15 +#define BULLET_DAMAGE_SHOTGUN_PELLET 10 #define BULLET_DAMAGE_RATSHOT_PELLET 6 //six divides easily into the 36 damage of .357, and 60 damage of .45-70 #define BULLET_DAMAGE_SHOTGUN_PELLET_HANDLOAD (BULLET_DAMAGE_SHOTGUN_PELLET * BULLET_HANDLOAD_MULT_DAMAGE) #define BULLET_DAMAGE_SHOTGUN_PELLET_MATCH (BULLET_DAMAGE_SHOTGUN_PELLET * BULLET_MATCH_MULT_DAMAGE) @@ -713,7 +713,7 @@ GLOBAL_LIST_INIT(main_body_parts, list( #define RUBBERY_RECOIL_SHOTGUN_PELLET (BULLET_RECOIL_SHOTGUN_PELLET * RUBBERY_RECOIL_MULT) #define RUBBERY_WOUND_SHOTGUN_PELLET (BULLET_WOUND_SHOTGUN_PELLET * 2) -#define BULLET_DAMAGE_SHOTGUN_SLUG 60 +#define BULLET_DAMAGE_SHOTGUN_SLUG 50 #define BULLET_DAMAGE_SHOTGUN_SLUG_HANDLOAD (BULLET_DAMAGE_SHOTGUN_SLUG * BULLET_HANDLOAD_MULT_DAMAGE) #define BULLET_DAMAGE_SHOTGUN_SLUG_MATCH (BULLET_DAMAGE_SHOTGUN_SLUG * BULLET_MATCH_MULT_DAMAGE) #define BULLET_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * 0.5) @@ -906,20 +906,20 @@ GLOBAL_LIST_INIT(main_body_parts, list( #define BULLET_FALLOFF_MIN_DAMAGE 3 /// Shotgun pellet count defines -#define SHOTGUN_PELLET_BASE 10 -#define SHOTGUN_PELLET_IMPROVISED 8 +#define SHOTGUN_PELLET_BASE 8 +#define SHOTGUN_PELLET_IMPROVISED 6 /// Shotgun pellet spread defines -#define SHOTGUN_SPREAD_BASE 18 -#define SHOTGUN_SPREAD_IMPROVISED 25 +#define SHOTGUN_SPREAD_BASE 25 +#define SHOTGUN_SPREAD_IMPROVISED 18 /// Bullet spread modifier defines -#define BULLET_SPREAD_BASE 2 // Base spread added from 'quality' ammo +#define BULLET_SPREAD_BASE 4 // Base spread added from 'quality' ammo /// Bullet spread modifier defines #define BULLET_SPREAD_MATCH 0 // No extra spread~ -#define BULLET_SPREAD_SURPLUS (BULLET_SPREAD_BASE) // Base spread -#define BULLET_SPREAD_HANDLOAD (BULLET_SPREAD_BASE * 2) // More spread! +#define BULLET_SPREAD_SURPLUS (BULLET_SPREAD_BASE * 2) // More spread! +#define BULLET_SPREAD_HANDLOAD (BULLET_SPREAD_BASE * 4) // Even more spread! /// Bullet wound falloff defines #define BULLET_WOUND_FALLOFF_PISTOL_LIGHT 0 @@ -982,7 +982,7 @@ GLOBAL_LIST_INIT(main_body_parts, list( #define GUN_FIREMODE_AUTO 3 /// Max spread recoil can add -#define GUN_RECOIL_MAX_SPREAD 30 +#define GUN_RECOIL_MAX_SPREAD 50 /// Sawed-off recoil modifier #define SAWEDOFF_RECOIL_MULT 2 @@ -991,13 +991,13 @@ GLOBAL_LIST_INIT(main_body_parts, list( #define HOBO_RECOIL_MULT 2 // Gun Akimbo Spread modifier -#define GUN_AKIMBO_RECOIL_MOD 2 +#define GUN_AKIMBO_RECOIL_MOD 4 // If their other hand is full, multiply recoil by this much #define GUN_FULL_OTHER_HAND_RECOIL_MOD 2 // Global recoil modifier -#define GUN_RECOIL_GLOBAL_MULT 0.75 +#define GUN_RECOIL_GLOBAL_MULT 1 /// Gun recoil modifier per shot defines #define GUN_RECOIL_NONE (GUN_RECOIL_GLOBAL_MULT * 0.1) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 4c85149e7a6..d9294085af5 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2143,6 +2143,7 @@ damage_multiplier = GUN_EXTRA_DAMAGE_0 cock_delay = GUN_COCK_RIFLE_BASE init_recoil = RIFLE_RECOIL(1.3) + slowdown = GUN_SLOWDOWN_RIFLE_LMG init_firemodes = list( /datum/firemode/automatic/rpm150, /datum/firemode/semi_auto/slow @@ -2260,6 +2261,7 @@ damage_multiplier = GUN_EXTRA_DAMAGE_0 cock_delay = GUN_COCK_RIFLE_BASE init_recoil = LMG_RECOIL(1) + slowdown = GUN_SLOWDOWN_RIFLE_LMG init_firemodes = list( /datum/firemode/automatic/rpm200 ) @@ -2287,6 +2289,7 @@ weapon_weight = GUN_ONE_HAND_ONLY damage_multiplier = GUN_EXTRA_DAMAGE_0 init_recoil = LMG_RECOIL(1) + slowdown = GUN_SLOWDOWN_RIFLE_LMG init_firemodes = list( /datum/firemode/automatic/rpm200 ) @@ -2365,7 +2368,7 @@ /obj/item/gun/ballistic/automatic/m1919 name = "Browning M1919" - desc = "This ancient machine gun has been dug up and put into working order by the Dallas Militia. It's loud, heavy and terrifying." + desc = "This ancient machine gun has been dug up and put into working order by local forces. It's loud, heavy and terrifying." icon_state = "M38" item_state = "M38" slot_flags = 0 @@ -2377,6 +2380,7 @@ damage_multiplier = GUN_EXTRA_DAMAGE_0 cock_delay = GUN_COCK_RIFLE_BASE init_recoil = LMG_RECOIL(1.2) + slowdown = GUN_SLOWDOWN_RIFLE_LMG * 1.5 init_firemodes = list( /datum/firemode/automatic/rpm200 ) diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 1d28711310b..861ecae33da 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -95,7 +95,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/tube357 weapon_class = WEAPON_CLASS_RIFLE weapon_weight = GUN_TWO_HAND_ONLY - damage_multiplier = GUN_EXTRA_DAMAGE_T1 + damage_multiplier = GUN_EXTRA_DAMAGE_0 init_recoil = RIFLE_RECOIL(3) init_firemodes = list( /datum/firemode/semi_auto/slow @@ -140,7 +140,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/tube44 weapon_class = WEAPON_CLASS_RIFLE weapon_weight = GUN_TWO_HAND_ONLY - damage_multiplier = GUN_EXTRA_DAMAGE_T1 + damage_multiplier = GUN_EXTRA_DAMAGE_0 init_recoil = RIFLE_RECOIL(3.3) init_firemodes = list( /datum/firemode/semi_auto/slow