Skip to content

Commit

Permalink
final is a new reserved word apparently
Browse files Browse the repository at this point in the history
idk how tg fixed it exactly
  • Loading branch information
MosleyTheMalO committed Mar 12, 2024
1 parent 07a61f5 commit 70fab82
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@
return TRUE

//Ascension knowledge
/datum/eldritch_knowledge/final
/datum/eldritch_knowledge/final_eldritch
var/finished = FALSE

/datum/eldritch_knowledge/final/recipe_snowflake_check(list/atoms, loc,selected_atoms)
/datum/eldritch_knowledge/final_eldritch/recipe_snowflake_check(list/atoms, loc,selected_atoms)
if(finished)
return FALSE
var/counter = 0
Expand All @@ -222,11 +222,11 @@
return TRUE
return FALSE

/datum/eldritch_knowledge/final/on_finished_recipe( mob/living/user, list/atoms, loc)
/datum/eldritch_knowledge/final_eldritch/on_finished_recipe( mob/living/user, list/atoms, loc)
finished = TRUE
return TRUE

/datum/eldritch_knowledge/final/cleanup_atoms(list/atoms)
/datum/eldritch_knowledge/final_eldritch/cleanup_atoms(list/atoms)
. = ..()
for(var/mob/living/carbon/human/H in atoms)
atoms -= H
Expand Down
8 changes: 4 additions & 4 deletions code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Nightwatcher's Secret"
desc = "Inducts you into the Path of Ash. Allows you to transmute a match with a spear into an ashen blade."
gain_text = "The City Guard know their watch. If you ask them at night, they may tell you about the ashy lantern."
banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final_eldritch/rust_final,/datum/eldritch_knowledge/final_eldritch/flesh_final,/datum/eldritch_knowledge/final_eldritch/void_final,/datum/eldritch_knowledge/base_void)
next_knowledge = list(/datum/eldritch_knowledge/ashen_grasp)
required_atoms = list(/obj/item/spear,/obj/item/match)
result_atoms = list(/obj/item/melee/sickly_blade/ash)
Expand Down Expand Up @@ -111,7 +111,7 @@
cost = 2
sacs_needed = 3
spell_to_add = /obj/effect/proc_holder/spell/pointed/nightwatchers_rite
next_knowledge = list(/datum/eldritch_knowledge/final/ash_final)
next_knowledge = list(/datum/eldritch_knowledge/final_eldritch/ash_final)
route = PATH_ASH

/datum/eldritch_knowledge/spell/nightwatchers_rite/on_gain(mob/user)
Expand Down Expand Up @@ -180,7 +180,7 @@
spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave
next_knowledge = list(/datum/eldritch_knowledge/spell/entropic_plume,/datum/eldritch_knowledge/spell/flame_birth)

/datum/eldritch_knowledge/final/ash_final
/datum/eldritch_knowledge/final_eldritch/ash_final
name = "Ashlord's Rite"
gain_text = "The Nightwatcher found the rite and shared it amongst mankind! For now I am one with the fire, WITNESS MY ASCENSION!"
desc = "Bring 3 corpses onto a transmutation rune, you will become immune to fire, the vacuum of space, cold and other enviromental hazards and become overall sturdier to all other damages. You will gain a spell that passively creates ring of fire around you as well ,as you will gain a powerful ability that lets you create a wave of flames all around you."
Expand All @@ -190,7 +190,7 @@
route = PATH_ASH
var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE)

/datum/eldritch_knowledge/final/ash_final/on_finished_recipe(mob/living/user, list/atoms, loc)
/datum/eldritch_knowledge/final_eldritch/ash_final/on_finished_recipe(mob/living/user, list/atoms, loc)
priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/fire_cascade/big)
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/fire_sworn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Principle of Hunger"
desc = "Inducts you into the Path of Flesh. Allows you to transmute a pool of blood with a spear into a Blade of Flesh."
gain_text = "Hundreds of us starved, but not me... I found strength in my greed."
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final_eldritch/ash_final,/datum/eldritch_knowledge/final_eldritch/rust_final,/datum/eldritch_knowledge/final_eldritch/void_final,/datum/eldritch_knowledge/base_void)
next_knowledge = list(/datum/eldritch_knowledge/flesh_grasp)
required_atoms = list(/obj/item/spear,/obj/effect/decal/cleanable/blood)
result_atoms = list(/obj/item/melee/sickly_blade/flesh)
Expand Down Expand Up @@ -211,7 +211,7 @@
spell_to_add = /obj/effect/proc_holder/spell/pointed/blood_siphon
next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/voidpull)

/datum/eldritch_knowledge/final/flesh_final
/datum/eldritch_knowledge/final_eldritch/flesh_final
name = "Priest's Final Hymn"
gain_text = "Men of this world. Hear me, for the time of the Lord of Arms has come! The Emperor of Flesh guides my army!"
desc = "Bring 3 bodies onto a transmutation rune to shed your human form and ascend to untold power."
Expand All @@ -220,7 +220,7 @@
sacs_needed = 8
route = PATH_FLESH

/datum/eldritch_knowledge/final/flesh_final/on_finished_recipe(mob/living/user, list/atoms, loc)
/datum/eldritch_knowledge/final_eldritch/flesh_final/on_finished_recipe(mob/living/user, list/atoms, loc)
. = ..()
priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Ever coiling vortex. Reality unfolded. THE LORD OF ARMS, [user.real_name] has ascended! Fear the ever twisting hand! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shed_human_form)
Expand Down Expand Up @@ -260,7 +260,7 @@
cost = 2
sacs_needed = 3
spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/mad_touch
next_knowledge = list(/datum/eldritch_knowledge/final/flesh_final)
next_knowledge = list(/datum/eldritch_knowledge/final_eldritch/flesh_final)
route = PATH_FLESH

