Damage Coeff Change Standardization (vlggms#1326)

* Temporary Starting Commit

Changes "damage_coeff =" to "ChangeResistances("

Changes "Unmodified_Coeff" to "Unmodified_Damage_Coeff"

Returns the status check as opposed to the mod check

Adds ModifyResistances proc and fixing spelling error

Update damage_coeff_helper.dm

Entire Rework of how I've done this

Call this shit "Armor 2"

* Old Code Update

* code improvement

* God of Seasons update

* Updates damage_coeff checks with new Proc

* Deep Scanner Update

* linter fixes

* Converts current damage_coeff system to mimic armor

* Update _abnormality.dm

ModularTegustation/tegu_items/gadgets/unpowered.dm

@@ -143,7 +143,7 @@
 /obj/item/deepscanner/examine(mob/living/M)
 	. = ..()
 	if(deep_scan_log)
-		to_chat(M, "<span class='notice'>Previous Scan:[deep_scan_log].</span>")
+		to_chat(M, "<span class='notice'>Previous Scan:[deep_scan_log]</span>")
 
 /obj/item/deepscanner/attack(mob/living/M, mob/user)
 	user.visible_message("<span class='notice'>[user] takes a tool out of [src] and begins scanning [M].</span>", "<span class='notice'>You set down the deep scanner and begin scanning [M].</span>")
@@ -165,17 +165,22 @@
 			check1d = 1 - (H.getarmor(null, PALE_DAMAGE) / 100)
 		if(H.job)
 			check1e = H.job
-		to_chat(user, "<span class='notice'>[check1e] [H] [H.maxHealth] [check1a] [check1b] [check1c] [check1d].</span>")
 	else
 		var/mob/living/simple_animal/hostile/mon = M
 		if((mon.status_flags & GODMODE))
 			return
-		check1a = mon.damage_coeff[RED_DAMAGE]
-		check1b = mon.damage_coeff[WHITE_DAMAGE]
-		check1c = mon.damage_coeff[BLACK_DAMAGE]
-		check1d = mon.damage_coeff[PALE_DAMAGE]
-		to_chat(user, "<span class='notice'>[mon] [mon.maxHealth] [check1a] [check1b] [check1c] [check1d].</span>")
-		deep_scan_log = "[mon] [mon.maxHealth] [check1a] [check1b] [check1c] [check1d]"
+		check1a = mon.damage_coeff.getCoeff(RED_DAMAGE)
+		check1b = mon.damage_coeff.getCoeff(WHITE_DAMAGE)
+		check1c = mon.damage_coeff.getCoeff(BLACK_DAMAGE)
+		check1d = mon.damage_coeff.getCoeff(PALE_DAMAGE)
+		if(isabnormalitymob(mon))
+			var/mob/living/simple_animal/hostile/abnormality/abno = mon
+			check1e = THREAT_TO_NAME[abno.threat_level]
+		else
+			check1e = FALSE
+	var/output = "----------\n[check1e ? check1e+" " : ""][M]\nHP [M.health]/[M.maxHealth]\nR [check1a] W [check1b] B [check1c] P [check1d]\n----------"
+	to_chat(user, "<span class='notice'>[output]</span>")
+	deep_scan_log = output
 	playsound(get_turf(M), 'sound/misc/box_deploy.ogg', 5, 0, 3)
 
 

ModularTegustation/tegu_items/workshop/mods/curing.dm

@@ -9,8 +9,8 @@
 		var/heal_amt = T.force*0.04
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustSanityLoss(-heal_amt)

ModularTegustation/tegu_items/workshop/mods/healthup.dm

@@ -9,8 +9,8 @@
 		var/heal_amt = T.force*0.10
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustBruteLoss(-heal_amt)

ModularTegustation/tegu_items/workshop/mods/sapping.dm

@@ -9,8 +9,8 @@
 		var/heal_amt = T.force*0.10
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustSanityLoss(-heal_amt)

ModularTegustation/tegu_mobs/chaos_marine.dm

@@ -394,12 +394,12 @@
 	playsound(src, 'sound/magic/clockwork/narsie_attack.ogg', 200, TRUE)
 
 /mob/living/simple_animal/hostile/megafauna/chaos_marine/proc/cmempower()
-	damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.25, WHITE_DAMAGE = 2, BLACK_DAMAGE = 0.5, PALE_DAMAGE = 0.1)
+	ChangeResistances(list(RED_DAMAGE = 0.25, WHITE_DAMAGE = 2, BLACK_DAMAGE = 0.5, PALE_DAMAGE = 0.1))
 	add_atom_colour(newcolor, TEMPORARY_COLOUR_PRIORITY)
 	new /obj/effect/temp_visual/cult/sparks(get_turf(src))
 
 /mob/living/simple_animal/hostile/megafauna/chaos_marine/proc/cmdepower()
