Light splat helper refactors

code/__DEFINES/~darkpack/splats.dm

@@ -11,3 +11,12 @@
 #define SPLAT_CORAX "splat_corax" // DARKPACK TODO - CORAX
 
 #define SPLAT_ALL list(SPLAT_NONE, SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_GAROU)
+
+#define SPLAT_PRIO_HALFSPLAT 100
+#define SPLAT_PRIO_SPLAT 200
+
+#define SPLAT_PRIO_KINFOLK 40 + SPLAT_PRIO_HALFSPLAT
+#define SPLAT_PRIO_GHOUL 70 + SPLAT_PRIO_HALFSPLAT
+
+#define SPLAT_PRIO_SHIFTER 40 + SPLAT_PRIO_SPLAT
+#define SPLAT_PRIO_KINDRED 60 + SPLAT_PRIO_SPLAT

code/datums/components/food/edible.dm

@@ -704,7 +704,7 @@ Behavior that's still missing from this component that original food items had t
 
 	// DARKPACK EDIT ADD START - MERITS/FLAWS - (Organovore)
 	if(HAS_TRAIT(eater, TRAIT_ORGANOVORE) && (foodtypes & GORE))
-		if(iskindred(eater))
+		if(get_kindred_splat(eater))
 			eater.adjust_blood_pool(1, FALSE)
 			to_chat(eater, span_notice("You feel vitae flowing through the fresh meat."))
 	// DARKPACK EDIT ADD END

code/modules/mob/living/blood.dm

@@ -477,7 +477,7 @@
 	blood_data["factions"] = faction
 
 	// DARKPACK EDIT ADD - Store kindred clan and generation in blood data
-	var/datum/splat/vampire/kindred/kindred_splat = iskindred(src)
+	var/datum/splat/vampire/kindred/kindred_splat = get_kindred_splat(src)
 	if(kindred_splat)
 		blood_data["generation"] = kindred_splat.generation
 		blood_data["clan"] = kindred_splat.clan

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -50,7 +50,7 @@
 // DARKPACK EDIT ADD - blood increments bloodpool
 /datum/reagent/blood/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	. = ..()
-	if((!istype(src, /datum/reagent/blood/vitae)) && iskindred(affected_mob))
+	if((!istype(src, /datum/reagent/blood/vitae)) && get_kindred_splat(affected_mob))
 		affected_mob.adjust_blood_pool(metabolization_rate * 0.005 * seconds_per_tick)
 // DARKPACK EDIT ADD END
 

modular_darkpack/master_files/code/modules/mob/living/carbon/examine.dm

@@ -44,7 +44,7 @@
 			. += span_warning("[p_They()] [p_have()] visible fangs in [p_their()] mouth.<br>")
 
 	// WEREWOLF
-	var/datum/splat/werewolf/werewolf_splat = iswerewolfsplat(user)
+	var/datum/splat/werewolf/werewolf_splat = get_werewolf_splat(user)
 	if(werewolf_splat && !(obscured_slots & HIDEFACE))
 		. += werewolf_splat.examine_other_human(src)
 	// WEREWOLF

modular_darkpack/master_files/code/modules/mob/living/carbon/human/init_signals.dm

@@ -9,7 +9,7 @@
 /mob/living/carbon/human/proc/on_staked(datum/source)
 	SIGNAL_HANDLER
 
-	if(iskindred(src))
+	if(get_kindred_splat(src))
 		torpor(STAKE_TRAIT, TRUE)
 	else
 		death()
@@ -18,5 +18,5 @@
 /mob/living/carbon/human/proc/on_unstaked(datum/source)
 	SIGNAL_HANDLER
 
-	if(iskindred(src))
+	if(get_kindred_splat(src))
 		cure_torpor(STAKE_TRAIT, TRUE)

modular_darkpack/master_files/code/modules/mob/living/carbon/human/life.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/human/Life()
-	if(!iskindred(src))
+	if(!get_kindred_splat(src))
 		if(prob(5))
 			adjust_agg_loss(-5, TRUE)
 	. = ..()

modular_darkpack/master_files/code/modules/rituals/code/ritual_tome.dm

@@ -27,7 +27,7 @@
 	if(!isliving(user))
 		return
 	var/mob/living/reader = user
-	if(!iskindred(user) && !isghoul(user))
+	if(!get_kindred_splat(user) && !get_ghoul_splat(user))
 		if(reader.st_get_stat(STAT_OCCULT) < 3)
 			to_chat(reader, span_cult("A strange book that looks like it belongs in a dusty Library or a garage sale. You find yourself not caring, or understanding, too much about it."))
 			return

modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm

@@ -3,7 +3,7 @@
 	if(on_spawn)
 		bloodpool = 0
 
