mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 20:11:04 +01:00
Psionics Rework: Kyoushiki Murasaki (#16951)
* Your unbeatable smile wrecks the media We wanna know your secret, so mysterious * Even the things she lacks end up in her area Such a perfect liar, you are * Miss ingenious, godly idol! (You're my savior, you're my saving grace) * So, what'd you eat today? What's your favorite book? * And if you wanna go to play, where are you gonna go? I haven't eaten at all * That's a secret No matter what you ask * She's elusive, evasive * So nonchalant Yet still shining bright; * Her secret: out of sight, as if visible, has the taste of honey There is none, none, none of this * And also none, none, none of that What type of guy do you like? * Who is your partner? Come on, answer me * "I don't understand what falling in love with someone else is like" (Hey! Hey!) I cannot tell what is true from what is a lie (Hey! Hey! Hey! Hey!) * And yet again, someone falls for such words (Hey! Hey! Hey! Hey!) Gently lulled into love * Drawing everyone's eyes You are the perfect, ultimate idol * Never to appear again A reincarnation of Venus * With that smile, with that "I love you" You captivate everyone * Even if those eyes, those words, are false They make up a perfect love (Ai) * Yeah, yeah, that girl stands out, exceptional We were extras from the beginning * BS that acted as adornments for the star's leading role Everything we've accomplished is thanks to her — no! * How impudent How could envy and jealousy not exist? * examine * This isn't some made-up drama for appearances So I cannot forgive * You're not perfect, I cannot forgive you I cannot forgive myself * I cannot accept any version of you other than the one stronger than everyone else * Everybody trusts and worships The very strongest, most invincible idol * Weaknesses and whatnot are not to be found Carrying the morning star within * Showing any weakness is no good, no good (Hey! Hey!) Don't let them see anything that they don't want to know (Hey! Hey! Hey! Hey!) * Anything but being one-of-a-kind is a definite no, no (Hey! Hey! Hey! Hey!) That is the real love (Hey!) * can commune fixes * can commune rename * fix is psi blocked * fixes agian * My signature smile that fires up the media The only secret that I shall keep is this: * My career was built upon fake "I love you"s This is love, in my own way * Even the flowing sweats are beautiful Aqua These eyelids that hid the Ruby within * Sing, dance, flutter, I am Maria — Right, lying is the most exquisite form of love * I have never been loved by anyone Nor have I loved anyone else * That such lies of mine will become true someday I trust in it * Someday, surely, I will have it all in hand I am such a greedy idol * Because I wish to love everybody properly in a life-sized way I shall lie today as well (Hey! Hey! Hey! Hey!) * a * b * c * d * And yet, still, (Hey! Hey!) I have been unable to tell you, and you, alone (Hey! Hey! Hey! Hey!) * jesus christ * Update code/controllers/subsystems/processing/psi.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/controllers/subsystems/processing/psi.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/controllers/subsystems/processing/psi.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/game/gamemodes/technomancer/spell_objs.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human_helpers.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/organs/organ_external.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/assay.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/command.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/emotional_suggestion.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/grip.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/grip.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/mend.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/mend.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/mend.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/psi_search.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/shockwave.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/shockwave.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/singularity.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/abilities/time_stop.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/events/mini_spasm.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/psionics/interface/ui_hub.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * cl update --------- Co-authored-by: Matt Atlas <liermattia@gmail.com> Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Matt Atlas
co-authored by
Fluffy
Matt Atlas
Fluffy
Matt Atlas
parent
a894c77990
commit
d9b79db97b
@@ -1,38 +1,15 @@
|
||||
/datum/psi_complexus/proc/update(var/force)
|
||||
|
||||
set waitfor = FALSE
|
||||
|
||||
var/last_rating = rating
|
||||
var/highest_faculty
|
||||
var/highest_rank = 0
|
||||
var/combined_rank = 0
|
||||
for(var/faculty in ranks)
|
||||
var/check_rank = get_rank(faculty)
|
||||
if(check_rank == 1)
|
||||
LAZYADD(latencies, faculty)
|
||||
else
|
||||
if(check_rank <= 0)
|
||||
ranks -= faculty
|
||||
LAZYREMOVE(latencies, faculty)
|
||||
combined_rank += check_rank
|
||||
if(!highest_faculty || highest_rank < check_rank)
|
||||
highest_faculty = faculty
|
||||
highest_rank = check_rank
|
||||
|
||||
UNSETEMPTY(latencies)
|
||||
var/rank_count = max(1, LAZYLEN(ranks))
|
||||
if(force || last_rating != Ceiling(combined_rank/rank_count))
|
||||
if(highest_rank <= 1)
|
||||
if(highest_rank == 0)
|
||||
qdel(src)
|
||||
if(force || last_psionic_rank != psionic_rank)
|
||||
if(psionic_rank == 0)
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
rebuild_power_cache = TRUE
|
||||
sound_to(owner, 'sound/effects/psi/power_unlock.ogg')
|
||||
rating = Ceiling(combined_rank/rank_count)
|
||||
cost_modifier = 1
|
||||
if(rating > 1)
|
||||
cost_modifier -= min(1, max(0.1, (rating-1) / 10))
|
||||
if(psionic_rank > 1)
|
||||
cost_modifier -= min(1, max(0.1, psionic_rank / 10))
|
||||
if(!ui)
|
||||
ui = new(owner)
|
||||
if(owner.client)
|
||||
@@ -40,35 +17,60 @@
|
||||
else
|
||||
if(owner.client)
|
||||
owner.client.screen |= ui
|
||||
if(!suppressed && owner.client)
|
||||
for(var/thing in SSpsi.all_aura_images)
|
||||
owner.client.images |= thing
|
||||
|
||||
var/image/aura_image = get_aura_image()
|
||||
if(rating >= PSI_RANK_PARAMOUNT) // spooky boosters
|
||||
if(psionic_rank >= PSI_RANK_APEX) // spooky boosters
|
||||
aura_color = "#aaffaa"
|
||||
aura_image.blend_mode = BLEND_SUBTRACT
|
||||
else
|
||||
aura_image.blend_mode = BLEND_ADD
|
||||
if(highest_faculty == PSI_COERCION)
|
||||
aura_color = "#cc3333"
|
||||
else if(highest_faculty == PSI_PSYCHOKINESIS)
|
||||
aura_color = "#3333cc"
|
||||
else if(highest_faculty == PSI_REDACTION)
|
||||
aura_color = "#33cc33"
|
||||
else if(highest_faculty == PSI_ENERGISTICS)
|
||||
if(psionic_rank == PSI_RANK_SENSITIVE)
|
||||
aura_color = "#cccc33"
|
||||
else if(psionic_rank == PSI_RANK_HARMONIOUS)
|
||||
aura_color = "#64c464"
|
||||
|
||||
if(psionic_rank > PSI_RANK_SENSITIVE && last_psionic_rank < PSI_RANK_HARMONIOUS)
|
||||
switch(psionic_rank)
|
||||
if(PSI_RANK_HARMONIOUS)
|
||||
psi_points = PSI_POINTS_HARMONIOUS
|
||||
if(PSI_RANK_APEX)
|
||||
psi_points = PSI_POINTS_APEX
|
||||
if(PSI_RANK_LIMITLESS)
|
||||
psi_points = PSI_POINTS_LIMITLESS
|
||||
/// We had special abilities unique to our level, so get rid of 'em.
|
||||
if(last_psionic_rank > PSI_RANK_HARMONIOUS)
|
||||
wipe_user_abilities()
|
||||
|
||||
if(last_psionic_rank > PSI_RANK_SENSITIVE && psionic_rank < PSI_RANK_HARMONIOUS)
|
||||
psi_points = 0
|
||||
wipe_user_abilities()
|
||||
|
||||
if(!announced && owner && owner.client && !QDELETED(src))
|
||||
announced = TRUE
|
||||
to_chat(owner, "<hr>")
|
||||
to_chat(owner, SPAN_NOTICE("<font size = 3>You are <b>psionic</b>, touched by powers beyond understanding.</font>"))
|
||||
to_chat(owner, SPAN_NOTICE("<b>Shift-left-click your Psi icon</b> on the bottom right to <b>view a summary of how to use them</b>, or <b>left click</b> it to <b>suppress or unsuppress</b> your psionics. Beware: overusing your gifts can have <b>deadly consequences</b>."))
|
||||
to_chat(owner, SPAN_NOTICE("<b>Left-click</b> your psionic icon to open your Psionic Point Shop, which contains information about your powers. \
|
||||
You can also <b>shift-click</b> your ability icons on the top right to know more about them. \
|
||||
Beware: overusing your gifts can have <b>deadly consequences</b>."))
|
||||
to_chat(owner, "<hr>")
|
||||
|
||||
if(get_rank() >= PSI_RANK_SENSITIVE)
|
||||
for(var/singleton/psionic_power/P in GET_SINGLETON_SUBTYPE_LIST(/singleton/psionic_power))
|
||||
if((P.ability_flags & PSI_FLAG_FOUNDATIONAL) || (P.ability_flags & PSI_FLAG_APEX && get_rank() >= PSI_RANK_APEX) || (P.ability_flags & PSI_FLAG_LIMITLESS && get_rank() >= PSI_RANK_LIMITLESS))
|
||||
if(!(P.type in psionic_powers))
|
||||
P.apply(owner)
|
||||
|
||||
/datum/psi_complexus/proc/wipe_user_abilities()
|
||||
for(var/obj/screen/ability/obj_based/psionic/P in owner.ability_master.ability_objects)
|
||||
if((P.connected_power.ability_flags & PSI_FLAG_APEX) && get_rank() < PSI_RANK_APEX)
|
||||
owner.ability_master.remove_ability(P)
|
||||
if((P.connected_power.ability_flags & PSI_FLAG_LIMITLESS) && get_rank() < PSI_RANK_LIMITLESS)
|
||||
owner.ability_master.remove_ability(P)
|
||||
|
||||
/datum/psi_complexus/process()
|
||||
|
||||
var/update_hud
|
||||
|
||||
if(stun)
|
||||
stun--
|
||||
if(stun)
|
||||
@@ -77,6 +79,7 @@
|
||||
update_hud = TRUE
|
||||
else
|
||||
to_chat(owner, SPAN_NOTICE("You have recovered your mental composure."))
|
||||
suppressed = FALSE
|
||||
update_hud = TRUE
|
||||
return
|
||||
|
||||
@@ -86,11 +89,11 @@
|
||||
else if(owner?.stat == UNCONSCIOUS)
|
||||
stamina = min(max_stamina, stamina + rand(3,5))
|
||||
|
||||
if(!owner.nervous_system_failure() && owner.stat == CONSCIOUS && stamina && !suppressed && get_rank(PSI_REDACTION) >= PSI_RANK_OPERANT)
|
||||
attempt_regeneration()
|
||||
if(armor_component)
|
||||
spend_power(1)
|
||||
|
||||
var/next_aura_size = max(0.1,((stamina/max_stamina)*min(3,rating))/5)
|
||||
var/next_aura_alpha = round(((suppressed ? max(0,rating - 2) : rating)/5)*255)
|
||||
var/next_aura_size = max(0.1, ((stamina / max_stamina)*min(3, psionic_rank)) / 3)
|
||||
var/next_aura_alpha = round(((suppressed ? max(0, psionic_rank - 2) : psionic_rank) / 5)*255)
|
||||
|
||||
if(next_aura_alpha != last_aura_alpha || next_aura_size != last_aura_size || aura_color != last_aura_color)
|
||||
last_aura_size = next_aura_size
|
||||
@@ -103,126 +106,3 @@
|
||||
|
||||
if(update_hud)
|
||||
ui.update_icon()
|
||||
|
||||
/datum/psi_complexus/proc/attempt_regeneration()
|
||||
|
||||
var/heal_general = FALSE
|
||||
var/heal_poison = FALSE
|
||||
var/heal_internal = FALSE
|
||||
var/heal_bleeding = FALSE
|
||||
var/heal_rate = 0
|
||||
var/mend_prob = 0
|
||||
|
||||
var/use_rank = get_rank(PSI_REDACTION)
|
||||
if(use_rank >= PSI_RANK_PARAMOUNT)
|
||||
heal_general = TRUE
|
||||
heal_poison = TRUE
|
||||
heal_internal = TRUE
|
||||
heal_bleeding = TRUE
|
||||
mend_prob = 50
|
||||
heal_rate = 7
|
||||
else if(use_rank == PSI_RANK_GRANDMASTER)
|
||||
heal_poison = TRUE
|
||||
heal_internal = TRUE
|
||||
heal_bleeding = TRUE
|
||||
mend_prob = 20
|
||||
heal_rate = 5
|
||||
else if(use_rank == PSI_RANK_MASTER)
|
||||
heal_internal = TRUE
|
||||
heal_bleeding = TRUE
|
||||
mend_prob = 10
|
||||
heal_rate = 3
|
||||
else if(use_rank == PSI_RANK_OPERANT)
|
||||
heal_bleeding = TRUE
|
||||
mend_prob = 5
|
||||
heal_rate = 1
|
||||
else
|
||||
return
|
||||
|
||||
if(!heal_rate || stamina < heal_rate)
|
||||
return // Don't backblast from trying to heal ourselves thanks.
|
||||
|
||||
if(ishuman(owner))
|
||||
|
||||
var/mob/living/carbon/human/H = owner
|
||||
|
||||
// Fix some pain.
|
||||
if(heal_rate > 0)
|
||||
H.shock_stage = max(0, H.shock_stage - max(1, round(heal_rate/2)))
|
||||
|
||||
// Mend internal damage.
|
||||
if(prob(mend_prob))
|
||||
|
||||
// Fix our heart if we're paramount.
|
||||
if(heal_general && H.is_asystole() && H.should_have_organ(BP_HEART) && spend_power(heal_rate))
|
||||
H.resuscitate()
|
||||
|
||||
// Heal organ damage.
|
||||
if(heal_internal)
|
||||
for(var/obj/item/organ/I in H.internal_organs)
|
||||
|
||||
if(BP_IS_ROBOTIC(I))
|
||||
continue
|
||||
|
||||
if(I.damage > 0 && spend_power(heal_rate))
|
||||
I.damage = max(I.damage - heal_rate, 0)
|
||||
if(prob(25))
|
||||
to_chat(H, SPAN_NOTICE("Your innards itch as your autoredactive faculty mends your [I.name]."))
|
||||
return
|
||||
|
||||
// Heal broken bones.
|
||||
if(H.bad_external_organs.len)
|
||||
for(var/obj/item/organ/external/E in H.bad_external_organs)
|
||||
|
||||
if(BP_IS_ROBOTIC(E))
|
||||
continue
|
||||
|
||||
if(heal_internal && (E.status & ORGAN_BROKEN) && E.damage < E.min_broken_damage) // So we don't mend and autobreak.
|
||||
if(spend_power(heal_rate))
|
||||
if(E.mend_fracture())
|
||||
to_chat(H, SPAN_NOTICE("Your autoredactive faculty coaxes together the shattered bones in your [E.name]."))
|
||||
return
|
||||
|
||||
if(heal_bleeding)
|
||||
|
||||
if((E.status & ORGAN_ARTERY_CUT) && spend_power(heal_rate))
|
||||
to_chat(H, SPAN_NOTICE("Your autoredactive faculty mends the torn artery in your [E.name], stemming the worst of the bleeding."))
|
||||
E.status &= ~ORGAN_ARTERY_CUT
|
||||
return
|
||||
|
||||
if((E.tendon_status() & TENDON_CUT) && E.tendon.can_recover())
|
||||
to_chat(H, SPAN_NOTICE("Your autoredactive faculty repairs the severed tendon in your [E.name]."))
|
||||
E.tendon.rejuvenate()
|
||||
return TRUE
|
||||
|
||||
for(var/datum/wound/W in E.wounds)
|
||||
|
||||
if(W.bleeding() && spend_power(heal_rate))
|
||||
to_chat(H, SPAN_NOTICE("Your autoredactive faculty knits together severed veins, stemming the bleeding from \a [W.desc] on your [E.name]."))
|
||||
W.bleed_timer = 0
|
||||
W.clamped = TRUE
|
||||
E.status &= ~ORGAN_BLEEDING
|
||||
return
|
||||
|
||||
// Heal radiation, cloneloss and poisoning.
|
||||
if(heal_poison)
|
||||
|
||||
if(owner.total_radiation && spend_power(heal_rate))
|
||||
if(prob(25))
|
||||
to_chat(owner, SPAN_NOTICE("Your autoredactive faculty repairs some of the radiation damage to your body."))
|
||||
owner.total_radiation = max(0, owner.total_radiation - heal_rate)
|
||||
return
|
||||
|
||||
if(owner.getCloneLoss() && spend_power(heal_rate))
|
||||
if(prob(25))
|
||||
to_chat(owner, SPAN_NOTICE("Your autoredactive faculty stitches together some of your mangled DNA."))
|
||||
owner.adjustCloneLoss(-heal_rate)
|
||||
return
|
||||
|
||||
// Heal everything left.
|
||||
if(heal_general && prob(mend_prob) && (owner.getBruteLoss() || owner.getFireLoss() || owner.getOxyLoss()) && spend_power(heal_rate))
|
||||
owner.adjustBruteLoss(-(heal_rate))
|
||||
owner.adjustFireLoss(-(heal_rate))
|
||||
owner.adjustOxyLoss(-(heal_rate))
|
||||
if(prob(25))
|
||||
to_chat(owner, SPAN_NOTICE("Your skin crawls as your autoredactive faculty heals your body."))
|
||||
|
||||
Reference in New Issue
Block a user