-	damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.5, WHITE_DAMAGE = 0, BLACK_DAMAGE = 1, PALE_DAMAGE = 0.2)
+	ChangeResistances(list(RED_DAMAGE = 0.5, WHITE_DAMAGE = 0, BLACK_DAMAGE = 1, PALE_DAMAGE = 0.2))
 	remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, newcolor)
 	new /obj/effect/temp_visual/cult/sparks(get_turf(src))
 

code/controllers/subsystem/lobotomy_events.dm

@@ -133,7 +133,7 @@ SUBSYSTEM_DEF(lobotomy_events)
 				A.density = FALSE // They ignore you and walk past you.
 				A.AIStatus = AI_OFF
 				A.can_patrol = FALSE
-				A.damage_coeff = list(BRUTE = 0, RED_DAMAGE = 0, WHITE_DAMAGE = 0, BLACK_DAMAGE = 0, PALE_DAMAGE = 0) // You can kill the portal but not them.
+				A.ChangeResistances(list(BRUTE = 0, RED_DAMAGE = 0, WHITE_DAMAGE = 0, BLACK_DAMAGE = 0, PALE_DAMAGE = 0)) // You can kill the portal but not them.
 			AB_types = list() // So the event can't run again.
 			return
 		if(YINYANG)

code/datums/status_effects/buffs.dm

@@ -513,33 +513,31 @@
 
 //LC13 AI entity Buffs
 	//Buff Maroon Ordeal Soldiers, Feel free to cannibalize and rework to work for other creatures.
+
 /datum/status_effect/all_armor_buff //due to multiplication the effect works more on entities that are weak to the damage value.
 	id = "all armor armor"
 	status_type = STATUS_EFFECT_UNIQUE
-	duration = 120 //6 seconds
+	duration = 120 //12 seconds
 	alert_type = null
 	var/visual
 
 /datum/status_effect/all_armor_buff/on_apply()
 	. = ..()
+	if(!isanimal(owner))
+		qdel(src)
+		return
 	visual = mutable_appearance('ModularTegustation/Teguicons/tegu_effects.dmi', "manager_shield")
-	if(isanimal(owner))
-		var/mob/living/simple_animal/M = owner
-		M.add_overlay(visual)
-		M.damage_coeff[RED_DAMAGE] *= 0.8 //20% damage decrease
-		M.damage_coeff[WHITE_DAMAGE] *= 0.8
-		M.damage_coeff[BLACK_DAMAGE] *= 0.8
-		M.damage_coeff[PALE_DAMAGE] *= 0.8
+	var/mob/living/simple_animal/M = owner
+	M.add_overlay(visual)
+	M.AddModifier(/datum/dc_change/maroon_buff)
 
 /datum/status_effect/all_armor_buff/on_remove()
 	. = ..()
 	if(isanimal(owner))
 		var/mob/living/simple_animal/M = owner
-		M.damage_coeff[RED_DAMAGE] /= 0.8
-		M.damage_coeff[WHITE_DAMAGE] /= 0.8
-		M.damage_coeff[BLACK_DAMAGE] /= 0.8
-		M.damage_coeff[PALE_DAMAGE] /= 0.8
-	owner.cut_overlay(visual)
+		M.RemoveModifier(/datum/dc_change/maroon_buff)
+	if(visual)
+		owner.cut_overlay(visual)
 
 
 /datum/status_effect/minor_damage_buff

code/datums/status_effects/debuffs.dm

@@ -1012,28 +1012,33 @@
 	owner.cut_overlay(statuseffectvisual)
 	return ..()
 
-/datum/status_effect/sunder_red
-	id = "sunder red armor"
+//update_stamina() is move_to_delay = (initial(move_to_delay) + (staminaloss * 0.06))
+// 100 stamina damage equals 6 additional move_to_delay. So 167*0.06 = 10.02
+
+/datum/status_effect/rend_red
+	id = "rend red armor"
 	status_type = STATUS_EFFECT_UNIQUE
