Heretics Balancing patch (#51847)

* balance

* e

* e

* Update code/modules/antagonists/eldritch_cult/eldritch_magic.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* E

Co-authored-by: Rohesie <rohesie@gmail.com>

code/modules/antagonists/eldritch_cult/eldritch_magic.dm

@@ -480,3 +480,39 @@
 	icon_state = "cleave"
 	duration = 6
 
+/obj/effect/temp_visual/eldritch_smoke
+	icon = 'icons/effects/eldritch.dmi'
+	icon_state = "smoke"
+	duration = 10
+
+/obj/effect/proc_holder/spell/targeted/fiery_rebirth
+	name = "Nightwatcher's Rebirth"
+	desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a person is in critical condition it finishes them off."
+	invocation = "GL'RY T' TH' N'GHT'W'TCH'ER"
+	invocation_type = "whisper"
+	clothes_req = FALSE
+	action_background_icon_state = "bg_ecult"
+	range = -1
+	include_user = TRUE
+	charge_max = 600
+	action_icon = 'icons/mob/actions/actions_ecult.dmi'
+	action_icon_state = "smoke"
+
+/obj/effect/proc_holder/spell/targeted/fiery_rebirth/cast(list/targets, mob/user)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/human_user = user
+	for(var/mob/living/carbon/target in view(7,user))
+		if(target.stat == DEAD || !target.on_fire)
+			continue
+		//This is essentially a death mark, use this to finish your opponent quicker.
+		if(target.InCritical())
+			target.death()
+		target.adjustFireLoss(20)
+		new /obj/effect/temp_visual/eldritch_smoke(target.drop_location())
+		human_user.ExtinguishMob()
+		human_user.adjustBruteLoss(-10, FALSE)
+		human_user.adjustFireLoss(-10, FALSE)
+		human_user.adjustStaminaLoss(-10, FALSE)
+		human_user.adjustToxLoss(-10, FALSE)
+		human_user.adjustOxyLoss(-10)

code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm

@@ -89,13 +89,13 @@
 	. = ..()
 	chosen_mob.cure_blind(MAGIC_TRAIT)
 
-/datum/eldritch_knowledge/spell/mad_touch
-	name = "Touch of Madness"
-	gain_text = "Take what's yours."
+/datum/eldritch_knowledge/spell/flame_birth
+	name = "Flame Birth"
+	gain_text = "Nightwatcher was a man of principles, and yet he arose from the chaos he vowed to protect from."
 	desc = "Short range spell that allows you to curse someone with massive sanity loss."
 	cost = 1
-	spell_to_add = /obj/effect/proc_holder/spell/pointed/touch/mad_touch
-	next_knowledge = list(/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/final/ash_final)
+	spell_to_add = /obj/effect/proc_holder/spell/targeted/fiery_rebirth
+	next_knowledge = list(/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/final/ash_final)
 	route = PATH_ASH
 
 /datum/eldritch_knowledge/ash_blade_upgrade
@@ -103,7 +103,7 @@
 	gain_text = "May the sun burn the heretics."
 	desc = "Your blade of choice will now add firestacks."
 	cost = 2
-	next_knowledge = list(/datum/eldritch_knowledge/spell/mad_touch)
+	next_knowledge = list(/datum/eldritch_knowledge/spell/flame_birth)
 	banned_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade)
 	route = PATH_ASH
 
@@ -158,7 +158,7 @@
 	desc = "Gives AOE spell that causes heavy bleeding and blood loss."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave
-	next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet,/datum/eldritch_knowledge/spell/area_conversion)
+	next_knowledge = list(/datum/eldritch_knowledge/spell/rust_wave,/datum/eldritch_knowledge/spell/flame_birth)
 
 /datum/eldritch_knowledge/final/ash_final
 	name = "Ashlord's rite"

code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm

@@ -167,7 +167,7 @@
 	cost = 1
 	required_atoms = list(/obj/item/organ/eyes,/obj/item/bodypart/l_arm,/obj/item/bodypart/r_arm,/obj/effect/decal/cleanable/blood)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/raw_prophet
-	next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/curse/paralysis)
+	next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/curse/paralysis)
 	route = PATH_FLESH
 
 /datum/eldritch_knowledge/summon/stalker
@@ -196,7 +196,7 @@
 	cost = 1
 	required_atoms = list(/obj/effect/decal/cleanable/vomit,/obj/item/bodypart/head,/obj/item/book)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/rust_spirit
-	next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/mad_touch)
+	next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/flame_birth)
 
 /datum/eldritch_knowledge/spell/blood_siphon
 	name = "Blood Siphon"
@@ -204,7 +204,7 @@
 	desc = "You gain a spell that drains enemies health and restores yours."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/blood_siphon
-	next_knowledge = list(/datum/eldritch_knowledge/spell/rust_wave,/datum/eldritch_knowledge/spell/mad_touch)
+	next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet,/datum/eldritch_knowledge/spell/area_conversion)
 
 /datum/eldritch_knowledge/final/flesh_final
 	name = "Priest's Final Hymn"

code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm

@@ -36,7 +36,7 @@
 	gain_text = "All men wise know not to touch the bound king."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/rust_conversion
-	next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/cleave)
+	next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/blood_siphon)
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/rust_regen
@@ -95,7 +95,7 @@
 	gain_text = "Messenger's of hope fear the rustbringer!"
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/projectile/dumbfire/rust_wave
-	next_knowledge = list(/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/summon/rusty)
+	next_knowledge = list(/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/rusty)
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/armor