From c0b9e2bace1294ef4bc3a8f761cfda2f4dff3032 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Mon, 3 Aug 2020 15:11:49 +0200 Subject: [PATCH] updates some examines little fix in the rite desc generation, brass claws now show combo / bonus damage, if their wielder if a clock cultist --- .../clockcult/clock_helpers/clock_rites.dm | 2 +- .../clock_items/clock_weapons/brass_claw.dm | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm index 351103ef1a..6fb396fa7b 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm @@ -130,7 +130,7 @@ . += "The target [must_be_servant ? "cannot be" : "can be"] a nonservant.\n" . += "The target [target_can_be_invoker ? "can be" : "cannot be"] the invoker.\n" . += "It requires [cast_time/10] seconds to cast.\n" - . += "It has been used [times_used] times, out of [limit != INFINITE ? ", [limit]" : "infinite"] available uses." + . += "It has been used [times_used] time[times_used != 1 ? "s" : ""], out of [limit != INFINITE ? ", [limit]" : "infinite"] available uses." /datum/clockwork_rite/advancement name = "Rite of Advancement" diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm index df84002f69..340734e11b 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm @@ -3,8 +3,8 @@ /obj/item/clockwork/brass_claw name = "brass claw" - desc = "A highly sharp claw made out of brass." - clockwork_desc = "A incredibly sharp claw made out of brass. It is quite effective at crippling enemies, though incredibly obvious aswell. Gains combo on consecutive attacks against a target, causing bonus damage." + desc = "A very sharp claw made out of brass." + clockwork_desc = "A incredibly sharp claw made out of brass. It is quite effective at crippling enemies, though very obvious when extended.\nGains combo on consecutive attacks against a target, causing bonus damage." icon_state = "brass_claw" //Codersprite moment item_state = "brass_claw" lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' @@ -23,11 +23,18 @@ total_mass = TOTAL_MASS_HAND_REPLACEMENT var/mob/living/last_attacked var/combo = 0 + var/damage_per_combo = 2 /obj/item/clockwork/brass_claw/Initialize() . = ..() AddComponent(/datum/component/butchering, 60, 80) +/obj/item/clockwork/brass_claw/examine(mob/user) + if(is_servant_of_ratvar(user)) + clockwork_desc += "\nIt has [combo] combo stacks built up against the current target, causing [combo * damage_per_combo] bonus damage." + . = ..() + clockwork_desc = initial(desc) + /obj/item/clockwork/brass_claw/attack(mob/living/target, mob/living/carbon/human/user) . = ..() if(QDELETED(target) || target.anti_magic_check(chargecost = 0) || is_servant_of_ratvar(target)) @@ -40,4 +47,4 @@ combo++ else combo += 3 - target.adjustBruteLoss(combo * 2) + target.adjustBruteLoss(combo * damage_per_combo)