From 548bbed2c8ed0e17bc9f972113fd4eab8af7aa58 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sun, 17 Jul 2016 23:49:25 -0400 Subject: [PATCH] Buffs Belligerent and Taunting Tirade (#19346) * Buffs Belligerent and Taunting Tirade * ocean --- .../gamemodes/clock_cult/clock_scripture.dm | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index 3e818eefb47..3c35d3ed2f6 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -20,7 +20,6 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed var/obj/item/clockwork/slab/slab //The parent clockwork slab var/mob/living/invoker //The slab's holder var/whispered = FALSE //If the invocation is whispered rather than spoken aloud - var/consumed_component_override = FALSE //If consumed components are unique to a scripture regardless of tier var/usage_tip = "This piece seems to serve no purpose and is a waste of components." //A generalized tip that gives advice on a certain scripture var/invokers_required = 1 //How many people are required, assuming that a scripture requires multiple var/multiple_invokers_used = FALSE //If scripture requires more than one invoker @@ -175,13 +174,13 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed // DRIVERS // ///////////// -/datum/clockwork_scripture/channeled/belligerent //Belligerent: Channeled for up to ten times over thirty seconds. Forces non-servants that can hear the chant to walk. Nar-Sian cultists are burned. +/datum/clockwork_scripture/channeled/belligerent //Belligerent: Channeled for up to fiteen times over thirty seconds. Forces non-servants that can hear the chant to walk. Nar-Sian cultists are burned. descname = "Channeled, Area Slowdown" name = "Belligerent" - desc = "Forces all nearby non-servants to walk rather than run. Chanted every three seconds for up to thirty seconds." - chant_invocations = list("Chavfu gur've oyvaqarff!") //"Punish their blindness!" - chant_amount = 10 - chant_interval = 30 + desc = "Forces all nearby non-servants to walk rather than run. Chanted every two seconds for up to thirty seconds." + chant_invocations = list("Chavfu gur've oyvaqarff!", "Gnxr gv'zr, znxr fybj!") //"Punish their blindness!", "Take time, make slow!" + chant_amount = 15 + chant_interval = 20 required_components = list("belligerent_eye" = 1) usage_tip = "Useful for crowd control in a populated area and disrupting mass movement." tier = SCRIPTURE_DRIVER @@ -343,18 +342,18 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed -/datum/clockwork_scripture/channeled/taunting_tirade //Taunting Tirade: Channeled for up to ten times over thirty seconds. Confuses non-servants that can hear it and allows movement for a brief time after each channel +/datum/clockwork_scripture/channeled/taunting_tirade //Taunting Tirade: Channeled for up to five times over thirty seconds. Confuses non-servants that can hear it and allows movement for a brief time after each channel descname = "Channeled, Mobile Area Confusion" name = "Taunting Tirade" - desc = "Confuses and dizzies all nearby non-servants with a short invocation, then allows movement for three seconds. Chanted every second for up to thirty-five seconds." + desc = "Weakens, confuses and dizzies all nearby non-servants with a short invocation, then allows movement for five seconds. Chanted every second for up to thirty seconds." chant_invocations = list("Ubfgv'yrf ba zl-onpx!", "Rarzvrf ba zl-genvy!", "Tbaan gel-naq-funxr zl-gnvy.", "Obtrlf ba zl-fvk!") - chant_amount = 10 - chant_interval = 5 + chant_amount = 5 + chant_interval = 10 required_components = list("guvax_capacitor" = 2) consumed_components = list("guvax_capacitor" = 1) usage_tip = "Useful for fleeing attackers, as few will be able to follow someone using this scripture." tier = SCRIPTURE_DRIVER - var/flee_time = 27 //allow fleeing for 3 seconds + var/flee_time = 47 //allow fleeing for 5 seconds var/grace_period = 3 //very short grace period so you don't have to stop immediately var/datum/progressbar/progbar @@ -363,10 +362,11 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed if(!is_servant_of_ratvar(L) && !L.null_rod_check()) L.confused = min(L.confused + 20, 100) L.dizziness = min(L.dizziness + 20, 100) + L.Weaken(1) + invoker.visible_message("[invoker] is suddenly covered with a thin layer of dark purple smoke!") + invoker.color = "#AF0AAF" + animate(invoker, color = initial(invoker.color), time = flee_time+grace_period) if(chant_number != chant_amount) //if this is the last chant, we don't have a movement period because the chant is over - invoker.visible_message("[invoker] is suddenly covered with a thin layer of dark purple smoke!") - invoker.color = "#AF0AAF" - animate(invoker, color = initial(invoker.color), time = flee_time+grace_period) var/endtime = world.time + flee_time var/starttime = world.time progbar = new(invoker, flee_time, invoker)