regexes damage to damage_force on projectiles (#6734)

for clarity and standardization purposes; it's this way on /item
Citadel-Station-13 · Sep 8, 2024 · faa9eab · faa9eab
1 parent 5e57d4e
commit faa9eab
Show file tree

Hide file tree

Showing 75 changed files with 300 additions and 300 deletions.
diff --git a/code/datums/components/mobs/parry_frame.dm b/code/datums/components/mobs/parry_frame.dm
@@ -413,7 +413,7 @@
 	. = shieldcall_returns
 	// todo: doesn't take into account any damage randomization
 	var/obj/projectile/proj = bullet_act_args[BULLET_ACT_ARG_PROJECTILE]
-	var/estimated_severity = clamp(proj.damage / 20 * 75, 0, 100)
+	var/estimated_severity = clamp(proj.damage_force / 20 * 75, 0, 100)
 	bullet_act_args[BULLET_ACT_ARG_EFFICIENCY] = bullet_act_args[BULLET_ACT_ARG_EFFICIENCY] * clamp(1 - efficiency, 0, 1)
 	. = perform_aftereffects(defending, ATTACK_TYPE_PROJECTILE, efficiency, proj, .)
 	perform_audiovisuals(defending, ATTACK_TYPE_PROJECTILE, efficiency, proj, ., estimated_severity, proj, tool_text)

diff --git a/code/game/content/factions/corporations/nanotrasen/items/guns/pulse.dm b/code/game/content/factions/corporations/nanotrasen/items/guns/pulse.dm
@@ -103,7 +103,7 @@
 	name = "pulse"
 	icon_state = "u_laser"
 	fire_sound = 'sound/weapons/gauss_shoot.ogg'
-	damage = 60
+	damage_force = 60
 	damage_tier = LASER_TIER_EXTREME
 	armor_penetration = 75
 	light_color = "#0066FF"
@@ -113,5 +113,5 @@
 	impact_type = /obj/effect/projectile/impact/laser_pulse
 
 /obj/projectile/beam/pulse/shotgun
-	damage = 50
+	damage_force = 50
 	armor_penetration = 25
diff --git a/code/game/content/factions/orion/iwl/guns.dm b/code/game/content/factions/orion/iwl/guns.dm
@@ -49,4 +49,4 @@
 // 	projectile_type = /obj/projectile/bullet/rifle/s72
 
 // /obj/projectile/bullet/rifle/s72
-// 	damage = 35
+// 	damage_force = 35
diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm
@@ -569,7 +569,7 @@
 	name = "inversion beam"
 	icon_state = "invert"
 	fire_sound = 'sound/weapons/spiderlunge.ogg'
-	damage = 15
+	damage_force = 15
 	damage_type = BURN
 	damage_flag = ARMOR_LASER
 	armor_penetration = 60

diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm
@@ -82,7 +82,7 @@
 		if(P.agony)
 			var/agony_blocked = P.agony * (modified_block_percentage / 100)
 			P.agony -= agony_blocked
-		P.damage = P.damage - damage_blocked
+		P.damage_force = P.damage_force - damage_blocked
 
 	user.visible_message("<span class='danger'>\The [user]'s [src] absorbs the attack!</span>")
 	to_chat(user, "<span class='warning'>Your shield has absorbed most of \the [damage_source].</span>")

diff --git a/code/game/gamemodes/technomancer/spells/projectile/beam.dm b/code/game/gamemodes/technomancer/spells/projectile/beam.dm
@@ -20,7 +20,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 
 /obj/projectile/beam/blue
-	damage = 30
+	damage_force = 30
 
 	muzzle_type = /obj/effect/projectile/muzzle/laser_blue
 	tracer_type = /obj/effect/projectile/tracer/laser_blue

diff --git a/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm b/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm
@@ -22,6 +22,6 @@
 /obj/projectile/force_missile
 	name = "force missile"
 	icon_state = "force_missile"
-	damage = 25
+	damage_force = 25
 	damage_type = BRUTE
 	damage_flag = ARMOR_MELEE
diff --git a/code/game/gamemodes/technomancer/spells/projectile/overload.dm b/code/game/gamemodes/technomancer/spells/projectile/overload.dm
@@ -32,10 +32,10 @@
 	var/obj/projectile/overload/P = new projectile_type(get_turf(user))
 	var/energy_before_firing = core.energy
 	if(check_for_scepter())
-		P.damage = round(energy_before_firing * 0.004) // .4% of their current energy pool.
+		P.damage_force = round(energy_before_firing * 0.004) // .4% of their current energy pool.
 	else
-		P.damage = round(energy_before_firing * 0.003) // .3% of their current energy pool.
-	P.damage = min(calculate_spell_power(P.damage), 80)
+		P.damage_force = round(energy_before_firing * 0.003) // .3% of their current energy pool.
+	P.damage_force = min(calculate_spell_power(P.damage_force), 80)
 	return P
 
 /obj/item/spell/projectile/overload/on_ranged_cast(atom/hit_atom, mob/living/user)

diff --git a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm
@@ -23,7 +23,7 @@
 
 /obj/item/spell/projectile/proc/make_projectile(obj/projectile/projectile_type, mob/living/user)
 	var/obj/projectile/P = new projectile_type(get_turf(user))
-	P.damage = calculate_spell_power(P.damage)
+	P.damage_force = calculate_spell_power(P.damage_force)
 	return P
 
 /obj/item/spell/projectile/proc/set_up(atom/hit_atom, mob/living/user)

diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm
@@ -70,7 +70,7 @@
 			P.legacy_redirect(P.starting.x, P.starting.y, curloc, user)
 			P.reflected = 1
 			if(check_for_scepter())
-				P.damage = P.damage * 1.5
+				P.damage_force = P.damage_force * 1.5
 
 			spark_system.start()
 			playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)

