From 79de55c58c4f8b4b191611b9fcaebcc58b8dd102 Mon Sep 17 00:00:00 2001
From: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Date: Thu, 25 Mar 2021 09:07:52 +1100
Subject: [PATCH] First part of the largescale shield cleanup, including
 ensuring shields respect their various counters and strengths appropriately.

---
 code/__DEFINES/_flags/shields.dm              |  31 ++++--
 code/_globalvars/bitfields.dm                 |   7 ++
 code/game/objects/items/shields.dm            |  91 +++++++++++++-----
 .../research/designs/weapon_designs.dm        |  16 +--
 icons/obj/shields.dmi                         | Bin 4654 -> 5286 bytes
 5 files changed, 108 insertions(+), 37 deletions(-)

diff --git a/code/__DEFINES/_flags/shields.dm b/code/__DEFINES/_flags/shields.dm
index f6de4226e8..72c2f996e2 100644
--- a/code/__DEFINES/_flags/shields.dm
+++ b/code/__DEFINES/_flags/shields.dm
@@ -1,18 +1,35 @@
 /// Transparent, let beams pass
 #define SHIELD_TRANSPARENT				(1<<0)
+
+/// Flammable, takes more damage from fire
+#define SHIELD_ENERGY_WEAK				(1<<1)
+/// Fragile, takes more damage from brute
+#define SHIELD_KINETIC_WEAK				(1<<2)
+/// Strong against kinetic, weak against energy
+#define SHIELD_KINETIC_STRONG			(1<<3)
+/// Strong against energy, weak against kinetic
+#define SHIELD_ENERGY_STRONG			(1<<4)
+/// Disabler and other stamina based energy weapons boost the damage done to the sheld
+#define SHIELD_DISABLER_DISRUPTED		(1<<5)
+
+/// Doesn't block ranged attacks whatsoever
+#define SHIELD_NO_RANGED				(1<<6)
+/// Doesn't block melee attacks whatsoever
+#define SHIELD_NO_MELEE					(1<<7)
+
 /// Can shield bash
-#define SHIELD_CAN_BASH					(1<<1)
+#define SHIELD_CAN_BASH					(1<<8)
 /// Shield bash knockdown on wall hit
-#define SHIELD_BASH_WALL_KNOCKDOWN		(1<<2)
+#define SHIELD_BASH_WALL_KNOCKDOWN		(1<<9)
 /// Shield bash always knockdown
-#define SHIELD_BASH_ALWAYS_KNOCKDOWN	(1<<3)
+#define SHIELD_BASH_ALWAYS_KNOCKDOWN	(1<<10)
 /// Shield bash disarm on wall hit
-#define SHIELD_BASH_WALL_DISARM			(1<<4)
+#define SHIELD_BASH_WALL_DISARM			(1<<11)
 /// Shield bash always disarm
-#define SHIELD_BASH_ALWAYS_DISARM		(1<<5)
+#define SHIELD_BASH_ALWAYS_DISARM		(1<<12)
 /// You can shieldbash target someone on the ground for ground slam
-#define SHIELD_BASH_GROUND_SLAM			(1<<6)
+#define SHIELD_BASH_GROUND_SLAM			(1<<13)
 /// Shield bashing someone on the ground will disarm
