Fixes

tgstation · Oct 17, 2024 · 1ebe188 · 1ebe188
1 parent 8efa6ca
commit 1ebe188
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm
@@ -39,11 +39,11 @@
 	var/multiplier = 1
 	if(HAS_TRAIT(owner, TRAIT_BLOODTHIRSTER))
 		if(X.plasma_stored >= STAGE_TWO_BLOODTHIRST)
-			multiplier++
+			multiplier += 0.5
 			if(X.plasma_stored >= STAGE_THREE_BLOODTHIRST)
-				multiplier++
+				multiplier++ += 0.5
 
-	X.throw_at(A, charge_range, RAV_CHARGESPEED*multiplier, X)
+	X.throw_at(A, charge_range*multiplier, RAV_CHARGESPEED*multiplier, X)
 
 	add_cooldown()
 
@@ -655,12 +655,14 @@
 	UnregisterSignal(L, list(COMSIG_XENOMORPH_ATTACK_LIVING, COMSIG_XENOMORPH_TAKING_DAMAGE))
 	STOP_PROCESSING(SSprocessing, src)
 
+/// sig handler to track attacks for bloodthirst
 /datum/action/ability/xeno_action/bloodthirst/proc/on_attack(datum/source, mob/living/attacked, damage)
 	SIGNAL_HANDLER
 	if(!ishuman(attacked) || attacked.stat == DEAD)
 		return
 	last_fight_time = world.time
 
+///sig handler to track last attacked for bloodthirst
 /datum/action/ability/xeno_action/bloodthirst/proc/on_take_damage(datum/source, damage)
 	SIGNAL_HANDLER
 	last_fight_time = world.time
@@ -735,3 +737,4 @@
 	xeno.playsound_local(xeno, 'sound/voice/hiss5.ogg', 50)
 	to_chat(owner, span_highdanger("THE QUEEN MOTHER IS PLEASED WITH YOUR PERFORMANCE ([damage_dealt]/[DEATHMARK_DAMAGE_OR_DIE])."))
 	owner.balloon_alert(owner, "deathmark expired")
+	add_cooldown()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/ravager.dm
@@ -33,23 +33,5 @@
 		emote("roar")
 		to_chat(src, span_xenodanger("The heat of the fire roars in our veins! KILL! CHARGE! DESTROY!"))
 
-// ***************************************
-// *********** Ability related
-// ***************************************
-/mob/living/carbon/xenomorph/ravager/get_crit_threshold()
-	. = ..()
-	if(!endure)
-		return
-	var/datum/action/ability/xeno_action/endure/endure_ability = actions_by_path[/datum/action/ability/xeno_action/endure]
-	return endure_ability.endure_threshold
-
-/mob/living/carbon/xenomorph/ravager/get_death_threshold()
-	. = ..()
-	if(!endure)
-		return
-	var/datum/action/ability/xeno_action/endure/endure_ability = actions_by_path[/datum/action/ability/xeno_action/endure]
-	return endure_ability.endure_threshold
-
-
 /mob/living/carbon/xenomorph/ravager/bloodthirster
 	caste_base_type = /datum/xeno_caste/ravager/bloodthirster
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm b/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm
@@ -13,8 +13,18 @@
 	SHOULD_CALL_PARENT(FALSE)
 	return FALSE
 
+/mob/living/carbon/xenomorph/get_crit_threshold()
+	. = ..()
+	if(!endure)
+		return
+	var/datum/action/ability/xeno_action/endure/endure_ability = actions_by_path[/datum/action/ability/xeno_action/endure]
+	return endure_ability.endure_threshold
+
 /mob/living/carbon/xenomorph/get_death_threshold()
-	return xeno_caste.crit_health
+	if(!endure)
+		return xeno_caste.crit_health
+	var/datum/action/ability/xeno_action/endure/endure_ability = actions_by_path[/datum/action/ability/xeno_action/endure]
+	return endure_ability.endure_threshold
 
 ///Helper proc for giving the rally abilities
 /mob/living/carbon/xenomorph/proc/give_rally_abilities()