-	duration = 60 //3 seconds
+	duration = 60 //6 seconds
 	alert_type = null
 
-/datum/status_effect/sunder_red/on_apply()
+/datum/status_effect/rend_red/on_apply()
 	. = ..()
-	if(isanimal(owner))
-		var/mob/living/simple_animal/M = owner
-		M.damage_coeff[RED_DAMAGE] *= 1.2
+	if(!isanimal(owner))
+		qdel(src)
+		return
+	var/mob/living/simple_animal/M = owner
+	M.AddModifier(/datum/dc_change/rend/red)
 //20% damage increase. Hitting any abnormality that has a negative value will cause this
 //to be a buff to their healing.
 
-/datum/status_effect/sunder_red/on_remove()
+/datum/status_effect/rend_red/on_remove()
 	. = ..()
 	if(isanimal(owner))
 		var/mob/living/simple_animal/M = owner
-		M.damage_coeff[RED_DAMAGE] /= 1.2
+		M.RemoveModifier(/datum/dc_change/rend/red)
 
-	//White Damage Debuff
 
+//White Damage Debuff
 /datum/status_effect/rend_white
 	id = "rend white armor"
 	status_type = STATUS_EFFECT_UNIQUE
@@ -1042,13 +1047,17 @@
 
 /datum/status_effect/rend_white/on_apply()
 	. = ..()
+	if(!isanimal(owner))
+		qdel(src)
+		return
 	var/mob/living/simple_animal/M = owner
-	M.damage_coeff[WHITE_DAMAGE] *= 1.2
+	M.AddModifier(/datum/dc_change/rend/white)
 
 /datum/status_effect/rend_white/on_remove()
 	. = ..()
-	var/mob/living/simple_animal/M = owner
-	M.damage_coeff[WHITE_DAMAGE] /= 1.2
+	if(isanimal(owner))
+		var/mob/living/simple_animal/M = owner
+		M.RemoveModifier(/datum/dc_change/rend/white)
 
 //Black Damage Debuff
 
@@ -1060,13 +1069,17 @@
 
 /datum/status_effect/rend_black/on_apply()
 	. = ..()
+	if(!isanimal(owner))
+		qdel(src)
+		return
 	var/mob/living/simple_animal/M = owner
-	M.damage_coeff[BLACK_DAMAGE] *= 1.2
+	M.AddModifier(/datum/dc_change/rend/black)
 
 /datum/status_effect/rend_black/on_remove()
 	. = ..()
-	var/mob/living/simple_animal/M = owner
-	M.damage_coeff[BLACK_DAMAGE] /= 1.2
+	if(isanimal(owner))
+		var/mob/living/simple_animal/M = owner
+		M.RemoveModifier(/datum/dc_change/rend/black)
 
 #undef CARBON_HALFSPEED
 

code/game/machinery/computer/manager_camera.dm

@@ -195,7 +195,7 @@
 		to_chat(user, "<span class='notice'>[clicked_atom]'s resistances are : </span>")
 		var/list/damage_types = list(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE)
 		for(var/i in damage_types)
-			var/resistance = SimpleResistanceToText(monster.damage_coeff[i])
+			var/resistance = SimpleResistanceToText(monster.damage_coeff.getCoeff(i))
 			if(isnull(resistance))
 				continue
 			to_chat(user, "<span class='notice'>[i]: [resistance].</span>")

code/game/objects/items/ego_weapons/aleph.dm

@@ -183,8 +183,8 @@
 		var/heal_amt = force*0.15
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustBruteLoss(-heal_amt)

code/game/objects/items/ego_weapons/non_abnormality/limbus_ego.dm

@@ -37,8 +37,8 @@
 		var/heal_amt = force*0.10
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustBruteLoss(-heal_amt)

code/game/objects/items/ego_weapons/non_abnormality/pierre.dm

@@ -20,8 +20,8 @@
 		var/heal_amt = force*0.2
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustBruteLoss(-heal_amt)

code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm

@@ -228,16 +228,9 @@
 		L.physiology.pale_mod *= 2
 		return
 	var/mob/living/simple_animal/M = owner
