mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-19 13:35:10 +00:00
41f20bc3ce
## About The Pull Request Hello friends, I've been on a bit of a lighting kick recently, and I decided I clearly do not have enough things to work on as it is. This pr adds angle support to static lights, and a concepting/debug tool for playing with lights on a map. Let's start from first principles yeah? ### Why Angled Lights? Mappers, since they can't actually see a light's effect in editor, tend to go off gut. That gut is based more off what "makes sense" then how things actually work This means they'll overplace light sources, and also they tend to treat lights, particularly light "bars" (the bigger ones) as directional. So you'll have two lights on either sides of a pillar, lights inside a room with lights outside pointing out, etc.  This has annoying side effects. A lot of our map is overlit, to the point that knocking out a light does.... pretty much nothing. I find this sad, and would like to work to prevent it. I think dark and dim, while it does not suit the normal game, is amazing for vibes, and I want it to be easier to see that. Angled lights bring how lights work more in line with how mappers expect lights work, and avoids bleedover into rooms that shouldn't be bled into, working towards that goal of mine. ### How Angled Lights? This is more complex then you'd first think so we'll go step by step  Oh before we start, some catchup from the last time I touched lighting code. Instead of doing a lighting falloff calculation for each lighting corner (a block that represents the resolution of our lights) in view we instead generate cached lightsheets. These precalculate and store all possible falloffs for x and y distances from a source. This is very useful for angle work, since it makes it almost totally free. Atoms get 2 new values. light_angle and light_dir Light angle is the angle the light uses, and light_dir is a cardinal direction it displays in We take these values, and inside sheetbuilding do some optional angle work. getting the center angle, the angle of a pair of coords, and then the delta between them. This is then multiplied against the standard falloff formula, and job done. We do need some extra fenangling to make this all work nicely tho. We currently use a pixel turf var stored on the light source to do distance calculations. This is the turf we pretend the light source is on for visuals, most often used to make wall lights work nice. The trouble is it's not very granular, and doesn't always have the effect you might want. So, instead of generating and storing a pixel turf to do our distance calculations against, we store x and y offset variables. We use them to expand our working range and sheet size to ensure things visually make sense, and then offset any positions by them. I've added a way for sources to have opinions on their offsets too, and am using them for wall lights. This ensures the angle calculations don't make the wall behind a light fulldark, which would be silly. ### Debug Tool? In the interest of helping with that core problem, lights being complex to display, I've added a prototyping tool to the game. It's locked behind mapping verbs, and works about like this. Once the verb is activated, it iterates over all the sources in the world (except turfs because those are kinda silly), outlining and "freezing" them, preventing any future changes. Then, it adds 3 buttons to the owners of a light source.  The first button toggles the light on and off, as desired. The third allows you to move the source around, with a little targeting icon replacing your mouse The second tho, that's more interesting. The second button opens a debug menu for that light  There's a lot here, let's go through it. Bit on the left is a list of templates, which allow you to sample existing light types (No I have no idea why the background is fullwhite, need to work on that pre merge) You can choose one by clicking it, and hitting the upload button. This replaces your existing lighting values with the template's, alongside replacing its icon and icon state so it looks right. There are three types as of now, mostly for categorization. Bar, which are the larger typically stronger lights, Bulb, which are well, bulbs, and Misc which could be expanded, but currently just contains floor lights. Alongside that you can manually edit the power, range, color and angle of the focused light. I also have support for changing the direction of the light source, since anything that uses directional lighting would also tie light dir to it. This isn't *always* done tho, so I should maybe find a way to edit light dir too. My hope is this tool will allow for better concepting of a room's lights, and easier changing of individual object's light values to suit the right visuals. ### Lemon No Why What Ok so I applied angle lights to bars and bulbs, which means I am changing the lighting of pretty much every map in the codebase. I'm gonna uh, go check my work. Alongside this I intend to give lighting some depth. So if there's room to make a space warmer, or highlight light colors from other sources, I will do that. (Images as examples)  I also want to work on that other goal of mine, making breaking lights matter. So I'll be doing what I can to ensure you only need to break one light to make a meaningful change in the scene. This is semi complicated by one light source not ever actually reaching fullbright on its own, but we do what we must because we can.  I'm as I hope you know biased towards darker spaces, I think contrast has vibes. In particular I do not think strong lights really suit maintenance. Most of what is used there are bulbs, so I'm planning on replacing most uses with low power bulbs, to keep light impacts to rooms, alongside reducing the amount of lights placed in the main tunnels  **If you take issue with this methodology please do so NOW**, I don't want to have to do another pass over things. Oh also I'm saving station maps for last since ruins are less likely to get touched in mapping march and all. ### Misc + Finishing Thoughts Light templates support mirroring vars off typepaths using a subtype, which means all the templates added here do not require updating if the source type changes somehow. I'd like to expand the template list at some point, perhaps in future. I've opened this as a draft to make my intentions to make my changes to lights known, and to serve as motivation for all the map changes I need to do. ### Farish Future I'm unhappy with how we currently configure lights. I would like a system that more directly matches the idea of drawing falloff curves, along with allowing for different falloffs for different colors, alongside extending the idea to angle falloff. This would make out of engine lighting easier, allow for nicer looking lights (red to pink, blue to purple, etc), and improve accessibility by artists. This is slightly far off, because I have other obligations and it's kinda complicated, but I'd like to mention it cause it's one of my many pipedreams. ## Changelog 🆑 add: Added angle lighting, applies it to most wall lights! add: Adds a lighting prototyping tool, mappers go try it out (it's locked behind the mapping verb) /🆑 --------- Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
110 lines
5.5 KiB
Plaintext
110 lines
5.5 KiB
Plaintext
|
|
/// how much health healed from casting a chuuni spell
|
|
#define CHUUNIBYOU_HEAL_AMOUNT 3
|
|
///cooldown between healing to prevent stuff like instant blink spell spam healing
|
|
#define CHUUNIBYOU_COOLDOWN_TIME 5 SECONDS
|
|
|
|
/**
|
|
* ## chuunibyou component!
|
|
*
|
|
* Component that makes casted spells always a shout invocation, a very dumb one. And their projectiles are dumb too.
|
|
* Oh, but it does heal after each spell cast.
|
|
*/
|
|
/datum/component/chuunibyou
|
|
/// invocations per school the spell is from
|
|
var/static/list/chuunibyou_invocations
|
|
/// amount healed per spell cast
|
|
var/heal_amount = CHUUNIBYOU_HEAL_AMOUNT
|
|
/// cooldown for healing
|
|
COOLDOWN_DECLARE(heal_cooldown)
|
|
/// are we casting a spell right now
|
|
var/casting_spell = FALSE
|
|
|
|
/datum/component/chuunibyou/Initialize()
|
|
if(!isliving(parent))
|
|
return COMPONENT_INCOMPATIBLE
|
|
if(!chuunibyou_invocations)
|
|
chuunibyou_invocations = list(
|
|
SCHOOL_UNSET = "This is embarrassing... I can't remember the words... um... maybe if I just wave my hand like this... no, that's not wor- Ah! There it goes!",
|
|
SCHOOL_HOLY = "By the grace of the holy one, I summon the light of salvation. Let my allies rejoice. O, Heaven! Bless them!",
|
|
SCHOOL_PSYCHIC = "By the secret of the hidden one, I reveal the truth of creation. Let my mind expand. O, Mystery! Enlighten me!",
|
|
SCHOOL_MIME = "O, Silence! Embrace my soul and amplify my gesture. Let me create the illusion and manipulate the perception!",
|
|
SCHOOL_RESTORATION = "I invoke the name of the goddess of mercy, hear my plea and grant your blessing to this soul! Divine Grace!",
|
|
|
|
SCHOOL_EVOCATION = "Behold, the ultimate power of the Dark Flame Master! I call upon the ancient forces of chaos and destruction to unleash their wrath upon my enemies!",
|
|
SCHOOL_TRANSMUTATION = "I invoke the law of equivalent exchange, the balance of the cosmos. As I offer this sacrifice, I demand a new creation. Reveal, the mystery of transmutation!",
|
|
SCHOOL_TRANSLOCATION = "By the power of the spatial rifts, I bend the fabric of reality and move across the dimensions! Let nothing stand in my way as I travel to my destination!",
|
|
SCHOOL_CONJURATION = "With the eye of fate, I see through the threads of destiny. Nothing can hide from me. Witness me, witness the miracle of manifestation!",
|
|
|
|
SCHOOL_NECROMANCY = "I am the Lord of the Dead, the Master of Bones, the Ruler of Shadows. I command the legions of the damned to rise from their graves and serve me!",
|
|
SCHOOL_FORBIDDEN = "I renounce the laws of this world and embrace the chaos of the old gods! Let the forbidden power flow through me and destroy everything in its path!",
|
|
SCHOOL_SANGUINE = "I cover my eye with an eyepatch to seal my true power, but now I will unleash it upon you. I feast on the life force of my prey and grow stronger with every drop!",
|
|
)
|
|
|
|
/datum/component/chuunibyou/RegisterWithParent()
|
|
. = ..()
|
|
RegisterSignal(parent, COMSIG_MOB_SPELL_PROJECTILE, PROC_REF(on_spell_projectile))
|
|
RegisterSignal(parent, COMSIG_MOB_PRE_INVOCATION, PROC_REF(on_pre_invocation))
|
|
RegisterSignal(parent, COMSIG_LIVING_TRY_SPEECH, PROC_REF(on_try_speech))
|
|
RegisterSignal(parent, COMSIG_MOB_AFTER_SPELL_CAST, PROC_REF(on_after_spell_cast))
|
|
|
|
/datum/component/chuunibyou/UnregisterFromParent()
|
|
. = ..()
|
|
UnregisterSignal(parent, list(
|
|
COMSIG_MOB_SPELL_PROJECTILE,
|
|
COMSIG_MOB_PRE_INVOCATION,
|
|
COMSIG_LIVING_TRY_SPEECH,
|
|
COMSIG_MOB_AFTER_SPELL_CAST,
|
|
))
|
|
|
|
/// signal sent when the parent tries to speak. we let speech pass if we are casting a spell so mimes still chuuni their spellcasts
|
|
/// (this may end in the mime dying)
|
|
/datum/component/chuunibyou/proc/on_try_speech(datum/source, message, ignore_spam, forced)
|
|
SIGNAL_HANDLER
|
|
|
|
if(casting_spell)
|
|
return COMPONENT_CAN_ALWAYS_SPEAK
|
|
|
|
///signal sent when the parent casts a spell that has a projectile
|
|
/datum/component/chuunibyou/proc/on_spell_projectile(mob/living/source, datum/action/cooldown/spell/spell, atom/cast_on, obj/projectile/to_fire)
|
|
SIGNAL_HANDLER
|
|
|
|
playsound(to_fire,'sound/magic/staff_change.ogg', 75, TRUE)
|
|
to_fire.color = "#f825f8"
|
|
to_fire.name = "chuuni-[to_fire.name]"
|
|
to_fire.set_light(2, 2, LIGHT_COLOR_PINK, l_on = TRUE)
|
|
|
|
///signal sent before parent invokes a spell
|
|
/datum/component/chuunibyou/proc/on_pre_invocation(mob/living/source, datum/action/cooldown/spell/spell, list/invocation_list)
|
|
SIGNAL_HANDLER
|
|
|
|
// this makes it bypass speech checks (being a mime) until the spell is done casting
|
|
// this lets mimes cast with it, but, um... might get them lynched
|
|
casting_spell = TRUE
|
|
invocation_list[INVOCATION_TYPE] = INVOCATION_SHOUT
|
|
invocation_list[INVOCATION_GARBLE_PROB] = 0
|
|
var/chuuni_invocation = chuunibyou_invocations[spell.school]
|
|
if(!chuuni_invocation) // someone forgot to update the CHUUNI LIST to include a desc for the new school
|
|
stack_trace("Chunnibyou invocations is missing a line for spell school \"[spell.school]\"")
|
|
chuuni_invocation = chuunibyou_invocations[SCHOOL_UNSET]
|
|
invocation_list[INVOCATION_MESSAGE] = chuuni_invocation
|
|
|
|
///signal sent after parent casts a spell
|
|
/datum/component/chuunibyou/proc/on_after_spell_cast(mob/living/source, datum/action/cooldown/spell/spell, atom/cast_on)
|
|
SIGNAL_HANDLER
|
|
|
|
casting_spell = FALSE
|
|
if(!COOLDOWN_FINISHED(src, heal_cooldown))
|
|
return
|
|
COOLDOWN_START(src, heal_cooldown, CHUUNIBYOU_COOLDOWN_TIME)
|
|
|
|
source.heal_overall_damage(heal_amount)
|
|
playsound(source, 'sound/magic/staff_healing.ogg', 30)
|
|
to_chat(source, span_danger("You feel slightly healed by your chuuni powers."))
|
|
|
|
/datum/component/chuunibyou/no_healing
|
|
heal_amount = 0
|
|
|
|
#undef CHUUNIBYOU_HEAL_AMOUNT
|
|
#undef CHUUNIBYOU_COOLDOWN_TIME
|