From 6dbeafeb9ed082241dfbcb899eba1e973dfc09ef Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Wed, 10 Mar 2021 17:04:10 -0800 Subject: [PATCH] goodbye eldritch blade --- code/modules/antagonists/eldritch_cult/eldritch_antag.dm | 1 - .../antagonists/eldritch_cult/eldritch_knowledge.dm | 9 --------- .../antagonists/eldritch_cult/knowledge/ash_lore.dm | 6 +++--- .../antagonists/eldritch_cult/knowledge/flesh_lore.dm | 6 +++--- .../antagonists/eldritch_cult/knowledge/rust_lore.dm | 6 +++--- .../antagonists/eldritch_cult/knowledge/void_lore.dm | 6 +++--- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 57fcaead85..fc0a5cdc6a 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -39,7 +39,6 @@ gain_knowledge(/datum/eldritch_knowledge/spell/basic) gain_knowledge(/datum/eldritch_knowledge/living_heart) gain_knowledge(/datum/eldritch_knowledge/codex_cicatrix) - gain_knowledge(/datum/eldritch_knowledge/eldritch_blade) current.log_message("has been converted to the cult of the forgotten ones!", LOG_ATTACK, color="#960000") GLOB.reality_smash_track.AddMind(owner) START_PROCESSING(SSprocessing,src) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm index 3f7b80b418..d25600e92c 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm @@ -317,15 +317,6 @@ result_atoms = list(/obj/item/forbidden_book) route = "Start" -/datum/eldritch_knowledge/eldritch_blade - name = "Eldritch Blade" - desc = "Allows you to create a sickly, eldritch blade by transmuting a spear atop a transmutation rune." - gain_text = "The first step starts with sacrifice." - cost = 0 - required_atoms = list(/obj/item/spear) - result_atoms = list(/obj/item/melee/sickly_blade) - route = "Start" - /datum/eldritch_knowledge/spell/silence name = "Silence" desc = "Allows you to use the power of the Mansus to force an individual's tongue to be held down for up to twenty seconds. They'll notice quickly, however." diff --git a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm index bc742c01dd..0256382723 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm @@ -1,12 +1,12 @@ /datum/eldritch_knowledge/base_ash name = "Nightwatcher's Secret" - desc = "Inducts you into the Path of Ash. Allows you to transmute a match with an eldritch blade into an ashen blade." + 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) next_knowledge = list(/datum/eldritch_knowledge/ashen_grasp) - required_atoms = list(/obj/item/melee/sickly_blade,/obj/item/match) + required_atoms = list(/obj/item/spear,/obj/item/match) result_atoms = list(/obj/item/melee/sickly_blade/ash) - cost = 1 + cost = 0 route = PATH_ASH /datum/eldritch_knowledge/spell/ashen_shift diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm index b91c1cfc33..7145987297 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm @@ -1,12 +1,12 @@ /datum/eldritch_knowledge/base_flesh name = "Principle of Hunger" - desc = "Inducts you into the Path of Flesh. Allows you to transmute a pool of blood with an eldritch blade into a Blade of Flesh." + 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) next_knowledge = list(/datum/eldritch_knowledge/flesh_grasp) - required_atoms = list(/obj/item/melee/sickly_blade,/obj/effect/decal/cleanable/blood) + required_atoms = list(/obj/item/spear,/obj/effect/decal/cleanable/blood) result_atoms = list(/obj/item/melee/sickly_blade/flesh) - cost = 1 + cost = 0 route = PATH_FLESH /datum/eldritch_knowledge/flesh_ghoul diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 75758f3873..ad0cbf6423 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -1,12 +1,12 @@ /datum/eldritch_knowledge/base_rust name = "Blacksmith's Tale" - desc = "Inducts you into the Path of Rust. Allows you to transmute an eldritch blade with any trash item into a Blade of Rust." + 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) next_knowledge = list(/datum/eldritch_knowledge/rust_fist) - required_atoms = list(/obj/item/melee/sickly_blade,/obj/item/trash) + required_atoms = list(/obj/item/spear,/obj/item/trash) result_atoms = list(/obj/item/melee/sickly_blade/rust) - cost = 1 + cost = 0 route = PATH_RUST /datum/eldritch_knowledge/rust_fist diff --git a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm index 911b77fdd7..bcc3bd1e73 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm @@ -1,12 +1,12 @@ /datum/eldritch_knowledge/base_void name = "Glimmer of Winter" - desc = "Opens up the path of void to you. Allows you to transmute a knife in a sub-zero temperature into a void blade." + 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) next_knowledge = list(/datum/eldritch_knowledge/void_grasp) - required_atoms = list(/obj/item/melee/sickly_blade) + required_atoms = list(/obj/item/spear) result_atoms = list(/obj/item/melee/sickly_blade/void) - cost = 1 + cost = 0 route = PATH_VOID /datum/eldritch_knowledge/base_void/recipe_snowflake_check(list/atoms, loc)