From bea4ca895cb4fa1e31e4ebd1f86ea448a30b4b9f Mon Sep 17 00:00:00 2001 From: Fikou Date: Wed, 17 Feb 2021 11:39:34 +0100 Subject: [PATCH 1/2] you can now cast rituals on 100 threat dynamic (#56961) Conflicts: code/modules/antagonists/wizard/equipment/spellbook.dm --- .../antagonists/wizard/equipment/spellbook.dm | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 0ff9a22c86..8c33872702 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -468,6 +468,19 @@ category = "Mobility" cost = 1 +<<<<<<< HEAD +======= +/datum/spellbook_entry/duffelbag + name = "Bestow Cursed Duffel Bag" + desc = "A curse that firmly attaches a demonic duffel bag to the target's back. The duffel bag will make the person it's attached to take periodical damage if it is not fed regularly, and regardless of whether or not it's been fed, it will slow the person wearing it down significantly." + spell_type = /obj/effect/proc_holder/spell/targeted/touch/duffelbag + category = "Defensive" + cost = 1 + +/// How much threat we need to let these rituals happen on dynamic +#define MINIMUM_THREAT_FOR_RITUALS 100 + +>>>>>>> bc02039... you can now cast rituals on 100 threat dynamic (#56961) /datum/spellbook_entry/summon name = "Summon Stuff" category = "Rituals" @@ -495,12 +508,6 @@ desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you." cost = 0 -/datum/spellbook_entry/summon/ghosts/IsAvailable() - if(!SSticker.mode) - return FALSE - else - return TRUE - /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) new /datum/round_event/wizard/ghost() @@ -517,7 +524,9 @@ if(!SSticker.mode) // In case spellbook is placed on map return FALSE if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic - return FALSE + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -536,7 +545,9 @@ if(!SSticker.mode) // In case spellbook is placed on map return FALSE if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic - return FALSE + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -558,7 +569,9 @@ if(!SSticker.mode) // In case spellbook is placed on map return FALSE if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic - return FALSE + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -591,6 +604,8 @@ playsound(user, 'sound/magic/mandswap.ogg', 50, TRUE) return TRUE +#undef MINIMUM_THREAT_FOR_RITUALS + /obj/item/spellbook name = "spell book" desc = "An unearthly tome that glows with power." From 17545814630ed1fe812fd566ace7f3773190d87f Mon Sep 17 00:00:00 2001 From: drexample Date: Wed, 17 Feb 2021 10:42:15 +0000 Subject: [PATCH 2/2] you can now cast rituals on 100 threat dynamic