Optmizes handle_mutations_and_radiation

Saving about 90% CPU power on blank humanoids
This commit is contained in:
joep van der velden
2021-05-06 22:36:51 +02:00
parent d4a6a4bcc8
commit dbb153339f
7 changed files with 25 additions and 27 deletions
+1 -5
View File
@@ -32,7 +32,7 @@
var/mutation_active = M.dna.GetSEState(mutation.block)
// Sanity checks, don't skip.
if(!mutation.can_activate(M, flags) && mutation_active)
if(mutation_active && !mutation.can_activate(M, flags))
//testing("[M] - Failed to activate [gene.name] (can_activate fail).")
return FALSE
@@ -46,11 +46,7 @@
if(mutation_active)
//testing("[gene.name] activated!")
mutation.activate(M)
if(M)
M.active_mutations |= mutation.type
// If Gene is NOT active:
else
//testing("[gene.name] deactivated!")
mutation.deactivate(M)
if(M)
M.active_mutations -= mutation.type
+2
View File
@@ -32,6 +32,7 @@
// Called when the gene activates. Do your magic here.
/datum/mutation/proc/activate(mob/living/M)
M.gene_stability -= instability
M.active_mutations |= type // |= is probably not required but just in case
for(var/thing in traits_to_add)
ADD_TRAIT(M, thing, GENETIC_MUTATION)
if(length(activation_messages))
@@ -43,6 +44,7 @@
// Only called when the block is deactivated.
/datum/mutation/proc/deactivate(mob/living/M)
M.gene_stability += instability
M.active_mutations -= type
for(var/thing in traits_to_add)
REMOVE_TRAIT(M, thing, GENETIC_MUTATION)
if(length(deactivation_messages))
+7 -4
View File
@@ -114,18 +114,21 @@
if(G.block)
if(G.block in blocks_assigned)
warning("DNA2: Gene [G.name] trying to use already-assigned block [G.block] (used by [english_list(blocks_assigned[G.block])])")
GLOB.dna_mutations.Add(G)
GLOB.dna_mutations[mutation_type] = G
var/list/assignedToBlock[0]
if(blocks_assigned[G.block])
assignedToBlock=blocks_assigned[G.block]
assignedToBlock = blocks_assigned[G.block]
assignedToBlock.Add(G.name)
blocks_assigned[G.block]=assignedToBlock
blocks_assigned[G.block] = assignedToBlock
//testing("DNA2: Gene [G.name] assigned to block [G.block].")
else
qdel(G)
// I WILL HAVE A LIST OF MUTATIONS THAT MATCHES THE RANDOMIZED BLOCKS GODDAMNIT!
for(var/block in 1 to DNA_SE_LENGTH)
var/name = GLOB.assigned_blocks[block]
for(var/datum/mutation/mutation in GLOB.dna_mutations)
for(var/mutation_type in GLOB.dna_mutations)
var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
if(mutation.name == name || mutation.block == block)
if(mutation.block in GLOB.assigned_mutation_blocks)
warning("DNA2: Mutation [mutation.name] trying to add to already assigned gene block list (used by [english_list(GLOB.assigned_mutation_blocks[block])])")
+4 -5
View File
@@ -170,11 +170,10 @@
emote("drool")
/mob/living/carbon/human/handle_mutations_and_radiation()
for(var/datum/mutation/mutation in GLOB.dna_mutations)
if(!mutation.block)
continue
if(mutation.is_active(src))
mutation.on_life(src)
for(var/mutation_type in active_mutations)
var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
mutation.on_life(src)
if(!ignore_gene_stability && gene_stability < GENETIC_DAMAGE_STAGE_1)
var/instability = DEFAULT_GENE_STABILITY - gene_stability
if(prob(instability * 0.1))
+3 -5
View File
@@ -152,11 +152,9 @@
verb = pick("whinnies", "neighs", "says")
if(dna)
for(var/datum/mutation/mutation in GLOB.dna_mutations)
if(!mutation.block)
continue
if(mutation.is_active(src))
S.message = mutation.on_say(src, S.message)
for(var/mutation_type in active_mutations)
var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
S.message = mutation.on_say(src, S.message)
var/braindam = getBrainLoss()
if(braindam >= 60)
@@ -450,14 +450,13 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(gender == FEMALE)
g = "f"
// DNA2 - Drawing underlays.
for(var/datum/mutation/mutation in GLOB.dna_mutations)
if(!mutation.block)
continue
if(mutation.is_active(src))
var/underlay = mutation.on_draw_underlays(src, g)
if(underlay)
standing.underlays += underlay
add_image = 1
for(var/mutation_type in active_mutations)
var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
var/underlay = mutation.on_draw_underlays(src, g)
if(underlay)
standing.underlays += underlay
add_image = TRUE
if(HAS_TRAIT(src, TRAIT_LASEREYES))
standing.overlays += "lasereyes_s"
add_image = 1
+1
View File
@@ -174,6 +174,7 @@
var/stance_damage = 0 //Whether this mob's ability to stand has been affected
/// List of the active mutation types
var/list/active_mutations = list()
var/last_movement = -100 // Last world.time the mob actually moved of its own accord.