/datum/eldritch_knowledge/spell/touch_of_madness/on_gain(mob/user)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Blacksmith's Tale"
desc = "Inducts you into the Path of Rust. Allows you to transmute a spear with any trash item into a Blade of Rust."
gain_text = "'Let me tell you a story', said the Blacksmith, as he gazed deep into his rusty blade."
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final_eldritch/ash_final,/datum/eldritch_knowledge/final_eldritch/flesh_final,/datum/eldritch_knowledge/final_eldritch/void_final,/datum/eldritch_knowledge/base_void)
next_knowledge = list(/datum/eldritch_knowledge/rust_fist)
required_atoms = list(/obj/item/spear,/obj/item/trash)
result_atoms = list(/obj/item/melee/sickly_blade/rust)
Expand Down Expand Up @@ -161,14 +161,14 @@
cost = 2
sacs_needed = 3
spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/grasp_of_decay
next_knowledge = list(/datum/eldritch_knowledge/final/rust_final)
next_knowledge = list(/datum/eldritch_knowledge/final_eldritch/rust_final)
route = PATH_RUST

/datum/eldritch_knowledge/spell/grasp_of_decay/on_gain(mob/user)
. = ..()
priority_announce("A foul wind is blowing... The floor creaks with rust as something sinister approaches!", sound = 'sound/misc/notice1.ogg')

/datum/eldritch_knowledge/final/rust_final
/datum/eldritch_knowledge/final_eldritch/rust_final
name = "Rustbringer's Oath"
desc = "Bring three corpses onto a transmutation rune. After you finish the ritual, rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resilient overall."
gain_text = "Champion of rust. Corruptor of steel. Fear the dark for the Rustbringer has come! Rusted Hills, CALL MY NAME!"
Expand All @@ -177,7 +177,7 @@
required_atoms = list(/mob/living/carbon/human)
route = PATH_RUST

/datum/eldritch_knowledge/final/rust_final/on_finished_recipe(mob/living/user, list/atoms, loc)
/datum/eldritch_knowledge/final_eldritch/rust_final/on_finished_recipe(mob/living/user, list/atoms, loc)
var/mob/living/carbon/human/H = user
H.physiology.brute_mod *= 0.5
H.physiology.burn_mod *= 0.5
Expand All @@ -188,7 +188,7 @@
ascension.ascended = TRUE
return ..()

/datum/eldritch_knowledge/final/rust_final/on_life(mob/user)
/datum/eldritch_knowledge/final_eldritch/rust_final/on_life(mob/user)
. = ..()
if(!finished)
return
Expand Down
12 changes: 6 additions & 6 deletions code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Glimmer of Winter"
desc = "Opens up the path of void to you. Allows you to transmute a spear in a sub-zero temperature into a void blade."
gain_text = "I feel a shimmer in the air, atmosphere around me gets colder. I feel my body realizing the emptiness of existance. Something's watching me"
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/rust_final)
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final_eldritch/ash_final,/datum/eldritch_knowledge/final_eldritch/flesh_final,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final_eldritch/rust_final)
next_knowledge = list(/datum/eldritch_knowledge/void_grasp)
required_atoms = list(/obj/item/spear)
result_atoms = list(/obj/item/melee/sickly_blade/void)
Expand Down Expand Up @@ -162,14 +162,14 @@
cost = 2
sacs_needed = 3
spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/domain_expansion
next_knowledge = list(/datum/eldritch_knowledge/final/void_final)
next_knowledge = list(/datum/eldritch_knowledge/final_eldritch/void_final)
route = PATH_VOID

/datum/eldritch_knowledge/spell/domain_expansion/on_gain(mob/user)
. = ..()
priority_announce("Echos of the lost in space are heard... An ominous presence is being detected! ", sound = 'sound/misc/notice1.ogg')

/datum/eldritch_knowledge/final/void_final
/datum/eldritch_knowledge/final_eldritch/void_final
name = "Waltz at the End of Time"
desc = "Bring 3 corpses onto the transmutation rune. After you finish the ritual you will automatically silence people around you and will summon a snow storm around you."
gain_text = "The world falls into darkness. I stand in an empty plane, small flakes of ice fall from the sky. The Aristocrat stands before me, he motions to me. We will play a waltz to the whispers of dying reality, as the world is destroyed before our eyes."
Expand All @@ -182,7 +182,7 @@
///Reference to the ongoing voidstorm that surrounds the heretic
var/datum/weather/void_storm/storm

/datum/eldritch_knowledge/final/void_final/on_finished_recipe(mob/living/user, list/atoms, loc)
/datum/eldritch_knowledge/final_eldritch/void_final/on_finished_recipe(mob/living/user, list/atoms, loc)
var/mob/living/carbon/human/waltzing = user
waltzing.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch)
waltzing.physiology.brute_mod *= 0.5
Expand All @@ -193,14 +193,14 @@
sound_loop = new(user, TRUE, TRUE)
return ..()

/datum/eldritch_knowledge/final/void_final/on_death()
/datum/eldritch_knowledge/final_eldritch/void_final/on_death()
if(sound_loop)
sound_loop.stop()
if(storm)
storm.end()
QDEL_NULL(storm)

/datum/eldritch_knowledge/final/void_final/on_life(mob/user)
/datum/eldritch_knowledge/final_eldritch/void_final/on_life(mob/user)
. = ..()
if(!finished)
return
Expand Down

0 comments on commit 70fab82

Please sign in to comment.