diff --git a/code/game/objects/items/shield/types/transforming/energy.dm b/code/game/objects/items/shield/types/transforming/energy.dm
@@ -43,8 +43,8 @@
 	if(istype(weapon, /obj/projectile))
 		var/obj/projectile/casted_projectile = weapon
 		if(legacy_projectile_damage_drop)
-			if((is_sharp(casted_projectile) && casted_projectile.damage > 10) || (casted_projectile.projectile_type & PROJECTILE_TYPE_BEAM))
-				if(prob(casted_projectile.damage / legacy_projectile_damage_drop_divisor))
+			if((is_sharp(casted_projectile) && casted_projectile.damage_force > 10) || (casted_projectile.projectile_type & PROJECTILE_TYPE_BEAM))
+				if(prob(casted_projectile.damage_force / legacy_projectile_damage_drop_divisor))
 					return // drop the shield
 	. = ..()
 	if(!.)

diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
@@ -90,7 +90,7 @@
 
 	if( virtualIcon.GetPixel(p_x, p_y) ) // if the located pixel isn't blank (null)
 
-		hp -= proj.damage
+		hp -= proj.damage_force
 		if(hp <= 0)
 			for(var/mob/O in oviewers())
 				if ((O.client && !( O.has_status_effect(/datum/status_effect/sight/blindness) )))
@@ -111,7 +111,7 @@
 			bmark.pixel_x--
 			bmark.pixel_y--
 
-			if(proj.damage >= 20 || istype(proj, /obj/projectile/beam/practice))
+			if(proj.damage_force >= 20 || istype(proj, /obj/projectile/beam/practice))
 				bmark.icon_state = "scorch"
 				bmark.setDir(pick(NORTH,SOUTH,EAST,WEST)) // random scorch design
 
@@ -123,12 +123,12 @@
 			// Bullets are hard. They make dents!
 			bmark.icon_state = "dent"
 