-#define SHIELD_BASH_GROUND_SLAM_DISARM	(1<<7)
+#define SHIELD_BASH_GROUND_SLAM_DISARM	(1<<14)
 
 #define SHIELD_FLAGS_DEFAULT (SHIELD_CAN_BASH | SHIELD_BASH_WALL_KNOCKDOWN | SHIELD_BASH_WALL_DISARM | SHIELD_BASH_GROUND_SLAM)
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index 3fc275d436..b9cbfb7e35 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -259,6 +259,13 @@ GLOBAL_LIST_INIT(bitfields, list(
 	),
 	"shield_flags" = list(
 		"SHIELD_TRANSPARENT" = SHIELD_TRANSPARENT,
+		"SHIELD_ENERGY_WEAK" = SHIELD_ENERGY_WEAK,
+		"SHIELD_KINETIC_WEAK" = SHIELD_KINETIC_WEAK,
+		"SHIELD_KINETIC_STRONG" = SHIELD_KINETIC_STRONG,
+		"SHIELD_ENERGY_STRONG" = SHIELD_ENERGY_STRONG,
+		"SHIELD_DISABLER_DISRUPTED" = SHIELD_DISABLER_DISRUPTED,
+		"SHIELD_NO_RANGED" = SHIELD_NO_RANGED,
+		"SHIELD_NO_MELEE" = SHIELD_NO_MELEE,
 		"SHIELD_CAN_BASH" = SHIELD_CAN_BASH,
 		"SHIELD_BASH_WALL_KNOCKDOWN" = SHIELD_BASH_WALL_KNOCKDOWN,
 		"SHIELD_BASH_ALWAYS_KNOCKDOWN" = SHIELD_BASH_ALWAYS_KNOCKDOWN,
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 5c3e4fd612..d11a7ba0c8 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -174,6 +174,10 @@
 		var/atom/movable/AM = object
 		if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
 			return BLOCK_NONE
+	if(CHECK_BITFIELD(shield_flags, SHIELD_NO_RANGED) && (attack_type & ATTACK_TYPE_PROJECTILE))
+		return BLOCK_NONE
+	if(CHECK_BITFIELD(shield_flags, SHIELD_NO_MELEE) && (attack_type & ATTACK_TYPE_MELEE))
+		return BLOCK_NONE
 	if(attack_type & ATTACK_TYPE_THROWN)
 		final_block_chance += 30
 	if(attack_type & ATTACK_TYPE_TACKLE)
@@ -238,30 +242,73 @@
 	new /obj/item/shard((get_turf(src)))
 
 /obj/item/shield/riot/on_shield_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	var/final_damage = damage
+
+	if(attack_type & ATTACK_TYPE_MELEE)
+		var/obj/hittingthing = object
+		if(hittingthing.damtype == BURN)
+			if(CHECK_BITFIELD(shield_flags, SHIELD_ENERGY_WEAK))
+				final_damage *= 2
+			else if(CHECK_BITFIELD(shield_flags, SHIELD_ENERGY_STRONG))
+				final_damage *= 0.5
+
+		if(hittingthing.damtype == BRUTE)
+			if(CHECK_BITFIELD(shield_flags, SHIELD_KINETIC_WEAK))
+				final_damage *= 2
+			else if(CHECK_BITFIELD(shield_flags, SHIELD_KINETIC_STRONG))
+				final_damage *= 0.5
+
+		if(hittingthing.damtype == STAMINA || hittingthing.damtype == TOX || hittingthing.damtype == CLONE || hittingthing.damtype == BRAIN || hittingthing.damtype == OXY)
+			final_damage = 0
+
+	if(attack_type & ATTACK_TYPE_PROJECTILE)
+		var/obj/item/projectile/shootingthing = object
+		if(is_energy_reflectable_projectile(shootingthing))
+			if(CHECK_BITFIELD(shield_flags, SHIELD_ENERGY_WEAK))
+				final_damage *= 2
+			else if(CHECK_BITFIELD(shield_flags, SHIELD_ENERGY_STRONG))
+				final_damage *= 0.5
+
+		if(!is_energy_reflectable_projectile(object))
+			if(CHECK_BITFIELD(shield_flags, SHIELD_KINETIC_WEAK))
+				final_damage *= 2
+			else if(CHECK_BITFIELD(shield_flags, SHIELD_KINETIC_STRONG))
+				final_damage *= 0.5
+
+		if(shootingthing.damage_type == STAMINA)
+			if(CHECK_BITFIELD(shield_flags, SHIELD_DISABLER_DISRUPTED))
+				final_damage *= 3 //disablers melt these kinds of shields. Really meant more for holoshields.
+			else
+				final_damage = 0
+
+		if(shootingthing.damage_type == TOX || shootingthing.damage_type == CLONE || shootingthing.damage_type == BRAIN || shootingthing.damage_type == OXY)
+			final_damage = 0
+
 	if(can_shatter && (obj_integrity <= damage))
 		var/turf/T = get_turf(owner)
 		T.visible_message("<span class='warning'>[attack_text] destroys [src]!</span>")
 		shatter(owner)
 		qdel(src)
 		return FALSE
-	take_damage(damage)
+	take_damage(final_damage)
 	return ..()
 
-/obj/item/shield/riot/laser_proof
-	name = "laser resistant shield"
-	desc = "A far more frail shield made of dark glass meant to block lasers but suffers from being being weak to ballistic projectiles."
+/obj/item/shield/riot/energy_proof
+	name = "energy resistant shield"
+	desc = "An ablative shield designed to absorb and disperse energy attacks. This comes at significant cost to its ability to withstand ballistics and kinetics, breaking apart easily."
 	armor = list("melee" = 30, "bullet" = -10, "laser" = 80, "energy" = 80, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
 	icon_state = "riot_laser"
 	item_state = "riot_laser"
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
-	shield_flags = SHIELD_FLAGS_DEFAULT
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_ENERGY_STRONG | SHIELD_KINETIC_WEAK
 	max_integrity = 300
 
-/obj/item/shield/riot/bullet_proof
-	name = "bullet resistant shield"
-	desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
+/obj/item/shield/riot/kinetic_proof
+	name = "kinetic resistant shield"
+	desc = "A polymer and ceramic shield designed to absorb ballistic projectiles and kinetic force. It doesn't do very well into energy attacks, especially from weapons that inflict burns."
 	armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_KINETIC_STRONG | SHIELD_ENERGY_WEAK
 	max_integrity = 300
 
 /obj/item/shield/riot/roman
@@ -277,8 +324,8 @@
 
 /obj/item/shield/riot/roman/fake
 	desc = "Bears an inscription on the inside: <i>\"Romanes venio domus\"</i>. It appears to be a bit flimsy."
-	block_chance = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	shield_flags = SHIELD_ENERGY_WEAK | SHIELD_KINETIC_WEAK | SHIELD_NO_RANGED
 	max_integrity = 40
 
 /obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
@@ -295,8 +342,7 @@
 	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 10)
 	resistance_flags = FLAMMABLE
 	repair_material = /obj/item/stack/sheet/mineral/wood
-	block_chance = 30
-	shield_flags = SHIELD_FLAGS_DEFAULT
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_ENERGY_WEAK
 	max_integrity = 150
 
 /obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
@@ -348,7 +394,7 @@
 
 /obj/item/shield/makeshift
 	name = "metal shield"
-	desc = "A large shield made of wired and welded sheets of metal. The handle is made of cloth and leather making it unwieldy."
+	desc = "A large shield made of wired and welded sheets of metal. The handle is made of cloth and leather, making it unwieldy."
 	armor = list("melee" = 25, "bullet" = 25, "laser" = 5, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 80)
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
@@ -362,33 +408,34 @@
 
 /obj/item/shield/riot/tower
 	name = "tower shield"
-	desc = "A massive shield that can block a lot of attacks, can take a lot of abuse before braking."
+	desc = "An immense tower shield. Designed to ensure maximum protection to the user, at the expense of mobility."
 	armor = list("melee" = 95, "bullet" = 95, "laser" = 75, "energy" = 60, "bomb" = 90, "bio" = 90, "rad" = 0, "fire" = 90, "acid" = 10) //Armor for the item, dosnt transfer to user
 	item_state = "metal"
 	icon_state = "metal"
 	force = 16
 	slowdown = 2
-	throwforce = 15 //Massive pice of metal
+	throwforce = 15 //Massive piece of metal
+	max_integrity = 600
 	w_class = WEIGHT_CLASS_HUGE
-	item_flags = SLOWS_WHILE_IN_HAND
+	item_flags = SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
 	shield_flags = SHIELD_FLAGS_DEFAULT
 
 /obj/item/shield/riot/tower/swat
 	name = "swat shield"
-	desc = "A massive, heavy shield that can block a lot of attacks, can take a lot of abuse before breaking."
 	max_integrity = 250
 
 /obj/item/shield/riot/implant
-	name = "telescoping shield implant"
-	desc = "A compact, arm-mounted telescopic shield. While nigh-indestructible when powered by a host user, it will eventually overload from damage. Recharges while inside its implant."
-	item_state = "metal"
-	icon_state = "metal"
+	name = "hardlight shield implant"
+	desc = "A hardlight plane of force projected from the implant. While it is capable of withstanding immense amounts of abuse, it will eventually overload from sustained impacts, especially against energy attacks. Recharges while retracted."
+	item_state = "holoshield"
+	icon_state = "holoshield"
 	slowdown = 1
 	shield_flags = SHIELD_FLAGS_DEFAULT
 	max_integrity = 100
 	obj_integrity = 100
 	can_shatter = FALSE
-	item_flags = SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
+	item_flags = ITEM_CAN_BLOCK
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_KINETIC_STRONG | SHIELD_DISABLER_DISRUPTED
 	var/recharge_timerid
 	var/recharge_delay = 15 SECONDS
 
@@ -400,7 +447,7 @@
 	if(obj_integrity == 0)
 		if(ismob(loc))
 			var/mob/living/L = loc
-			playsound(src, 'sound/effects/glassbr3.ogg', 100)
+			playsound(src, 'sound/effects/zap.ogg', 100)
 			L.visible_message("<span class='boldwarning'>[src] overloads from the damage sustained!</span>")
 			L.dropItemToGround(src)			//implant component catch hook will grab it.
 
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 11dd29a416..f7ba9e7e63 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -457,23 +457,23 @@
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
-/datum/design/laser_shield
-	name = "Laser Resistant Riot Shield"
-	desc = "An advanced riot shield made of darker glasses to prevent laser fire from passing through."
+/datum/design/energy_shield
+	name = "Energy Resistant Shield"
+	desc = "An ablative shield designed to stop energy-based attacks dead in their tracks, but shatter easily against kinetic blows."
 	id = "laser_shield"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 4000, /datum/material/silver = 800, /datum/material/titanium = 600, /datum/material/plasma = 5000)
-	build_path = /obj/item/shield/riot/laser_proof
+	build_path = /obj/item/shield/riot/energy_proof
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
-/datum/design/bullet_shield
-	name = "Bullet Resistant Riot Shield"
-	desc = "An advanced riot shield made bullet resistant plastics and heavy metals to protect against projectile harm."
+/datum/design/kinetic_shield
+	name = "Kinetic Resistant Shield"
+	desc = "An advanced polymer shield designed to stop kinetic-based attacks with ease, but splinter apart against energy-based attacks."
 	id = "bullet_shield"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/silver = 2000, /datum/material/titanium = 1200, /datum/material/plastic = 2500)
-	build_path = /obj/item/shield/riot/bullet_proof
+	build_path = /obj/item/shield/riot/kinetic_proof
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
diff --git a/icons/obj/shields.dmi b/icons/obj/shields.dmi
index c8b1110e1a0fa8f6f0f39521daee398f9c166c4d..c641f0e0c677ba08b6c42ddb5071d5a2dbfbc56b 100644
GIT binary patch
literal 5286
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

literal 4654
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
aNrsR%w(dpT!jdk405A=G^>Q`)$o~MXfc<a)