-	var/datum/splat/vampire/kindred/kindred_splat = iskindred(src)
+	var/datum/splat/vampire/kindred/kindred_splat = get_kindred_splat(src)
 	if(kindred_splat)
 		var/hunger_threshold = 7 - (kindred_splat.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL))
 		var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)

modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm

@@ -39,7 +39,7 @@
 		var/mob/living/carbon/human/H = drunk_from
 		drunked_of |= "[H.dna.real_name]"
 
-		if(!iskindred(drunk_from))
+		if(!get_kindred_splat(drunk_from))
 			H.blood_volume = max(H.blood_volume-50, 150)
 
 		if(H.reagents)
@@ -61,7 +61,7 @@
 		remove_drinking_overlay(drunk_from)
 		return
 
-	if(iskindred(drunk_from))
+	if(get_kindred_splat(drunk_from))
 		to_chat(src, span_userdanger("[drunk_from]'s blood tastes HEAVENLY..."))
 		adjust_brute_loss(-25, TRUE)
 		adjust_fire_loss(-25, TRUE)

modular_darkpack/modules/blood_drinking/code/overfeeding/check_can_drink_dry.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/human/proc/check_can_drink_dry(var/mob/living/mob)
-	if(!iskindred(mob) || !iskindred(src))
+	if(!get_kindred_splat(mob) || !get_kindred_splat(src))
 		return TRUE
 
 	if(!mob.client)

modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/adjust_generation.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/human/proc/adjust_generation(mob/living/carbon/human/victim)
-	var/datum/splat/vampire/kindred/kindred = iskindred(src)
+	var/datum/splat/vampire/kindred/kindred = get_kindred_splat(src)
 	var/generation = get_generation()
 	var/victim_generation = victim.get_generation()
 

modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/handle_diablerie.dm

@@ -1,6 +1,6 @@
 /mob/living/carbon/human/proc/handle_diablerie(mob/living/victim)
 
-	var/datum/splat/vampire/kindred/kindred = iskindred(src)
+	var/datum/splat/vampire/kindred/kindred = get_kindred_splat(src)
 	var/generation = get_generation()
 	var/victim_generation = victim.get_generation()
 

modular_darkpack/modules/blood_drinking/code/overfeeding/handle_drink_dry.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/human/proc/handle_drink_dry(var/mob/living/mob)
-	if(iskindred(mob) && !iskindred(src))
+	if(get_kindred_splat(mob) && !get_kindred_splat(src))
 		handle_diablerie(mob)
 	else if(ishuman(mob))
 		handle_overfeeding(mob)

modular_darkpack/modules/blood_drinking/code/vamp_bite.dm

@@ -6,13 +6,13 @@
 	if(grab_state > GRAB_PASSIVE)
 		if(isliving(pulling))
 			var/mob/living/bit_living = pulling
-			if(!isvampiresplat(src))
+			if(!get_vampire_splat(src))
 				SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75))
 				to_chat(src, span_warning("You're not desperate enough to try <i>that</i>."))
 				return
 			// Allow ghouls to steal viate?
-			if(isghoul(src))
-				if(!iskindred(bit_living))
+			if(get_ghoul_splat(src))
+				if(!get_kindred_splat(bit_living))
 					SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75))
 					to_chat(src, span_warning("You're not desperate enough to try <i>that</i>."))
 					return
@@ -22,15 +22,15 @@
 				to_chat(src,span_warning("Your Beast requires life, not the tepid swill of corpses."))
 				return
 			// Allow for diablor?
-			if(!iskindred(bit_living) || !iskindred(src))
+			if(!get_kindred_splat(bit_living) || !get_kindred_splat(src))
 				if(!CAN_HAVE_BLOOD(bit_living) || (bit_living.blood_volume <= 50) || (bit_living.bloodpool <= 0))
 					SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75))
 					to_chat(src, span_warning("This vessel is empty. You'll have to find another."))
 					return
 
-			if(iskindred(src))
+			if(get_kindred_splat(src))
 				bit_living.emote("groan")
-			else if(isghoul(src))
+			else if(get_ghoul_splat(src))
 				bit_living.emote("scream")
 
 			if(ishuman(bit_living))
@@ -39,8 +39,8 @@
 
 			var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
 			if(!skipface)
-				if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD))
-					var/datum/splat/vampire/kindred/kindred_species = iskindred(src)
+				if(get_kindred_splat(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD))
+					var/datum/splat/vampire/kindred/kindred_species = get_kindred_splat(src)
 					var/stat_to_roll = kindred_species.enlightenment ? STAT_INSTINCT : STAT_SELF_CONTROL
 					var/datum/storyteller_roll/frezy_roll = new()
 					frezy_roll.applicable_stats = list(stat_to_roll)

modular_darkpack/modules/city_time/code/status_effects.dm

