Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AMR Anti-Focusing nerfs #6311

Merged
merged 5 commits into from
May 24, 2024
Merged

AMR Anti-Focusing nerfs #6311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54468ab
Update sniper.dm
Git-Nivrak May 19, 2024
bc4d074
better
Git-Nivrak May 19, 2024
86b9b07
Update sniper.dm
Git-Nivrak May 19, 2024
3d8162d
Update sniper.dm
Git-Nivrak May 19, 2024
1097c6b
review
Git-Nivrak May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/datums/ammo/bullet/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 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()))
Expand All @@ -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)
Expand Down Expand Up @@ -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! 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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/specialist/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading