refactors combat backend & adds kinetic gauntlets (#7144)

Co-authored-by: Zandario <zandarioh@gmail.com>

Author: silicons

2025-03-15 10

@@ -96,6 +96,8 @@
 // admin verb cooldowns
 #define CD_INTERNET_SOUND "internet_sound"
 
-//? Mobs ?//
+//* /mob *//
+#define TIMER_CD_INDEX_MOB_VERB_INVERT_SELF "mob-verb-invert_self"
 
-#define CD_INDEX_MOB_VERB_INVERT_SELF "mob-verb-invert-self"
+//* /client *//
+#define TIMER_CD_INDEX_CLIENT_CHARACTER_DIRECTORY "client-verb-character_directory"

citadel.dme

@@ -140,6 +140,9 @@ DEFINE_BITFIELD(inv_hide_flags, list(
 //* These should be used any time you need to store coverage or parts    *//
 //*                  of a standard humanoid body.                        *//
 
+// todo: is there any way at all to rename these to not be one word defines?
+//       literally anything like BODY_COVER_* or BP_MASK_* would help
+
 #define HEAD        (1<<0)
 #define FACE        (1<<1)
 #define EYES        (1<<2)

code/__DEFINES/_cooldowns.dm

@@ -24,7 +24,7 @@
 /// wall-mounted; facing *towards* the wall we're mounted on (e.g. be NORTH if we're shifted north)
 #define OBJ_WALL_MOUNTED			(1<<11)
 /// Allow throwing stuff through us if we get destroyed by a throw
-#define OBJ_ALLOW_THROW_THROUGH     (1<<3)
+#define OBJ_ALLOW_THROW_THROUGH     (1<<23)
 
 DEFINE_BITFIELD(obj_flags, list(
 	BITFIELD(OBJ_EMAGGED),

code/__DEFINES/_flags/item_flags.dm

@@ -31,13 +31,39 @@
 //? If > 0, decreases damage linearly with 1 being 0x damage.
 //? If < 0, increases damage linearly with -1 being 2x damage, -2 being 3x damage.
 
+/**
+ * The ability of an armor to absorb exotic energy.
+ */
 #define ARMOR_ENERGY "energy"
+/**
+ * The ability of an armor to block a shockwave from an explosion.
+ */
 #define ARMOR_BOMB "bomb"
+/**
+ * The ability of an armor to block microscale particles from entering.
+ */
 #define ARMOR_BIO "bio"
+/**
+ * The ability of an armor to block radiation.
+ */
 #define ARMOR_RAD "rad"
+/**
+ * The ability of an armor to resist surface combustion.
+ */
 #define ARMOR_FIRE "fire"
+/**
+ * The ability of an armor to resist acidic or corrosive substances from leaking through.
+ */
 #define ARMOR_ACID "acid"
 
+/**
+ * Global randomization ratio for all armor checks.
+ * * 0.25 will make all armor randomly
+ *
+ * TODO: impl
+ */
+// #define ARMOR_CONF_RAND "conf-rand"
+
 /**
  * All armor enums that can be stored in an armor datum
  */
@@ -77,72 +103,91 @@ GLOBAL_REAL_LIST(armor_types) = list(
 	ARMOR_ACID,
 )
 
-//? --- armor tiers ---
-
-#define ARMOR_TIER_DEFAULT ARMOR_TIER_BASELINE
-
-#define ARMOR_TIER_LAUGHABLE -3
-#define ARMOR_TIER_LOW -2
-#define ARMOR_TIER_BELOW -1
-#define ARMOR_TIER_BASELINE 0
-#define ARMOR_TIER_ABOVE 1
-#define ARMOR_TIER_HIGH 2
-#define ARMOR_TIER_OVERWHELMING 3
-#define ARMOR_TIER_RIDICULOUS 4
-
-#define ARMOR_BARELY_BEATS(other) (other + 0.001)
-
-//? melee
-
-#define MELEE_TIER_DEFAULT MELEE_TIER_MEDIUM
-
-#define MELEE_TIER_UNARMED_DEFAULT ARMOR_TIER_LOW
-#define MELEE_TIER_UNARMED_FISTS ARMOR_TIER_LOW
-#define MELEE_TIER_UNARMED_CLAW ARMOR_TIER_BELOW
-#define MELEE_TIER_LIGHT ARMOR_TIER_BASELINE
-#define MELEE_TIER_MEDIUM ARMOR_TIER_ABOVE
-#define MELEE_TIER_HEAVY ARMOR_TIER_HIGH
-#define MELEE_TIER_EXTREME ARMOR_TIER_OVERWHELMING
-
-//? bullet
-
-#define BULLET_TIER_DEFAULT BULLET_TIER_MEDIUM
-
-/// super improvised rounds / pistols / whatever.
-#define BULLET_TIER_LAUGHABLE ARMOR_TIER_BELOW
-/// pistols
-#define BULLET_TIER_LOW ARMOR_TIER_BASELINE
-/// smgs
-#define BULLET_TIER_MEDIUM ARMOR_TIER_ABOVE
-/// rifles
-#define BULLET_TIER_HIGH ARMOR_TIER_HIGH
-/// hmgs, light mech weapons
-#define BULLET_TIER_EXTREME ARMOR_TIER_OVERWHELMING
-/// heavy mech weapons
-#define BULLET_TIER_RIDICULOUS ARMOR_TIER_RIDICULOUS
-
-//? laser
-
-#define LASER_TIER_DEFAULT LASER_TIER_MEDIUM
-
-/// improvised laser focis / etc
-#define LASER_TIER_LAUGHABLE ARMOR_TIER_BELOW
-/// low tier lasers
-#define LASER_TIER_LOW ARMOR_TIER_BASELINE
-/// laser carbines, energy guns, etc
-#define LASER_TIER_MEDIUM ARMOR_TIER_ABOVE
-/// x-ray rifles, snipers
-#define LASER_TIER_HIGH ARMOR_TIER_HIGH
-/// mech weapons, usualy
-#define LASER_TIER_EXTREME ARMOR_TIER_OVERWHELMING
-/// power transmission laser?
-#define LASER_TIER_RIDICULOUS ARMOR_TIER_RIDICULOUS
-
-//? --- armor calculations ---
+//?                              --- armor tiers ---
+//? These are defined values so if we want to scale them nonlinearly/whatever later,
+//? we don't need to replace everything.
 
 /// tierdiff is tier difference of armor against attack; positive = armor is higher tier.
-#define ARMOR_TIER_CALC(_armor, _tierdiff) \
-(_armor > 0? \
-	((_tierdiff) > 0? ((_armor) ** (1 / (1 + (_tierdiff)))) : ((_armor) * (1 / (1 - (_tierdiff))))) : \
-	(_armor) \
-)
+/// * see https://www.desmos.com/calculator/6uu1djsawl
+/// * armor at or below 0 (added damage) are passed back without change
+/proc/ARMOR_TIER_CALC(armor, tierdiff)
+	if(armor <= 0)
+		return 0
+	if(!tierdiff)
+		return armor
+	if(tierdiff > 0)
+		var/a = armor * (tierdiff + 1)
+		return max(a / sqrt(2 + a ** 2), armor)
+	else
+		return armor / (1 + (((-tierdiff) ** 17.5) / 1.75))
+
+#define ARMOR_TIER_FLOOR 0
+#define ARMOR_TIER_DEFAULT 3
+
+/proc/ARMOR_TIER_BLUNT_CHANCE(tierdiff)
+	switch(tierdiff)
+		if(-INFINITY to -2)
+			return 0
+		if(-2 to -1)
+			return 15
+		if(-1 to -0.5)
+			return 22.5
+		if(-0.5 to -0.3)
+			return 30
+		if(-0.3 to 0)
+			return 45.5
+		if(0 to 0.3)
+			return 57.5
+		if(0.3 to 0.6)
+			return 70
+		if(0.6 to 1)
+			return 85
+		if(1 to 2)
+			return 90
+		else
+			return 99 // tf2 critsound.ogg
+
+//?  -- armor tiers - melee --
+
+/**
+ * 0: toys
+ * 1: very light weapons
+ * 2: light weapons
+ * 3: toolboxes, batons, knives, your usual
+ * 4: heavy swords, sledgehammers, mech punches, etc
+ * 5: armor piercing / specialized weapons / eswords / etc
+ * 6: idk you got crushed by a titanium rod or something
+ * 7: hydraulic press?
+ */
+
+#define MELEE_TIER_DEFAULT 3
+
+//?  -- armor tiers - bullet --
+
+/**
+ * 0: toys / nerf guns
+ * 1: slingshots, bb guns, etc
+ * 2: crappy improvised real rounds
+ * 3: most pistols and basic-er weapons are here
+ * 4: rifles
+ * 5: heavy rifles
+ * 6: antimaterial rifles
+ * 7: idk you got hit by a tank round
+ */
+
+#define BULLET_TIER_DEFAULT 3
+
+//?  -- armor tiers - laser --
+
+/**
+ * 0: i don't know why there are toys for this but i guess toy guns that do damage? sunburn?
+ * 1: improvised crappy laser diodes or smth
+ * 2: relatively unfocused weapons, low grade, etc
+ * 3: most laser weapons are here
+ * 4: heavier laser rifles
+ * 5: x-ray lasers, light mech / mounted weapons
+ * 6: heavier mech weapons, pulse weapons
+ * 7: you got hit by engineering's power transmission laser
+ */
+
+#define LASER_TIER_DEFAULT 3

code/__DEFINES/_flags/obj_flags.dm

@@ -1,18 +1,13 @@
 //? attack_type bitfield - bitfield for check, but pass only one in at a time.
 
 #define ATTACK_TYPE_NONE (0)
-/// damage source is /obj/item
+/// damage source is /datum/event_args/actor/clickchain
 #define ATTACK_TYPE_MELEE (1<<0)
 /// damage source is /obj/projectile
 #define ATTACK_TYPE_PROJECTILE (1<<1)
 /// damage source is /datum/thrownthing
 #define ATTACK_TYPE_THROWN (1<<2)
-/// damage source is /mob
-#define ATTACK_TYPE_UNARMED (1<<3)
-/// we're being contacted by something
-///
-/// * used internally by parry frames, mostly
-/// * damage source is null
+/// damage source is /datum/event_args/actor/clickchain
 #define ATTACK_TYPE_TOUCH (1<<4)
 /// a damage instance created by a block / parry frame transmuting damage and passing it to the user
 #define ATTACK_TYPE_DEFENSIVE_PASSTHROUGH (1<<5)

code/__DEFINES/combat/armor.dm

@@ -31,8 +31,8 @@
  * * Groin is redirected to torso
  * * Eyes, mouth, are redirected to head
  */
-/proc/SIMPLIFY_BODY_ZONE(zone)
-	var/static/list/lookup = list(
+/proc/BODY_ZONE_TO_SIMPLIFIED(zone)
+	var/static/alist/lookup = alist(
 		BODY_ZONE_GROIN = BODY_ZONE_TORSO,
 		BODY_ZONE_L_HAND = BODY_ZONE_L_ARM,
 		BODY_ZONE_R_HAND = BODY_ZONE_R_ARM,
@@ -42,3 +42,24 @@
 		BODY_ZONE_EYES = BODY_ZONE_HEAD,
 	)
 	return lookup[zone] || zone
+
+/**
+ * body zone to body cover flags
+ */
+/proc/BODY_ZONE_TO_FLAGS(zone)
+	var/static/alist/lookup = alist(
+		BODY_ZONE_HEAD = HEAD,
+		BODY_ZONE_MOUTH = FACE,
+		BODY_ZONE_EYES = EYES,
+		BODY_ZONE_TORSO = UPPER_TORSO,
+		BODY_ZONE_GROIN = LOWER_TORSO,
+		BODY_ZONE_L_ARM = ARM_LEFT,
+		BODY_ZONE_R_ARM = ARM_RIGHT,
+		BODY_ZONE_L_HAND = HAND_LEFT,
+		BODY_ZONE_R_HAND = HAND_RIGHT,
+		BODY_ZONE_L_LEG = LEG_LEFT,
+		BODY_ZONE_R_LEG = LEG_RIGHT,
+		BODY_ZONE_L_FOOT = FOOT_LEFT,
+		BODY_ZONE_R_FOOT = FOOT_RIGHT,
+	)
+	return lookup[zone]

code/__DEFINES/combat/attack_types.dm

@@ -30,6 +30,17 @@
 /// todo: better hybrid type handling
 #define DAMAGE_TYPE_SEARING "searing"
 
+/proc/damage_type_to_visualized_color(damage_type)
+	var/alist/lookup = alist(
+		DAMAGE_TYPE_BRUTE = "#ff0000",
+		DAMAGE_TYPE_BURN = "#ffff00",
+		DAMAGE_TYPE_TOX = "#00ff00",
+		DAMAGE_TYPE_OXY = "#0000ff",
+		DAMAGE_TYPE_CLONE = "#ff00ff",
+		DAMAGE_TYPE_HALLOSS = "#00ffff",
+	)
+	return lookup[damage_type]
+
 //? damage_mode bitfield ?//
 
 /// sharp weapons like knives, spears, etc
@@ -52,3 +63,20 @@
 #define DAMAGE_MODE_REDIRECT (1<<7)
 /// temporary - re-evaluate when health is reworked. prevents damage from overflowing caps.
 #define DAMAGE_MODE_NO_OVERFLOW (1<<8)
+
+/// config: request armor / shieldcalls apply randomization.
+/// * disabled by default by not having this be an opt-out rather than opt-in flag.
+/// * disabled by default so non-determinism is controlled instead of innate.
+#define DAMAGE_MODE_REQUEST_ARMOR_RANDOMIZATION (1<<22)
+/// config: request armor damping of dangerous damage modes like pierce / shred
+/// * disabled by default by not having this be an opt-out rather than opt-in flag.
+/// * disabled by default so non-determinism is controlled instead of innate.
+#define DAMAGE_MODE_REQUEST_ARMOR_BLUNTING (1<<23)
+
+#define DAMAGE_MODES_BLUNTED_BY_ARMOR ( \
+	DAMAGE_MODE_SHARP | \
+	DAMAGE_MODE_EDGE | \
+	DAMAGE_MODE_ABLATING | \
+	DAMAGE_MODE_PIERCE | \
+	DAMAGE_MODE_SHRED \
+)