cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You no longer need to reach the very edge of the game screen to reach the maximum zoom range when scoped (#28584)

Browse Source 
* You no longer need to reach the very edge of the game screen to reach the maximum zoom range when scoped (#84544)

## About The Pull Request
This PR multiplies, by 1.1, and caps the x and y offset coords of the
zoom cursor catcher to make it humanly beareable to reach the maximum
zoom range without slipping the cursor out of the game screen.

## Why It's Good For The Game
The scope component is nice but it can be annoying at times.

## Changelog

🆑
qol: You no longer need to reach the very edge of the game screen to
reach the maximum zoom range when scoped.
/🆑

* You no longer need to reach the very edge of the game screen to reach the maximum zoom range when scoped

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-04 07:13:06 +02:00
committed by GitHub
parent 23b045f42f
commit bc4eae9a95
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/scope.dm
+11 -2
View File
@@ -1,3 +1,6 @@
///Used to allow reaching the maximum offset range without exiting the boundaries of the game screen.
#define MOUSE_POINTER_OFFSET_MULT 1.1
///A component that allows players to use the item to zoom out. Mainly intended for firearms, but now works with other items too.
/datum/component/scope
/// How far we can extend, with modifier of 1, up to our vision edge, higher numbers multiply.
@@ -249,6 +252,12 @@
icon_y = text2num(LAZYACCESS(modifiers, ICON_Y))
if(isnull(icon_y))
icon_y = view_list[2]*world.icon_size/2
given_x = round(range_modifier * (icon_x - view_list[1]*world.icon_size/2))
given_y = round(range_modifier * (icon_y - view_list[2]*world.icon_size/2))
var/x_cap = range_modifier * view_list[1]*world.icon_size / 2
var/y_cap = range_modifier * view_list[2]*world.icon_size / 2
var/uncapped_x = round(range_modifier * (icon_x - view_list[1]*world.icon_size/2) * MOUSE_POINTER_OFFSET_MULT)
var/uncapped_y = round(range_modifier * (icon_y - view_list[2]*world.icon_size/2) * MOUSE_POINTER_OFFSET_MULT)
given_x = clamp(uncapped_x, -x_cap, x_cap)
given_y = clamp(uncapped_y, -y_cap, y_cap)
given_turf = locate(owner.x+round(given_x/world.icon_size, 1),owner.y+round(given_y/world.icon_size, 1),owner.z)
#undef MOUSE_POINTER_OFFSET_MULT