glare

Author: Kapu1178

code/datums/actions/action.dm

@@ -151,21 +151,21 @@
 		return FALSE
 	if((check_flags & AB_CHECK_HANDS_BLOCKED) && HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED))
 		if (feedback)
-			to_chat(owner, span_warning("You cannot use [name] without hands!"))
+			to_chat(owner, span_warning("You cannot use [name] without hands."))
 		return FALSE
 	if((check_flags & AB_CHECK_IMMOBILE) && HAS_TRAIT(owner, TRAIT_IMMOBILIZED))
 		if (feedback)
-			to_chat(owner, span_warning("You cannot use [name] while immobilized!"))
+			to_chat(owner, span_warning("You cannot use [name] while immobilized."))
 		return FALSE
 	if((check_flags & AB_CHECK_LYING) && isliving(owner))
 		var/mob/living/action_owner = owner
 		if(action_owner.body_position == LYING_DOWN)
 			if (feedback)
-				to_chat(owner, span_warning("You cannot use [name] while lying down!"))
+				to_chat(owner, span_warning("You cannot use [name] while lying down."))
 			return FALSE
 	if((check_flags & AB_CHECK_CONSCIOUS) && owner.stat != CONSCIOUS)
 		if (feedback)
-			to_chat(owner, span_warning("You cannot use [name] while unconscious!"))
+			to_chat(owner, span_warning("You cannot use [name] while unconscious."))
 		return FALSE
 	return TRUE
 

code/datums/actions/cooldown_action.dm

@@ -1,5 +1,3 @@
-#define COOLDOWN_NO_DISPLAY_TIME (180 SECONDS)
-
 /// Preset for an action that has a cooldown.
 /datum/action/cooldown
 	check_flags = NONE
@@ -67,19 +65,22 @@
 /datum/action/cooldown/create_button()
 	var/atom/movable/screen/movable/action_button/button = ..()
 	button.maptext = ""
-	button.maptext_x = 6
+	button.maptext_x = 3
 	button.maptext_y = 2
-	button.maptext_width = 24
+	button.maptext_width = 28
 	button.maptext_height = 12
 	return button
 
 /datum/action/cooldown/update_button_status(atom/movable/screen/movable/action_button/button, force = FALSE)
 	. = ..()
 	var/time_left = max(next_use_time - world.time, 0)
-	if(!text_cooldown || !owner || time_left == 0 || time_left >= COOLDOWN_NO_DISPLAY_TIME)
+	if(!text_cooldown || !owner || time_left == 0)
 		button.maptext = ""
 	else
-		button.maptext = MAPTEXT("<b>[round(time_left/10, 0.1)]</b>")
+		if(time_left > 60 SECONDS)
+			button.maptext = MAPTEXT("<b>[ceil(time_left/600)] min")
+		else
+			button.maptext = MAPTEXT("<b>[round(time_left/10, 0.1)]</b>")
 
 	if(!IsAvailable() || !is_action_active(button))
 		return

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -571,3 +571,10 @@
 	pixel_y = -16
 	base_pixel_y = -16
 	duration = 10
+
+/obj/effect/temp_visual/vamp_glare
+	icon = 'goon/icons/64x64.dmi'
+	icon_state = "glare"
+	pixel_x = -16
+	pixel_y = -8
+	duration = 2 SECONDS

code/modules/antagonists/vampire/blood_plague.dm

@@ -13,6 +13,7 @@
 
 	pathogen_flags = NONE
 	spread_flags = PATHOGEN_SPREAD_BLOOD
+	visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
 
 /datum/pathogen/blood_plague/on_process(delta_time, times_fired)
 	if(affected_mob.stat != CONSCIOUS)

code/modules/antagonists/vampire/vampire.dm

@@ -14,6 +14,7 @@
 
 	var/list/innate_actions = list(
 		/datum/action/cooldown/neck_bite,
+		/datum/action/cooldown/glare,
 	)
 
 /datum/antagonist/vampire/New()

code/modules/antagonists/vampire/vampire_actions/glare.dm

