From 54468ab0273f6d460b02f8e882911465c227c02c Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 19 May 2024 22:46:47 +0300 Subject: [PATCH 1/5] Update sniper.dm --- code/datums/ammo/bullet/sniper.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index 6d0f0792ec53..c4e678835185 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -135,7 +135,7 @@ if(amr.focused_fire_counter < 2) // Can stack up to twice. amr.focused_fire_counter += 1 else - amr.focused_fire_counter = 2 + amr.focused_fire_counter = 0 else // If it's a new target amr.focused_fire_counter = 0 // Stacks to 0 if(human_firer && !(target_mob.is_dead())) @@ -194,7 +194,7 @@ if(2) to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) if(3) - to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! You're fully focused on the target.")) + to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! It appears the heavy hit has made the target change its patterns.")) else to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else From bc4d0744ae9762b173606f489861aaf7805a5594 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 19 May 2024 23:12:15 +0300 Subject: [PATCH 2/5] better --- code/datums/ammo/bullet/sniper.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index c4e678835185..7d4a0bde91b2 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -135,7 +135,7 @@ if(amr.focused_fire_counter < 2) // Can stack up to twice. amr.focused_fire_counter += 1 else - amr.focused_fire_counter = 0 + amr.focused_fire_counter = -1 else // If it's a new target amr.focused_fire_counter = 0 // Stacks to 0 if(human_firer && !(target_mob.is_dead())) @@ -184,17 +184,17 @@ if((focused_fire_active || isxeno(target_mob)) && !(target_mob.is_dead())) switch(amr_counter) - if(1) + if(0) to_chat(aimed_projectile.firer, SPAN_WARNING("One hit! You begin to carefully track the target's movements.")) if(isxeno(target_mob) && isxeno(old_target?.resolve())) var/mob/living/carbon/xenomorph/old_xeno = old_target.resolve() var/mob/living/carbon/xenomorph/new_xeno = target_mob if((old_xeno.hive == new_xeno.hive) && !(old_xeno.stat)) // Must be in same hive and conscious to_chat(old_xeno,SPAN_XENOLEADER("The feeling of looming danger fades as we sense that another sister has been targeted instead.")) - if(2) + if(1) to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) - if(3) - to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! It appears the heavy hit has made the target change its patterns.")) + if(2) + to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else From 86b9b072f50111cc1a1222ea8715deefc2eaa216 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 19 May 2024 23:12:53 +0300 Subject: [PATCH 3/5] Update sniper.dm --- code/datums/ammo/bullet/sniper.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index 7d4a0bde91b2..0861c566645f 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -184,16 +184,16 @@ if((focused_fire_active || isxeno(target_mob)) && !(target_mob.is_dead())) switch(amr_counter) - if(0) + if(1) to_chat(aimed_projectile.firer, SPAN_WARNING("One hit! You begin to carefully track the target's movements.")) if(isxeno(target_mob) && isxeno(old_target?.resolve())) var/mob/living/carbon/xenomorph/old_xeno = old_target.resolve() var/mob/living/carbon/xenomorph/new_xeno = target_mob if((old_xeno.hive == new_xeno.hive) && !(old_xeno.stat)) // Must be in same hive and conscious to_chat(old_xeno,SPAN_XENOLEADER("The feeling of looming danger fades as we sense that another sister has been targeted instead.")) - if(1) - to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) if(2) + to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) + if(3) to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) From 3d8162d50a08ca859353f0278472bd3113a7e3d7 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 19 May 2024 23:13:56 +0300 Subject: [PATCH 4/5] Update sniper.dm --- code/datums/ammo/bullet/sniper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index 0861c566645f..7f4ada6c4f24 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -194,7 +194,7 @@ if(2) to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) if(3) - to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) + to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! You're fully focused on the target. You notice they are starting to change their patterns.")) else to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else From 1097c6b77d3f62f0825356f4c96cd7d9c8ed4afb Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Wed, 22 May 2024 21:27:16 +0300 Subject: [PATCH 5/5] review --- code/datums/ammo/bullet/sniper.dm | 6 +++--- code/modules/projectiles/guns/specialist/sniper.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index 7f4ada6c4f24..fa45b269d810 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -132,10 +132,10 @@ old_target = amr.focused_fire_target if(target_mob == (amr.focused_fire_target?.resolve())) - if(amr.focused_fire_counter < 2) // Can stack up to twice. + if(amr.focused_fire_counter < 3) // Can stack up to twice. amr.focused_fire_counter += 1 else - amr.focused_fire_counter = -1 + amr.focused_fire_counter = 0 else // If it's a new target amr.focused_fire_counter = 0 // Stacks to 0 if(human_firer && !(target_mob.is_dead())) @@ -144,7 +144,7 @@ human_firer.focused_fire_marker = focused_fire_marker_temp // Store new marker ref human_firer.client?.images += focused_fire_marker_temp // Add new marker - amr_counter = amr.focused_fire_counter + 1 + amr_counter = min(amr.focused_fire_counter + 1, 3) amr.focused_fire_target = WEAKREF(target_mob) var/size_damage_mod = 0.8 // 1.8x vs Non-Xenos (225) diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index 4c5a4fb129cd..fe79d995d1a6 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -128,7 +128,7 @@ if(istype(sniper_rifle, /obj/item/weapon/gun/rifle/sniper/XM43E1)) var/obj/item/weapon/gun/rifle/sniper/XM43E1/amr = sniper_rifle - if((amr.focused_fire_counter >= 1) && (target == amr.focused_fire_target?.resolve())) + if((amr.focused_fire_counter >= 1 && amr.focused_fire_counter < 3) && (target == amr.focused_fire_target?.resolve())) sniper_rifle.enable_aimed_shot_icon_alt = TRUE else sniper_rifle.enable_aimed_shot_icon_alt = FALSE