Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DNM] Temporarily disable blood drying to get rid of massive FPS drops #4389

Closed
wants to merge 1 commit into from
Closed

[DNM] Temporarily disable blood drying to get rid of massive FPS drops #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions code/game/objects/effects/decals/cleanable/humans.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
bloodiness = BLOOD_AMOUNT_PER_DECAL
color = COLOR_BLOOD
appearance_flags = parent_type::appearance_flags | KEEP_TOGETHER

/// Can this blood dry out?
var/can_dry = TRUE
/*
/// Is this blood dried out?
var/dried = FALSE
*/

/// The "base name" of the blood, IE the "pool of" in "pool of blood"
var/base_name = "pool of"
Expand All @@ -26,6 +29,7 @@

/// How long it takes to dry out
var/drying_time = 5 MINUTES
/*
/// The process to drying out, recorded in deciseconds
var/drying_progress = 0
/// Color matrix applied to dried blood via filter to make it look dried
Expand All @@ -36,11 +40,13 @@
0, 0, 0, 1,
-0.5, -0.75, -0.75, 0,
)
*/
var/count = 0
var/footprint_sprite = null
var/glows = FALSE
var/handles_unique = FALSE

/* blood drying is laggy af currently, removing it until it's re-implemented in a less laggy way
/obj/effect/decal/cleanable/blood/Initialize(mapload, blood_color = COLOR_BLOOD)
. = ..()
START_PROCESSING(SSblood_drying, src)
Expand All @@ -57,12 +63,6 @@
return ..()

#define DRY_FILTER_KEY "dry_effect"

/obj/effect/decal/cleanable/blood/update_overlays()
. = ..()
if(glows && !handles_unique)
. += emissive_appearance(icon, icon_state, src)

/obj/effect/decal/cleanable/blood/proc/update_blood_drying_effect()
if(!can_dry)
remove_filter(DRY_FILTER_KEY) // I GUESS
Expand All @@ -83,6 +83,12 @@
transition_filter(DRY_FILTER_KEY, color_matrix_filter(blood_dry_filter_matrix), drying_time - drying_progress)

#undef DRY_FILTER_KEY
*/

/obj/effect/decal/cleanable/blood/update_overlays()
. = ..()
if(glows && !handles_unique)
. += emissive_appearance(icon, icon_state, src)

/obj/effect/decal/cleanable/blood/proc/get_blood_string()
var/list/all_dna = GET_ATOM_BLOOD_DNA(src)
Expand All @@ -95,6 +101,7 @@
all_blood_names |= lowertext(initial(blood.reagent_type.name))
return english_list(all_blood_names, nothing_text = "blood")

/*
/obj/effect/decal/cleanable/blood/process(seconds_per_tick)
if(dried || !can_dry)
return PROCESS_KILL
Expand All @@ -103,12 +110,14 @@
drying_progress += (seconds_per_tick * 1 SECONDS)
if(drying_progress >= drying_time + SSblood_drying.wait) // Do it next tick when we're done
dry()
*/

/obj/effect/decal/cleanable/blood/update_name(updates)
. = ..()
name = initial(name)
if(base_name)
name = "[base_name] [get_blood_string()]"
/*
if(dried && dry_prefix)
name = "[dry_prefix] [name]"

Expand All @@ -126,6 +135,7 @@
update_blood_drying_effect()
STOP_PROCESSING(SSblood_drying, src)
return TRUE
*/

/obj/effect/decal/cleanable/blood/lazy_init_reagents()
var/list/all_dna = GET_ATOM_BLOOD_DNA(src)
Expand All @@ -138,17 +148,21 @@
for(var/reagent_type in reagents_to_add)
reagents.add_reagent(reagent_type, round((bloodiness * 0.2 * BLOOD_PER_UNIT_MODIFIER) / num_reagents, CHEMICAL_VOLUME_ROUNDING))

/*
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/merger)
if(merger.dried) // New blood will lie on dry blood
return FALSE
return ..()
*/

/obj/effect/decal/cleanable/blood/handle_merge_decal(obj/effect/decal/cleanable/blood/merger)
. = ..()
merger.add_blood_DNA(GET_ATOM_BLOOD_DNA(src))
merger.adjust_bloodiness(bloodiness)
/*
merger.drying_progress -= (bloodiness * BLOOD_PER_UNIT_MODIFIER) // goes negative = takes longer to dry
merger.update_blood_drying_effect()
*/

