Skip to content

Commit

Permalink
Merge pull request #2 from EtheoBoxxman/nocsight
Browse files Browse the repository at this point in the history
Ports Nocsight from Hearthstone
  • Loading branch information
TheGreatKitsune authored Sep 9, 2024
2 parents 34ec66c + 542cc17 commit 9b2da27
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

//Hearthstone port (Tracking)
#define TRAIT_PERFECT_TRACKER "Perfect Tracker" //Will always find any tracks and analyzes them perfectly.
#define TRAIT_NOCSIGHT "Blessing of Noc" // I can see just a bit more clearly in darkness.
//Hearthstone/Azure end.

// ROGUEspecialTRAITS (description when rmb skills button)
Expand Down Expand Up @@ -143,6 +144,7 @@ GLOBAL_LIST_INIT(roguetraits, list(
TRAIT_WATERBREATHING = span_info("I do not drown in bodies of water."),
TRAIT_NUDE_SLEEPER = span_warning("I can't fall asleep unless I'm nude and in bed."),
TRAIT_ABYSSOR_SWIM = "I get far less tired when swimming than my peers.",
TRAIT_NOCSIGHT = "Noc blesses my eyes to be unburdened by the night.", //Hearthstone port.
))

// trait accessor defines
Expand Down
1 change: 1 addition & 0 deletions code/datums/gods/patrons/divine_pantheon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
domain = "God of the Moon, Night, and Knowledge"
desc = "The Firstborn of Psydon, twin of Astrata, gifted man divine knowledge."
worshippers = "Wizards and Scholars"
mob_traits = list(TRAIT_NOCSIGHT)
t1 = /obj/effect/proc_holder/spell/invoked/blindness
t2 = /obj/effect/proc_holder/spell/invoked/invisibility
confess_lines = list(
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,10 @@
sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
see_in_dark = max(see_in_dark, 8)

if(HAS_TRAIT(src, TRAIT_NOCSIGHT))
E.lighting_alpha = LIGHTING_PLANE_ALPHA_LESSER_NV_TRAIT
E.see_in_dark = 7

if(see_override)
see_invisible = see_override
. = ..()
Expand Down

0 comments on commit 9b2da27

Please sign in to comment.