@@ -12,7 +12,7 @@
 	. = ..()
 	var/area/my_area = get_area(user)
 	. += span_notice("You are currently [my_area.outdoors ? "outdoors" : "indoors"]")
-	if(iskindred(user))
+	if(get_kindred_splat(user))
 		. += span_warning("The sun will sear your flesh and bring final death.")
 
 /datum/status_effect/sunlight_burning
@@ -26,7 +26,7 @@
 	if(!istype(my_area) || !my_area.outdoors)
 		return FALSE
 
-	var/datum/splat/vampire/kindred/kindred_owner = iskindred(owner)
+	var/datum/splat/vampire/kindred/kindred_owner = get_kindred_splat(owner)
 	if(!kindred_owner)
 		return FALSE
 	// Humanity 10 vamps are immume to the light. atleast for the amount of time our day lasts.
@@ -40,7 +40,7 @@
 	. = ..()
 	if(SScity_time.daytime_started)
 		var/area/my_area = get_area(owner)
-		if(istype(my_area) && my_area.outdoors && iskindred(owner))
+		if(istype(my_area) && my_area.outdoors && get_kindred_splat(owner))
 			owner.apply_damage(10, BURN)
 			return TRUE
 	qdel(src)

modular_darkpack/modules/drugs/code/bloodpacks/cokepack.dm

@@ -21,7 +21,7 @@
 
 /obj/item/reagent_containers/drug/cokepack/attack(mob/living/M, mob/living/user)
 	. = ..()
-	if(!iskindred(M))
+	if(!get_kindred_splat(M))
 		if(!vitae)
 			return
 	if(empty)
@@ -39,7 +39,7 @@
 		M.adjust_fire_loss(-20, TRUE)
 		M.update_damage_overlays()
 		M.update_health_hud()
-		if(iskindred(M))
+		if(get_kindred_splat(M))
 			H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M
 		playsound(M.loc,'sound/items/drink.ogg', 50, TRUE)
 		return

modular_darkpack/modules/drugs/code/bloodpacks/methpack.dm

@@ -21,7 +21,7 @@
 
 /obj/item/reagent_containers/drug/methpack/attack(mob/living/M, mob/living/user)
 	. = ..()
-	if(!iskindred(M))
+	if(!get_kindred_splat(M))
 		if(!vitae)
 			return
 	if(empty)
@@ -39,7 +39,7 @@
 		M.adjust_fire_loss(-20, TRUE)
 		M.update_damage_overlays()
 		M.update_health_hud()
-		if(iskindred(M))
+		if(get_kindred_splat(M))
 			H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M
 		playsound(M.loc,'sound/items/drink.ogg', 50, TRUE)
 		return

modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm

@@ -21,7 +21,7 @@
 
 /obj/item/reagent_containers/drug/morphpack/attack(mob/living/M, mob/living/user)
 	. = ..()
-	if(!iskindred(M))
+	if(!get_kindred_splat(M))
 		if(!vitae)
 			return
 	if(empty)
@@ -39,7 +39,7 @@
 		M.adjust_fire_loss(-20, TRUE)
 		M.update_damage_overlays()
 		M.update_health_hud()
-		if(iskindred(M))
+		if(get_kindred_splat(M))
 			H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M
 		playsound(M.loc,'sound/items/drink.ogg', 50, TRUE)
 		return

modular_darkpack/modules/economy/code/selling/lombard.dm

@@ -173,8 +173,8 @@
 	// Morality loss warning for bulk sales
 	if(selling_comp.humanity_loss && ishuman(user))
 		var/mob/living/carbon/human/H = user
-		var/datum/splat/vampire/kindred/vampirism = iskindred(H)
-		if(!iskindred(H) || !vampirism.enlightenment)
+		var/datum/splat/vampire/kindred/vampirism = get_kindred_splat(H)
+		if(!get_kindred_splat(H) || !vampirism.enlightenment)
 			var/humanity_loss_modifier = HAS_TRAIT(H, TRAIT_SENSITIVE_HUMANITY) ? 2 : 1
 			var/total_humanity_risk = length(items_to_sell) * humanity_loss_modifier * selling_comp.humanity_loss
 

modular_darkpack/modules/economy/code/selling/selling.dm

@@ -55,8 +55,8 @@
 		seller = organ.loc
 
 	// If we found a seller and they're on Enlightenment path, no warning
-	if(seller && iskindred(seller))
-		var/datum/splat/vampire/kindred/vampirism = iskindred(seller)
+	if(seller && get_kindred_splat(seller))
+		var/datum/splat/vampire/kindred/vampirism = get_kindred_splat(seller)
 		if(vampirism.enlightenment)
 			return span_notice("You've sold [parent]!")
 

modular_darkpack/modules/ert/code/items/first_team.dm

