Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Replaces cosmic heretic clone damage with organ damage #939

Merged
merged 1 commit into from
Dec 3, 2023
Merged

[MIRROR] Replaces cosmic heretic clone damage with organ damage #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

/datum/heretic_knowledge/blade_upgrade/cosmic
name = "Cosmic Blade"
desc = "Your blade now deals damage to people's cells through cosmic radiation. \
desc = "Your blade now deals damage to people's organs through cosmic radiation. \
Your attacks will chain bonus damage to up to two previous victims. \
The combo is reset after two seconds without making an attack, \
or if you attack someone already marked. If you combo more than four attacks you will recieve, \
Expand All @@ -152,6 +152,15 @@
var/combo_counter = 0

/datum/heretic_knowledge/blade_upgrade/cosmic/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
var/static/list/valid_organ_slots = list(
ORGAN_SLOT_HEART,
ORGAN_SLOT_LUNGS,
ORGAN_SLOT_STOMACH,
ORGAN_SLOT_EYES,
ORGAN_SLOT_EARS,
ORGAN_SLOT_LIVER,
ORGAN_SLOT_BRAIN
)
if(source == target)
return
if(combo_timer)
Expand All @@ -160,8 +169,8 @@
var/mob/living/second_target_resolved = second_target?.resolve()
var/mob/living/third_target_resolved = third_target?.resolve()
var/need_mob_update = FALSE
need_mob_update += target.adjustFireLoss(4, updating_health = FALSE)
need_mob_update += target.adjustCloneLoss(2, updating_health = FALSE)
need_mob_update += target.adjustFireLoss(5, updating_health = FALSE)
need_mob_update += target.adjustOrganLoss(pick(valid_organ_slots), 8)
if(need_mob_update)
target.updatehealth()
if(target == second_target_resolved || target == third_target_resolved)
Expand All @@ -173,18 +182,18 @@
new /obj/effect/temp_visual/cosmic_explosion(get_turf(second_target_resolved))
playsound(get_turf(second_target_resolved), 'sound/magic/cosmic_energy.ogg', 25, FALSE)
need_mob_update = FALSE
need_mob_update += second_target_resolved.adjustFireLoss(10, updating_health = FALSE)
need_mob_update += second_target_resolved.adjustCloneLoss(6, updating_health = FALSE)
need_mob_update += second_target_resolved.adjustFireLoss(14, updating_health = FALSE)
need_mob_update += second_target_resolved.adjustOrganLoss(pick(valid_organ_slots), 12)
if(need_mob_update)
target.updatehealth()
second_target_resolved.updatehealth()
if(third_target_resolved)
new /obj/effect/temp_visual/cosmic_domain(get_turf(third_target_resolved))
playsound(get_turf(third_target_resolved), 'sound/magic/cosmic_energy.ogg', 50, FALSE)
need_mob_update = FALSE
need_mob_update += third_target_resolved.adjustFireLoss(20, updating_health = FALSE)
need_mob_update += third_target_resolved.adjustCloneLoss(12, updating_health = FALSE)
need_mob_update += third_target_resolved.adjustFireLoss(28, updating_health = FALSE)
need_mob_update += third_target_resolved.adjustOrganLoss(pick(valid_organ_slots), 14)
if(need_mob_update)
target.updatehealth()
third_target_resolved.updatehealth()
if(combo_counter > 3)
target.apply_status_effect(/datum/status_effect/star_mark, source)
if(target.mind && target.stat != DEAD)
Expand Down
5 changes: 1 addition & 4 deletions code/modules/antagonists/heretic/magic/star_touch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,7 @@

/// What to process when the beam is connected to a target
/datum/status_effect/cosmic_beam/proc/on_beam_tick(mob/living/target)
var/need_mob_update
need_mob_update = target.adjustFireLoss(3, updating_health = FALSE)
need_mob_update += target.adjustCloneLoss(1, updating_health = FALSE)
if(need_mob_update)
if(target.adjustFireLoss(3, updating_health = FALSE))
target.updatehealth()

/// What to remove when the beam disconnects from a target
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/star_gazer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
return

target.apply_status_effect(/datum/status_effect/star_mark)
target.apply_damage(damage = 5, damagetype = CLONE)
target.apply_damage(damage = 5, damagetype = BURN)
var/datum/targeting_strategy/target_confirmer = GET_TARGETING_STRATEGY(ai_controller.blackboard[BB_TARGETING_STRATEGY])
for(var/mob/living/nearby_mob in range(1, src))
if(target == nearby_mob || !target_confirmer?.can_attack(src, nearby_mob))
Expand Down
Loading