cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Transcendent Olfaction fix: Pesky closets (#83993)

Browse Source 
## About The Pull Request

Change to using the more robust get_turf method to get locations, as all
pinpointers currently do.

## Why It's Good For The Game

The transcendent olfaction mutation is currently broken. When the target
is inside a container, its x y z becomes zero, so it will always say the
target is below you when comparing your z level to it, and it won't even
point in the right direction. This PR fixes that.

## Changelog

🆑
fix: Transcendent Olfaction mutation now works properly
/🆑
This commit is contained in:
Kaostico
2024-06-17 22:44:50 +02:00
committed by GitHub
parent 0ccb927b5c
commit c2e1ab080c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mutations/olfaction.dm
+6 -3
View File
@@ -119,6 +119,9 @@
/// Actually go through and give the user a hint of the direction our target is.
/datum/action/cooldown/spell/olfaction/proc/on_the_trail(mob/living/caster)
var/mob/living/carbon/current_target = tracking_ref?.resolve()
//Using get_turf to deal with those pesky closets that put your x y z to 0
var/turf/current_target_turf = get_turf(current_target)
var/turf/caster_turf = get_turf(caster)
if(!current_target)
to_chat(caster, span_warning("You're not tracking a scent, but the game thought you were. \
Something's gone wrong! Report this as a bug."))
@@ -130,14 +133,14 @@
to_chat(caster, span_warning("You smell out the trail to yourself. Yep, it's you."))
return
if(caster.z < current_target.z)
if(caster_turf.z < current_target_turf.z)
to_chat(caster, span_warning("The trail leads... way up above you? Huh. They must be really, really far away."))
return
else if(caster.z > current_target.z)
else if(caster_turf.z > current_target_turf.z)
to_chat(caster, span_warning("The trail leads... way down below you? Huh. They must be really, really far away."))
return
var/direction_text = span_bold("[dir2text(get_dir(caster, current_target))]")
var/direction_text = span_bold("[dir2text(get_dir(caster_turf, current_target_turf))]")
if(direction_text)
to_chat(caster, span_notice("You consider [current_target]'s scent. The trail leads [direction_text]."))