@@ -0,0 +1,76 @@
+/datum/action/cooldown/glare
+	name = "Glare"
+	desc = "Enfeeble a target with a single glare."
+	button_icon = 'goon/icons/actions.dmi'
+	button_icon_state = "hypno"
+	ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
+
+	check_flags = AB_CHECK_CONSCIOUS
+	click_to_activate = TRUE
+
+	cooldown_time = 180 SECONDS
+
+/datum/action/cooldown/glare/is_valid_target(atom/cast_on)
+	var/mob/living/carbon/human/victim = cast_on
+	if(!istype(cast_on))
+		return FALSE
+
+	if(victim == owner)
+		return FALSE
+
+	if(victim.stat != CONSCIOUS)
+		return FALSE
+
+	if(get_dist(victim, cast_on) > 2)
+		to_chat(owner, span_warning("[victim] is too far away."))
+		return FALSE
+
+	if(victim.loc != owner.loc)
+		var/victim_to_attacker = get_dir(victim, owner)
+		if(victim.dir & REVERSE_DIR(victim_to_attacker))
+			to_chat(owner, span_warning("[victim] is not looking at you."))
+			return FALSE
+	return TRUE
+
+/datum/action/cooldown/glare/IsAvailable(feedback)
+	. = ..()
+	if(!.)
+		return
+
+	if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))
+		if (feedback)
+			to_chat(owner, span_warning("You cannot use [name] while incapacitated."))
+		return FALSE
+
+	var/mob/living/carbon/human/human_owner = owner
+	var/obj/item/organ/eyes/eyes = human_owner.getorganslot(ORGAN_SLOT_EYES)
+	if(!eyes || (eyes.organ_flags & ORGAN_DEAD))
+		if (feedback)
+			to_chat(owner, span_warning("You cannot use [name] while you have no eyes."))
+		return FALSE
+
+	if(human_owner.is_blind())
+		if (feedback)
+			to_chat(owner, span_warning("You cannot use [name] while you are blind."))
+		return FALSE
+
+/datum/action/cooldown/glare/Activate(atom/target)
+	. = ..()
+	var/mob/living/carbon/human/victim = target
+
+	glare_visual(get_turf(owner))
+	addtimer(CALLBACK(src, PROC_REF(glare_visual), victim.loc), 0.1 SECONDS)
+	playsound(target, 'goon/sounds/glare.ogg', 50, TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE)
+	owner.visible_message(span_notice("[owner] glances into [target]'s eyes."), vision_distance = COMBAT_MESSAGE_RANGE)
+
+	if(victim.get_total_tint() || victim.get_eye_protection())
+		return // Lol owned
+
+	if(!victim.flash_act(INFINITY, FALSE, FALSE, TRUE))
+		return // Lol owned
+
+	victim.stamina.adjust(-300)
+	victim.adjust_drowsyness(50)
+
+/datum/action/cooldown/glare/proc/glare_visual(loc)
+	new /obj/effect/temp_visual/vamp_glare(loc)

code/modules/antagonists/vampire/vampire_actions/neck_bite.dm

@@ -64,6 +64,7 @@
 	. = ..()
 
 	spawn(-1)
+		ADD_TRAIT(user, TRAIT_MUTE, ref(src))
 		var/image/succ_image = image('goon/icons/actions.dmi', "blood")
 		while(TRUE)
 			if(!can_bite(user, victim))
@@ -75,6 +76,8 @@
 
 			siphon_blood(user, victim)
 
+		REMOVE_TRAIT(user, TRAIT_MUTE, ref(src))
+
 /datum/action/cooldown/neck_bite/proc/siphon_blood(mob/living/carbon/human/user, mob/living/carbon/human/victim)
 	user.visible_message(span_danger("[user] siphons blood from [victim]'s neck!"), vision_distance = COMBAT_MESSAGE_RANGE, ignored_mobs = victim)
 	if(victim.stat == CONSCIOUS)
@@ -165,7 +168,7 @@
 
 	for(var/obj/item/hand_item/grab/grab in user.active_grabs)
 		var/mob/living/carbon/human/potential_victim = grab.affecting
-		if(!ishuman(potential_victim))
+		if(!ishuman(potential_victim) || ismonkey(potential_victim))
 			if(ismob(potential_victim) && error_string_ptr)
 				*error_string_ptr = "You cannot feast on [potential_victim]."
 			continue

code/modules/antagonists/vampire/vampire_states/vampire_bloodlust.dm

@@ -7,11 +7,15 @@
 
 /datum/vampire_state/bloodlust/enter_state(mob/living/carbon/human/host)
 	. = ..()
+	host.add_movespeed_modifier(/datum/movespeed_modifier/vampire_bloodlust)
 	host.mob_mood.add_mood_event("vampire", /datum/mood_event/vampire_bloodlust)
+	host.stats.set_skill_modifier(2, /datum/rpg_skill/skirmish, "vampire")
 
 /datum/vampire_state/bloodlust/exit_state(mob/living/carbon/human/host)
 	. = ..()
 	host.mob_mood.clear_mood_event("vampire")
+	host.stats.remove_skill_modifier(/datum/rpg_skill/skirmish, "vampire")
+	host.remove_movespeed_modifier(/datum/movespeed_modifier/vampire_bloodlust)
 
 /datum/vampire_state/bloodlust/tick(delta_time, mob/living/carbon/human/host)
 	. = ..()

code/modules/movespeed/modifiers/misc.dm

@@ -5,6 +5,9 @@
 	slowdown = -0.65
 	blacklisted_movetypes = (FLYING|FLOATING)
 
+/datum/movespeed_modifier/vampire_bloodlust
+	slowdown = -1
+
 /datum/movespeed_modifier/vampire_starving
 	slowdown = 1
 

daedalus.dme

@@ -2309,6 +2309,7 @@
 #include "code\modules\antagonists\traitor\objectives\steal.dm"
 #include "code\modules\antagonists\vampire\blood_plague.dm"
 #include "code\modules\antagonists\vampire\vampire.dm"
+#include "code\modules\antagonists\vampire\vampire_actions\glare.dm"
 #include "code\modules\antagonists\vampire\vampire_actions\neck_bite.dm"
 #include "code\modules\antagonists\vampire\vampire_states\_vampire_states.dm"
 #include "code\modules\antagonists\vampire\vampire_states\vampire_bloodlust.dm"