-	if(M.damage_coeff[RED_DAMAGE] > 0)
-		M.damage_coeff[RED_DAMAGE] *= 2
-	if(M.damage_coeff[WHITE_DAMAGE] > 0)
-		M.damage_coeff[WHITE_DAMAGE] *= 2
-	if(M.damage_coeff[BLACK_DAMAGE] > 0)
-		M.damage_coeff[BLACK_DAMAGE] *= 2
-	if(M.damage_coeff[PALE_DAMAGE] > 0)
-		M.damage_coeff[PALE_DAMAGE] *= 2
-
-/datum/status_effect/pt_lacerate/on_apply()
+	M.AddModifier(/datum/dc_change/lacerated)
+
+/datum/status_effect/pt_lacerate/on_remove()
 	. = ..()
 	if(ishuman(owner))
 		var/mob/living/carbon/human/L = owner
@@ -248,14 +241,7 @@
 		L.physiology.pale_mod /= 2
 		return
 	var/mob/living/simple_animal/M = owner
-	if(M.damage_coeff[RED_DAMAGE] > 0)
-		M.damage_coeff[RED_DAMAGE] /= 2
-	if(M.damage_coeff[WHITE_DAMAGE] > 0)
-		M.damage_coeff[WHITE_DAMAGE] /= 2
-	if(M.damage_coeff[BLACK_DAMAGE] > 0)
-		M.damage_coeff[BLACK_DAMAGE] /= 2
-	if(M.damage_coeff[PALE_DAMAGE] > 0)
-		M.damage_coeff[PALE_DAMAGE] /= 2
+	M.RemoveModifier(/datum/dc_change/lacerated)
 
 // Slow black damage with a buff attack
 /obj/item/ego_weapon/city/pt/blunt
@@ -314,7 +300,7 @@
 		L.physiology.pale_mod /= 2
 		return
 
-/datum/status_effect/pt_lacerate/on_apply()
+/datum/status_effect/pt_defense/on_remove()
 	. = ..()
 	if(ishuman(owner))
 		var/mob/living/carbon/human/L = owner

code/game/objects/items/ego_weapons/non_abnormality/wcorp.dm

@@ -223,29 +223,13 @@
 	..()
 	sleep(5)
 	target.apply_damage(force*2, damtype, null, target.run_armor_check(null, damtype), spread_damage = TRUE)
-	target.apply_status_effect(/datum/status_effect/rendBlackArmor)
+	target.apply_status_effect(/datum/status_effect/rend_black/w_corp)
 	playsound(src, 'sound/abnormalities/thunderbird/tbird_bolt.ogg', 50, TRUE)
 	var/turf/T = get_turf(target)
 	new /obj/effect/temp_visual/justitia_effect(T)
 
-/datum/status_effect/rendBlackArmor
-	id = "rend Black armor"
-	status_type = STATUS_EFFECT_UNIQUE
-	duration = 50 //5 seconds since it's melee-ish
-	alert_type = null
-
-/datum/status_effect/rendBlackArmor/on_apply()
-	. = ..()
-	if(isanimal(owner))
-		var/mob/living/simple_animal/M = owner
-		M.damage_coeff[BLACK_DAMAGE] *= 1.2
-
-/datum/status_effect/rendBlackArmor/on_remove()
-	. = ..()
-	if(isanimal(owner))
-		var/mob/living/simple_animal/M = owner
-		M.damage_coeff[BLACK_DAMAGE] /= 1.2
-
+/datum/status_effect/rend_black/w_corp // Duplicate of "rend_black", giving it a unique id so it can stack.
+	id = "w-corp rend black armor"
 
 //Type C weapons
 

code/game/objects/items/ego_weapons/special.dm

@@ -35,7 +35,7 @@
 		icon_state = "eyeball2"				// Cool sprite
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] <= 0)
+			if(S.damage_coeff.getCoeff(damtype) <= 0)
 				resistance = 100
 		if(resistance >= 100) // If the eyeball wielder is going no-balls and using one fucking weapon, let's throw them a bone.
 			force *= 0.1

code/game/objects/items/ego_weapons/waw.dm

@@ -971,8 +971,8 @@
 		var/heal_amt = force*0.10
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		user.adjustBruteLoss(-heal_amt)
@@ -1593,8 +1593,8 @@
 		var/heal_amt = force*0.05
 		if(isanimal(target))
 			var/mob/living/simple_animal/S = target
-			if(S.damage_coeff[damtype] > 0)
-				heal_amt *= S.damage_coeff[damtype]
+			if(S.damage_coeff.getCoeff(damtype) > 0)
+				heal_amt *= S.damage_coeff.getCoeff(damtype)
 			else
 				heal_amt = 0
 		amount_filled = clamp(amount_filled + heal_amt, 0, amount_max)