@@ -150,7 +150,7 @@
 
 /obj/projectile/bullet/darkpack/vamp556mm/bale/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
-	if(iskindred(target) || isghoul(target))
+	if(get_kindred_splat(target) || get_ghoul_splat(target))
 		var/mob/living/carbon/human/H = target
 		if(H.bloodpool == 0)
 			to_chat(H, span_warning("Only ash remains in my veins!"))
@@ -161,7 +161,7 @@
 		to_chat(H, span_warning("Green flames errupt from the bullets impact, boiling your blood!"))
 // DARKPACK TODO - GAROU
 /*
-	if(iswerewolf(target) || isgarou(target))
+	if(iswerewolf(target) || get_garou_splat(target))
 		var/mob/living/carbon/M = target
 		if(M.auspice.gnosis)
 			if(prob(50))

modular_darkpack/modules/food/code/drinks.dm

@@ -53,9 +53,9 @@
 	//glass_desc = "A freezing pint of vitae."
 
 /datum/reagent/consumable/ethanol/beer/typhon/on_mob_life(mob/living/carbon/M)
-	if(iskindred(M))
+	if(get_kindred_splat(M))
 		M.adjust_blood_pool(0.25)
-	if(isghoul(M))
+	if(get_ghoul_splat(M))
 		M.adjust_blood_pool(1)
 	return ..()
 

modular_darkpack/modules/food/code/recipes.dm

@@ -9,7 +9,7 @@
 	if(!ishuman(user))
 		return FALSE
 
-	var/datum/splat/vampire/vampire = does_use_disciplines(user)
+	var/datum/splat/vampire/vampire = get_splat_with_discipline(user)
 	if(vampire?.get_discipline(/datum/discipline/serpentis))
 		return TRUE
 

modular_darkpack/modules/frenzy/code/frenzy.dm

@@ -12,9 +12,9 @@
 
 /mob/living/carbon/proc/rollfrenzy()
 	if(client)
-		if(isgarou(src))
+		if(get_garou_splat(src))
 			to_chat(src, "I'm full of [span_danger("<b>ANGER</b>")], and I'm about to flare up in [span_danger("<b>RAGE</b>")]. Rolling...")
-		else if(iskindred(src))
+		else if(get_kindred_splat(src))
 			to_chat(src, "I need [span_danger("<b>BLOOD</b>")]. The [span_danger("<b>BEAST</b>")] is calling. Rolling...")
 		else
 			to_chat(src, "I'm too [span_danger("<b>AFRAID</b>")] to continue doing this. Rolling...")
@@ -85,7 +85,7 @@
 //	if(!fear && !frenzy_target)
 //		return
 
-	if(iskindred(src))
+	if(get_kindred_splat(src))
 		if(fear)
 			step_away(src,fear,99)
 			if(prob(25))
@@ -125,9 +125,9 @@
 
 /mob/living/carbon/proc/get_frenzy_targets()
 	var/list/targets = list()
-	if(iskindred(src))
+	if(get_kindred_splat(src))
 		for(var/mob/living/L in oviewers(DEFAULT_SIGHT_DISTANCE, src))
-			if(!iskindred(L) && L.bloodpool && L.stat != DEAD)
+			if(!get_kindred_splat(L) && L.bloodpool && L.stat != DEAD)
 				targets += L
 				if(L == frenzy_target)
 					return L

modular_darkpack/modules/jobs/code/_jobs.dm

@@ -42,7 +42,7 @@
 /datum/outfit/job/vampire/pre_equip(mob/living/carbon/human/H, visuals_only)
 	. = ..()
 	if(uses_default_clan_clothes == TRUE)
-		var/datum/splat/vampire/kindred/kindred = iskindred(H)
+		var/datum/splat/vampire/kindred/kindred = get_kindred_splat(H)
 		if(kindred)
 			if(H.jumpsuit_style == PREF_SUIT)
 				shoes = /obj/item/clothing/shoes/vampire

modular_darkpack/modules/masquerade/code/blood_hunt_skull.dm

@@ -25,7 +25,7 @@
 
 /obj/item/blood_hunt/examine(mob/user)
 	. = ..()
-	if(iskindred(user))
+	if(get_kindred_splat(user))
 		. += span_notice("This thaumaturgically-created artifact allows you to announce a Blood Hunt to the city.")
 		. += span_notice("It also allows you to pardon a kindred's masquerade violation by <b>interacting</b> with the kindred while holding the skull.")
 
@@ -74,7 +74,7 @@
 /obj/item/blood_hunt/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!ishuman(interacting_with))
 		return NONE
-	if(!iskindred(interacting_with))
+	if(!get_kindred_splat(interacting_with))
 		return ITEM_INTERACT_BLOCKING
 
 	to_chat(user, span_notice("You hold the [src] up to [interacting_with]..."))