-		if(proj.damage >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes
+		if(proj.damage_force >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes
 			if(decaltype == 2) // bullet
-				if(prob(proj.damage+30)) // bullets make holes more commonly!
+				if(prob(proj.damage_force+30)) // bullets make holes more commonly!
 					new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole
 			else // Lasers!
-				if(prob(proj.damage-10)) // lasers make holes less commonly
+				if(prob(proj.damage_force-10)) // lasers make holes less commonly
 					new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole
 
 		// draw bullet holes

diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
@@ -265,7 +265,7 @@
 	if(!(proj.damage_type == BRUTE || proj.damage_type == BURN))
 		return ..()
 
-	if(locked && tamper_proof && integrity <= proj.damage)
+	if(locked && tamper_proof && integrity <= proj.damage_force)
 		if(tamper_proof == 2) // Mainly used for events to prevent any chance of opening the box improperly.
 			visible_message("<font color='red'><b>The anti-tamper mechanism of [src] triggers an explosion!</b></font>")
 			var/turf/T = get_turf(src.loc)

diff --git a/code/game/objects/structures/props/projectile_lock.dm b/code/game/objects/structures/props/projectile_lock.dm
@@ -48,7 +48,7 @@
 	if(timing)
 		return PROJECTILE_IMPACT_DELETE
 
-	if(istype(proj, /obj/projectile/beam/heavylaser/cannon) || istype(proj, /obj/projectile/beam/emitter) || (proj.damage >= 80 && proj.damtype == BURN))
+	if(istype(proj, /obj/projectile/beam/heavylaser/cannon) || istype(proj, /obj/projectile/beam/emitter) || (proj.damage_force >= 80 && proj.damtype == BURN))
 		toggle_lock()
 		visible_message("<span class='notice'>\The [src] [enabled ? "disengages" : "engages"] its locking mechanism.</span>")
 

diff --git a/code/game/turfs/simulated/wall/wall-defense.dm b/code/game/turfs/simulated/wall/wall-defense.dm
@@ -85,9 +85,9 @@
 		return ..()
 
 	//! legacy code handling
-	if((proj.projectile_type & (PROJECTILE_TYPE_ENERGY | PROJECTILE_TYPE_BEAM)) && !proj.nodamage && proj.damage)
+	if((proj.projectile_type & (PROJECTILE_TYPE_ENERGY | PROJECTILE_TYPE_BEAM)) && !proj.nodamage && proj.damage_force)
 		burn(2500)
-	if(proj.damage_type == BURN && proj.damage && !proj.nodamage)
+	if(proj.damage_type == BURN && proj.damage_force && !proj.nodamage)
 		if(thermite)
 			thermitemelt()
 	if(proj.ricochet_sounds && prob(15))

diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
@@ -54,7 +54,7 @@
 			else
 				to_chat(user, "<span class='warning'>DPS calculation by this verb is not supported for \the [G]'s type. Energy or Ballistic only, sorry.</span>")
 
-			weapon_damage = P.damage
+			weapon_damage = P.damage_force
 			weapon_attack_speed = G.fire_delay / 10
 			qdel(P)
 

diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
@@ -307,7 +307,7 @@
 	name = "destabilizing force"
 	icon_state = "pulse1"
 	nodamage = TRUE
-	damage = 0 //We're just here to mark people. This is still a melee weapon.
+	damage_force = 0 //We're just here to mark people. This is still a melee weapon.
 	damage_type = BRUTE
 	damage_flag = ARMOR_BOMB
 	range = WORLD_ICON_SIZE * 6

diff --git a/code/modules/mob/living/carbon/human/human-defense.dm b/code/modules/mob/living/carbon/human/human-defense.dm
@@ -15,13 +15,13 @@
 	var/obj/item/organ/external/organ = get_organ()
 
 	if(!proj.nodamage)
-		organ.add_autopsy_data("[proj.name]", proj.damage)
+		organ.add_autopsy_data("[proj.name]", proj.damage_force)
 
 	//Shrapnel
 	if(proj.can_embed())
 		var/armor = getarmor_organ(organ, "bullet")
 		if(!prob(armor/2))		//Even if the armor doesn't stop the bullet from hurting you, it might stop it from embedding.
-			var/hit_embed_chance = proj.embed_chance + (proj.damage - armor)	//More damage equals more chance to embed
+			var/hit_embed_chance = proj.embed_chance + (proj.damage_force - armor)	//More damage equals more chance to embed
 			if(prob(max(hit_embed_chance, 0)))
 				var/obj/item/material/shard/shrapnel/SP = new()
 				SP.name = (proj.name != "shrapnel")? "[proj.name] shrapnel" : "shrapnel"

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
@@ -538,7 +538,7 @@
 	if(. & PROJECTILE_IMPACT_FLAGS_UNCONDITIONAL_ABORT)
 		return
 	// todo: why is this in bullet act and not where we take damage maybe?
-	if(prob(75) && proj.damage > 0)
+	if(prob(75) && proj.damage_force > 0)
 		spark_system.start()
 
 /mob/living/silicon/robot/attackby(obj/item/W as obj, mob/user as mob)

diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm
@@ -281,10 +281,10 @@
 	..()
 
 /obj/projectile/beam/drone
-	damage = 15
+	damage_force = 15
 
 /obj/projectile/beam/pulse/drone
-	damage = 10
+	damage_force = 10
 
 // A slightly easier drone, for POIs.
 // Difference is that it should not be faster than you.

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/combat_drone.dm
@@ -81,7 +81,7 @@
 	return TRUE
 
 /obj/projectile/beam/drone
-	damage = 10
+	damage_force = 10
 
 /obj/item/shield_projector/rectangle/automatic/drone
 	shield_health = 150

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror/cyber_horror.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror/cyber_horror.dm
@@ -323,7 +323,7 @@
 /obj/projectile/arc/blue_energy
 	name = "energy missle"
 	icon_state = "force_missile"
-	damage = 12
+	damage_force = 12
 	damage_type = BURN
 
 //Direct Ranged Mob
@@ -389,11 +389,11 @@
 
 //These are the projectiles mobs use
 /obj/projectile/beam/drone
-	damage = 3
+	damage_force = 3
 /obj/projectile/arc/blue_energy
 	name = "energy missle"
 	icon_state = "force_missile"
-	damage = 12
+	damage_force = 12
 	damage_type = BURN
 
 //Boss Mob - The High Priest
@@ -430,7 +430,7 @@
 /obj/projectile/arc/blue_energy/priest
 	name = "nanite cloud"
 	icon_state = "particle-heavy"
-	damage = 15
+	damage_force = 15
 	damage_type = BRUTE
 
 /obj/projectile/arc/blue_energy/priest/on_impact(atom/target, impact_flags, def_zone, efficiency)

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
@@ -54,7 +54,7 @@
 
 // The hivebot's default projectile.
 /obj/projectile/bullet/hivebot
-	damage = 10
+	damage_force = 10
 	damage_type = BRUTE
 	sharp = FALSE
 	edge = FALSE

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
@@ -87,7 +87,7 @@
 	icon_state = "explosion_particle"
 	modifier_type_to_apply = /datum/modifier/fire
 	modifier_duration = 6 SECONDS // About 15 damage per stack, as Life() ticks every two seconds.
-	damage = 0
+	damage_force = 0
 	nodamage = TRUE
 
 
@@ -125,7 +125,7 @@
 /obj/projectile/arc/blue_energy
 	name = "energy missile"
 	icon_state = "force_missile"
-	damage = 15 // A bit stronger since arcing projectiles are much easier to avoid than traditional ones.
+	damage_force = 15 // A bit stronger since arcing projectiles are much easier to avoid than traditional ones.
 	damage_type = BURN
 
 // Very long ranged hivebot that rains down hell.
@@ -249,7 +249,7 @@
 
 
 /obj/projectile/beam/smalllaser/hivebot
-	damage = 25
+	damage_force = 25
 	agony = 20
 	muzzle_type = /obj/effect/projectile/muzzle/lightning
 	tracer_type = /obj/effect/projectile/tracer/lightning
@@ -273,5 +273,5 @@
 
 
 /obj/projectile/beam/cyan/hivebot
-	damage = 45
+	damage_force = 45
 	armor_penetration = 15
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm
@@ -121,7 +121,7 @@
 /obj/projectile/energy/homing_bolt
 	name = "homing bolt"
 	icon_state = "force_missile"
-	damage = 20
+	damage_force = 20
 	damage_type = BURN
 	damage_flag = ARMOR_LASER
 	speed = 5 * WORLD_ICON_SIZE

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm
@@ -64,7 +64,7 @@
 /obj/projectile/fake_syringe
 	name = "syringe"
 	icon_state = "syringe"
-	damage = 5 // Getting hit with a launched syringe probably hurts, and makes it at least slightly relevant against synthetics.
+	damage_force = 5 // Getting hit with a launched syringe probably hurts, and makes it at least slightly relevant against synthetics.
 	var/piercing = FALSE // If true, ignores thick material.
 
 /obj/projectile/fake_syringe/on_impact(atom/target, impact_flags, def_zone, efficiency)

diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
@@ -64,11 +64,11 @@
 	AddComponent(/datum/component/horror_aura/strong)
 
 /mob/living/simple_mob/construct/juggernaut/on_bullet_act(obj/projectile/proj, impact_flags, list/bullet_act_args)
-	var/reflectchance = 80 - round(proj.damage/3)
+	var/reflectchance = 80 - round(proj.damage_force/3)
 	if(prob(reflectchance) && !istype(src, /mob/living/simple_mob/construct/juggernaut/behemoth))
 		var/damage_mod = rand(2,4)
 		var/projectile_dam_type = proj.damage_type
-		var/incoming_damage = (round(proj.damage / damage_mod) - (round((proj.damage / damage_mod) * 0.3)))
+		var/incoming_damage = (round(proj.damage_force / damage_mod) - (round((proj.damage_force / damage_mod) * 0.3)))
 		var/armorcheck = run_armor_check(null, proj.damage_flag)
 		var/soakedcheck = get_armor_soak(null, proj.damage_flag)
 		if(!(istype(proj, /obj/projectile/energy) || istype(proj, /obj/projectile/beam)))
@@ -84,7 +84,7 @@
 			visible_message("<span class='danger'>The [proj.name] gets reflected by [src]'s shell!</span>", \
 						"<span class='userdanger'>The [proj.name] gets reflected by [src]'s shell!</span>")
 			damage_mod = rand(3,5)
-			incoming_damage = (round(proj.damage / damage_mod) - (round((proj.damage / damage_mod) * 0.3)))
+			incoming_damage = (round(proj.damage_force / damage_mod) - (round((proj.damage_force / damage_mod) * 0.3)))
 			if(!(proj.damage_type == BRUTE || proj.damage_type == BURN))
 				projectile_dam_type = BURN
 				incoming_damage = round(incoming_damage / 4) //Damage from strange sources is converted to burn for energy-type projectiles, though severely decreased.
@@ -138,7 +138,7 @@
 							)
 
 /mob/living/simple_mob/construct/juggernaut/behemoth/on_bullet_act(obj/projectile/proj, impact_flags, list/bullet_act_args)
-	var/reflectchance = 80 - round(proj.damage/3)
+	var/reflectchance = 80 - round(proj.damage_force/3)
 	if(prob(reflectchance))
 		visible_message("<span class='danger'>The [proj.name] gets reflected by [src]'s shell!</span>", \
 						"<span class='userdanger'>The [proj.name] gets reflected by [src]'s shell!</span>")

diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm b/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm
@@ -64,7 +64,7 @@
 /obj/projectile/icicle
 	name = "icicle"
 	icon_state = "ice_2"
-	damage = 40
+	damage_force = 40
 	damage_type = BRUTE
 	damage_flag = ARMOR_MELEE
 	armor_penetration = 30
@@ -80,7 +80,7 @@
 	playsound(get_turf(target), "shatter", 70, 1)
 
 /obj/projectile/icicle/get_structure_damage()
-	return damage / 2 // They're really deadly against mobs, but less effective against solid things.
+	return damage_force / 2 // They're really deadly against mobs, but less effective against solid things.
 
 /mob/living/simple_mob/slime/feral/dark_blue/handle_special()
 	if(stat != DEAD)

diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -201,7 +201,7 @@
 
 /mob/living/simple_mob/slime/xenobio/dark_purple/on_bullet_act(obj/projectile/proj, impact_flags, list/bullet_act_args)
 	. = ..()
-	if(proj.damage_type && proj.damage_type == BURN && proj.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
+	if(proj.damage_type && proj.damage_type == BURN && proj.damage_force) // Most bullets won't trigger the explosion, as a mercy towards Security.
 		log_and_message_admins("[src] ignited due to bring hit by a burning projectile[proj.firer ? " by [key_name(proj.firer)]" : ""].")
 		ignite()
 
@@ -654,7 +654,7 @@
 
 /mob/living/simple_mob/slime/xenobio/oil/on_bullet_act(obj/projectile/proj, impact_flags, list/bullet_act_args)
 	. = ..()
-	if(proj.damage_type && proj.damage_type == BURN && proj.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
+	if(proj.damage_type && proj.damage_type == BURN && proj.damage_force) // Most bullets won't trigger the explosion, as a mercy towards Security.
 		log_and_message_admins("[src] exploded due to bring hit by a burning projectile[proj.firer ? " by [key_name(proj.firer)]" : ""].")
 		explode()