more work

Author: Moltijoe

code/__DEFINES/bloodsuckers.dm

@@ -120,7 +120,7 @@
 #define BP_AM_SINGLEUSE (1<<1)
 /// This Power has a Static cooldown
 #define BP_AM_STATIC_COOLDOWN (1<<2)
-/// This Power doesn't cost bloot to run while unconscious
+/// This Power doesn't cost blood to run while unconscious
 #define BP_AM_COSTLESS_UNCONSCIOUS (1<<3)
 
 /**

code/modules/antagonists/bloodsuckers/powers/_powers.dm

@@ -43,178 +43,6 @@
 	///Path to the ascended version of the power. For Lasombra bloodsucker powers
 	var/ascended_power = null
 
-
-// Modify description to add cost.
-/datum/action/cooldown/bloodsucker/New(Target)
-	. = ..()
-	UpdateDesc()
-
-/datum/action/cooldown/bloodsucker/proc/UpdateDesc()
-	desc = initial(desc)
-	if(length(additional_text) > 0)
-		desc += "<br><br><b>ASCENDED</b>: [additional_text]"
-	if(bloodcost > 0)
-		desc += "<br><br><b>COST:</b> [bloodcost] Blood"
-	if(constant_bloodcost > 0)
-		desc += "<br><br><b>CONSTANT COST:</b><i> [name] costs [constant_bloodcost] Blood maintain active.</i>"
-	if(power_flags & BP_AM_SINGLEUSE)
-		desc += "<br><br><b>SINGLE USE:</br><i> [name] can only be used once per night.</i>"
-	if(level_current > 0)
-		desc += "<br><br><b>LEVEL:</b><i> [name] is currently level [level_current].</i>"
-	if(cooldown_time > 0)
-		desc += "<br><br><b>COOLDOWN:</b><i> [name] has a cooldown of [cooldown_time / 10] seconds.</i>"
-
-/datum/action/cooldown/bloodsucker/Destroy()
-	bloodsuckerdatum_power = null
-	return ..()
-
-/datum/action/cooldown/bloodsucker/IsAvailable(feedback = FALSE)
-	return next_use_time <= world.time
-
-/datum/action/cooldown/bloodsucker/Grant(mob/user)
-	. = ..()
-	var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(owner)
-	if(bloodsuckerdatum)
-		bloodsuckerdatum_power = bloodsuckerdatum
-
-//This is when we CLICK on the ability Icon, not USING.
-/datum/action/cooldown/bloodsucker/Trigger(trigger_flags)
-	if(active && can_deactivate()) // Active? DEACTIVATE AND END!
-		DeactivatePower()
-		return FALSE
-	if(!can_pay_cost() || !CanUse(owner))
-		return FALSE
-	pay_cost()
-	ActivatePower()
-	if(!(power_flags & BP_AM_TOGGLE) || !active)
-		StartCooldown()
-	return TRUE
-
-///Called when the Power is upgraded.
-/datum/action/cooldown/bloodsucker/proc/upgrade_power()
-	level_current++
-
-///Checks if the Power is available to use.
-/datum/action/cooldown/bloodsucker/proc/CanUse(mob/living/carbon/user)
-	if(!owner)
-		return FALSE
-	if(!isliving(user))
-		return FALSE
-	// Torpor?
-	if((check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT(user, TRAIT_NODEATH))
-		to_chat(user, span_warning("Not while you're in Torpor."))
-		return FALSE
-	// Frenzy?
-	if((check_flags & BP_CANT_USE_IN_FRENZY) && (bloodsuckerdatum_power?.frenzied))
-		to_chat(user, span_warning("You cannot use powers while in a Frenzy!"))
-		return FALSE
-	// Stake?
-	if((check_flags & BP_CANT_USE_WHILE_STAKED) && user.am_staked())
-		to_chat(user, span_warning("You have a stake in your chest! Your powers are useless."))
-		return FALSE
-	// Conscious? -- We use our own (AB_CHECK_CONSCIOUS) here so we can control it more, like the error message.
-	if((check_flags & BP_CANT_USE_WHILE_UNCONSCIOUS) && user.stat != CONSCIOUS)
-		to_chat(user, span_warning("You can't do this while you are unconscious!"))
-		return FALSE
-	// Incapacitated?
-	if((check_flags & BP_CANT_USE_WHILE_INCAPACITATED) && (user.incapacitated(ignore_restraints = TRUE, ignore_grab = TRUE)))
-		to_chat(user, span_warning("Not while you're incapacitated!"))
-		return FALSE
-	// Constant Cost (out of blood)
-	if(!bloodsuckerdatum_power)
-		var/mob/living/living_owner = owner
-		if(living_owner.blood_volume < bloodcost)
-			to_chat(owner, span_warning("You need at least [bloodcost] blood to activate [name]"))
-			return FALSE
-		return TRUE
-	if(constant_bloodcost && bloodsuckerdatum_power.bloodsucker_blood_volume <= 0)
-		to_chat(user, span_warning("You don't have the blood to upkeep [src]."))
-		return FALSE
-	return TRUE
-
-/// NOTE: With this formula, you'll hit half cooldown at level 8 for that power.
-/datum/action/cooldown/bloodsucker/StartCooldown()
-	// Calculate Cooldown (by power's level)
-	if(power_flags & BP_AM_STATIC_COOLDOWN)
-		cooldown_time = initial(cooldown_time)
-	else
-		cooldown_time = max(initial(cooldown_time) / 2, initial(cooldown_time) - (initial(cooldown_time) / 16 * (level_current-1)))
-
-	return ..()
-
-/datum/action/cooldown/bloodsucker/proc/can_deactivate()
-	return TRUE
-
-/datum/action/cooldown/bloodsucker/is_action_active()
-	return active
-
-/datum/action/cooldown/bloodsucker/proc/pay_cost()
-	// Non-bloodsuckers will pay in other ways.
-	if(!bloodsuckerdatum_power)
-		var/mob/living/carbon/living_owner = owner
-		if(!LAZYFIND(living_owner.dna.species.species_traits, NOBLOOD))
-			living_owner.blood_volume -= bloodcost
-		return
-	// Bloodsuckers in a Frenzy don't have enough Blood to pay it, so just don't.
-	if(bloodsuckerdatum_power.frenzied)
-		return
-	bloodsuckerdatum_power.bloodsucker_blood_volume -= bloodcost
-	bloodsuckerdatum_power?.update_hud()
-
-/datum/action/cooldown/bloodsucker/proc/ActivatePower()
-	active = TRUE
-	if(power_flags & BP_AM_TOGGLE)
-		START_PROCESSING(SSprocessing, src)
-
-	owner.log_message("used [src][bloodcost != 0 ? " at the cost of [bloodcost]" : ""].", LOG_ATTACK, color="red")
-	build_all_button_icons()
-
-/datum/action/cooldown/bloodsucker/proc/DeactivatePower()
-	if(!active) //Already inactive? Return
-		return
-	if(power_flags & BP_AM_TOGGLE)
-		STOP_PROCESSING(SSprocessing, src)
-	if(power_flags & BP_AM_SINGLEUSE)
-		remove_after_use()
-		return
-	active = FALSE
-	StartCooldown()
-	build_all_button_icons()
-
-///Used by powers that are continuously active (That have BP_AM_TOGGLE flag)
-/datum/action/cooldown/bloodsucker/process(seconds_per_tick)
-	SHOULD_CALL_PARENT(TRUE) //Need this to call parent so the cooldown system works
-	. = ..()
-	if(!ContinueActive(owner)) // We can't afford the Power? Deactivate it.
-		DeactivatePower()
-		return FALSE
-	// We can keep this up (For now), so Pay Cost!
-	if(!(power_flags & BP_AM_COSTLESS_UNCONSCIOUS) && owner.stat != CONSCIOUS)
-		if(bloodsuckerdatum_power)
-			bloodsuckerdatum_power.AddBloodVolume(-constant_bloodcost)
-		else
-			var/mob/living/living_owner = owner
-			living_owner.blood_volume -= constant_bloodcost
-	return TRUE
-
-/// Checks to make sure this power can stay active
-/datum/action/cooldown/bloodsucker/proc/ContinueActive(mob/living/user, mob/living/target)
-	if(!user)
-		return FALSE
-	if(!constant_bloodcost > 0)
-		return TRUE
-	if(bloodsuckerdatum_power?.bloodsucker_blood_volume)
-		return TRUE
-	if(user.blood_volume)
-		return TRUE
-
-/// Used to unlearn Single-Use Powers
-/datum/action/cooldown/bloodsucker/proc/remove_after_use()
-	bloodsuckerdatum_power?.powers -= src
-	Remove(owner)
-
-
-
 /datum/bloodsucker_power
 	var/ability_path
 	var/datum/action/cooldown/spell/instance

code/modules/antagonists/bloodsuckers/powers/cloak.dm

@@ -1,44 +1,40 @@
-/datum/action/cooldown/bloodsucker/cloak
+/datum/action/cooldown/spell/toggle/cloak
 	name = "Cloak of Darkness"
 	desc = "Blend into the shadows and become invisible to the untrained and Artificial eye."
+
+	background_icon = 'icons/mob/actions/actions_bloodsucker.dmi'
+	background_icon_state = "vamp_power_off"
+	button_icon = 'icons/mob/actions/actions_bloodsucker.dmi'
 	button_icon_state = "power_cloak"
-	power_explanation = "Cloak of Darkness<:\n\
-		Activate this Power in the shadows and you will slowly turn nearly invisible.\n\
-		While using Cloak of Darkness, attempting to run will crush you.\n\
-		Additionally, while Cloak is active, you are completely invisible to the AI.\n\
-		Higher levels will increase how invisible you are."
-	power_flags = BP_AM_TOGGLE
+	buttontooltipstyle = "cult"
+	transparent_when_unavailable = TRUE
+
+	// power_explanation = "Cloak of Darkness<:\n\
+	// 	Activate this Power in the shadows and you will slowly turn nearly invisible.\n\
+	// 	While using Cloak of Darkness, attempting to run will crush you.\n\
+	// 	Additionally, while Cloak is active, you are completely invisible to the AI.\n\
+	// 	Higher levels will increase how invisible you are."
+
 	check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_UNCONSCIOUS
 	purchase_flags = BLOODSUCKER_CAN_BUY|VASSAL_CAN_BUY
-	bloodcost = 5
-	constant_bloodcost = 0.2
+	resource_costs = list(ANTAG_RESOURCE_BLOODSUCKER = 5)
+	maintain_costs = list(ANTAG_RESOURCE_BLOODSUCKER = 0.2)
 	cooldown_time = 5 SECONDS
-	ascended_power = /datum/action/cooldown/bloodsucker/cloak/shadow
 	var/was_running
 	var/runbound = TRUE
 
 /// Must have nobody around to see the cloak
-/datum/action/cooldown/bloodsucker/cloak/CanUse(mob/living/carbon/user)
+/datum/action/cooldown/spell/toggle/cloak/can_cast_spell(feedback)
 	. = ..()
 	if(!.)
 		return FALSE
 	for(var/mob/living/watchers in viewers(9, owner) - owner)
-		owner.balloon_alert(owner, "you can only vanish unseen.")
+		if(feedback)
+			owner.balloon_alert(owner, "you can only vanish unseen.")
 		return FALSE
 	return TRUE
 
-/datum/action/cooldown/bloodsucker/cloak/ActivatePower()
-	. = ..()
-	var/mob/living/user = owner
-	was_running = (user.m_intent == MOVE_INTENT_RUN)
-	if(runbound)
-		if(was_running)
-			user.toggle_move_intent()
-	user.digitalinvis = 1
-	user.digitalcamo = 1
-	user.balloon_alert(user, "cloak turned on.")
-
-/datum/action/cooldown/bloodsucker/cloak/process()
+/datum/action/cooldown/spell/toggle/cloak/process()
 	// Checks that we can keep using this.
 	. = ..()
 	if(!.)
@@ -54,18 +50,18 @@
 			user.toggle_move_intent()
 			user.adjustBruteLoss(rand(5,15))
 
-/datum/action/cooldown/bloodsucker/cloak/ContinueActive(mob/living/user, mob/living/target)
+/datum/action/cooldown/spell/toggle/cloak/Enable()
 	. = ..()
-	if(!.)
-		return FALSE
-	/// Must be CONSCIOUS
-	if(user.stat != CONSCIOUS)
-		to_chat(owner, span_warning("Your Cloak of Darkness fell off due to you falling unconscious!"))
-		return FALSE
-	return TRUE
+	var/mob/living/user = owner
+	was_running = (user.m_intent == MOVE_INTENT_RUN)
+	if(runbound)
+		if(was_running)
+			user.toggle_move_intent()
+	user.digitalinvis = 1
+	user.digitalcamo = 1
+	user.balloon_alert(user, "cloak turned on.")
 
-/datum/action/cooldown/bloodsucker/cloak/DeactivatePower()
-	. = ..()
+/datum/action/cooldown/spell/toggle/cloak/Disable()
 	var/mob/living/user = owner
 	animate(user, alpha = 255, time = 1 SECONDS)
 	user.digitalinvis = 0
@@ -75,7 +71,7 @@
 			user.toggle_move_intent()
 	user.balloon_alert(user, "cloak turned off.")
 
-/datum/action/cooldown/bloodsucker/cloak/shadow
+/datum/action/cooldown/spell/toggle/cloak/shadow
 	name = "Cloak of Shadows"
 	desc = "Empowered to the abyss, fortitude will now grant you a shadow armor, making your grip harder to escape and reduce projectile damage while in darkness."
 	background_icon = 'icons/mob/actions/actions_lasombra_bloodsucker.dmi'
@@ -85,17 +81,25 @@
 	button_icon_state = "power_state"
 	additional_text = "Additionally allows you to run during cloak and gain a physical cloak while in darkness."
 	purchase_flags = LASOMBRA_CAN_BUY
-	constant_bloodcost = 0.3
 	runbound = FALSE
-	ascended_power = null
+
+/datum/action/cooldown/spell/toggle/cloak/shadow/Enable()
+	. = ..()
+	var/turf/T = get_turf(owner)
+	var/light_amount = T.get_lumcount()
+	if(light_amount <= LIGHTING_TILE_IS_DARK)
+		if(!owner.get_item_by_slot(ITEM_SLOT_NECK))
+			owner.equip_to_slot_or_del( new /obj/item/clothing/neck/yogs/sith_cloak/cloak(null), ITEM_SLOT_NECK)
+
+/datum/action/cooldown/spell/toggle/cloak/shadow/Disable()
+	. = ..()
+	var/obj/item/I = owner.get_item_by_slot(ITEM_SLOT_NECK)
+	if(istype(I, /obj/item/clothing/neck/yogs/sith_cloak/cloak))
+		qdel(I)
 
 /obj/item/clothing/neck/yogs/sith_cloak/cloak
 	name = "cloak of shadows"
 	desc = "Fancy stuff."
-	icon = 'icons/obj/vamp_obj.dmi'
-	worn_icon = 'icons/obj/vamp_obj.dmi'
-	icon_state = "cloak"
-	item_state = "cloak"
 	armor = list(MELEE = 0, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 100) //good if you haven nothing
 
 /obj/item/clothing/neck/yogs/sith_cloak/cloak/Initialize(mapload)
@@ -111,16 +115,3 @@
 		STOP_PROCESSING(SSobj, src)
 		src.visible_message(span_warning("The cape desintegrates as the light contacts it's surface!"))
 
-/datum/action/cooldown/bloodsucker/cloak/shadow/ActivatePower()
-	. = ..()
-	var/turf/T = get_turf(owner)
-	var/light_amount = T.get_lumcount()
-	if(light_amount <= LIGHTING_TILE_IS_DARK)
-		if(!owner.get_item_by_slot(ITEM_SLOT_NECK))
-			owner.equip_to_slot_or_del( new /obj/item/clothing/neck/yogs/sith_cloak/cloak(null), ITEM_SLOT_NECK)
-
-/datum/action/cooldown/bloodsucker/cloak/shadow/DeactivatePower()
-	. = ..()
-	var/obj/item/I = owner.get_item_by_slot(ITEM_SLOT_NECK)
-	if(istype(I, /obj/item/clothing/neck/yogs/sith_cloak/cloak))
-		qdel(I)

code/modules/antagonists/bloodsuckers/powers/distress.dm

@@ -1,22 +1,26 @@
-/datum/action/cooldown/bloodsucker/distress
+/datum/action/cooldown/spell/distress
 	name = "Distress"
 	desc = "Injure yourself, allowing you to make a desperate call for help to your Master."
+	transparent_when_unavailable = TRUE
+	buttontooltipstyle = "cult"
+
+	background_icon = 'icons/mob/actions/actions_bloodsucker.dmi'
+	background_icon_state = "vamp_power_off"
+	button_icon = 'icons/mob/actions/actions_bloodsucker.dmi'
 	button_icon_state = "power_distress"
-	power_explanation = "Distress:\n\
-		Use this Power from anywhere and your Master Bloodsucker will instnatly be alerted of your location."
-	power_flags = NONE
+
+	//power_explanation = "Distress:Use this Power from anywhere and your Master Bloodsucker will instantly be alerted of your location."
 	check_flags = NONE
-	purchase_flags = NONE
-	bloodcost = 10
+	resource_costs = list(ANTAG_RESOURCE_BLOODSUCKER = 10)
 	cooldown_time = 10 SECONDS
 
-/datum/action/cooldown/bloodsucker/distress/ActivatePower()
+/datum/action/cooldown/spell/distress/cast()
 	. = ..()
 	var/turf/open/floor/target_area = get_area(owner)
 	var/datum/antagonist/vassal/vassaldatum = owner.mind.has_antag_datum(/datum/antagonist/vassal)
 
 	to_chat(owner, "You call out for your master!")
-	to_chat(vassaldatum.master.owner, "<span class='userdanger'>[owner], your loyal Vassal, is desperately calling for aid at [target_area]!</span>")
+	to_chat(vassaldatum.master.owner, span_userdanger("[owner], your loyal Vassal, is desperately calling for aid at [target_area]!"))
 
 	var/mob/living/user = owner
 	user.adjustBruteLoss(10)