/obj/effect/decal/cleanable/blood/old
bloodiness = 0
Expand All @@ -157,7 +171,7 @@
/obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
add_blood_DNA(list("UNKNOWN DNA" = random_human_blood_type()))
. = ..()
dry()
// dry()

/obj/effect/decal/cleanable/blood/splatter
icon_state = "gibbl1"
Expand Down Expand Up @@ -221,11 +235,13 @@
/obj/effect/decal/cleanable/blood/gibs/replace_decal(obj/effect/decal/cleanable/C)
return FALSE //Never fail to place us

/*
/obj/effect/decal/cleanable/blood/gibs/dry()
. = ..()
if(!.)
return
AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7)
*/

/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return FALSE
Expand Down Expand Up @@ -307,7 +323,7 @@
. = ..()
setDir(pick(GLOB.cardinals))
AddElement(/datum/element/swabable, CELL_LINE_TABLE_SLUDGE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 10)
dry()
// dry()

/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
Expand Down
14 changes: 10 additions & 4 deletions monkestation/code/modules/blood_datum/blood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// Global list of all blood type singletons (Assoc [type] - [/datum/blood_type singleton])
GLOBAL_LIST_INIT_TYPED(blood_types, /datum/blood_type, init_subtypes_w_path_keys(/datum/blood_type))

/*
/**
* Blood Drying SS
*
Expand All @@ -11,6 +12,7 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
flags = SS_NO_INIT | SS_BACKGROUND
priority = 10
wait = 10 SECONDS
*/

/// Takes the name of a blood type and return the typepath
/proc/blood_name_to_blood_type(name)
Expand Down Expand Up @@ -115,8 +117,10 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
var/obj/effect/decal/cleanable/blood/splatter = locate() in blood_turf
if(!QDELETED(splatter))
splatter.adjust_bloodiness(new_blood)
/*
splatter.drying_progress -= (new_blood * BLOOD_PER_UNIT_MODIFIER)
splatter.update_blood_drying_effect()
*/
splatter.transfer_mob_blood_dna(bleeding)
return splatter

Expand All @@ -135,9 +139,9 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
drop.add_overlay(drop_overlay)
// Handle adding blood to the base atom
drop.adjust_bloodiness(new_blood)
drop.drying_progress -= (new_blood * BLOOD_PER_UNIT_MODIFIER)
// drop.drying_progress -= (new_blood * BLOOD_PER_UNIT_MODIFIER)
drop.transfer_mob_blood_dna(bleeding)
drop.update_blood_drying_effect()
// drop.update_blood_drying_effect()
return drop

temp_blood_DNA = GET_ATOM_BLOOD_DNA(drop) //we transfer the dna from the drip to the splatter
Expand All @@ -151,8 +155,10 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
return null
else
splatter.adjust_bloodiness(BLOOD_AMOUNT_PER_DECAL)
/*
splatter.drying_progress -= (BLOOD_AMOUNT_PER_DECAL * BLOOD_PER_UNIT_MODIFIER)
splatter.update_blood_drying_effect()
*/
splatter.transfer_mob_blood_dna(bleeding) //give blood info to the blood decal.
if(temp_blood_DNA)
splatter.add_blood_DNA(temp_blood_DNA)
Expand Down Expand Up @@ -252,7 +258,7 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
if(!new_splat)
return
blood.can_dry = FALSE
blood.update_blood_drying_effect()
// blood.update_blood_drying_effect()
RegisterSignals(blood, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACKBY_SECONDARY), PROC_REF(on_cleaned))

/datum/blood_type/crew/ethereal/proc/on_cleaned(obj/effect/decal/cleanable/source, mob/living/user, obj/item/tool, ...)
Expand Down Expand Up @@ -285,7 +291,7 @@ PROCESSING_SUBSYSTEM_DEF(blood_drying)
return
// Oil blood will never dry and can be ignited with fire
blood.can_dry = FALSE
blood.update_blood_drying_effect()
// blood.update_blood_drying_effect()
blood.AddElement(/datum/element/easy_ignite)

/// A universal blood type which accepts everything
Expand Down
Loading