Revert "adds directional blocking (#1103)" (#1104)

This reverts commit b689005.
DaedalusDock · Oct 28, 2024 · 0ffd79d · 0ffd79d
1 parent 94caa78
commit 0ffd79d
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 84 deletions.
diff --git a/code/__HELPERS/combat_helpers.dm b/code/__HELPERS/combat_helpers.dm
diff --git a/code/__HELPERS/_type2type.dm → code/__HELPERS/type2type.dm b/code/__HELPERS/_type2type.dm → code/__HELPERS/type2type.dm
@@ -62,6 +62,8 @@
 			return SOUTHEAST
 		if("SOUTHWEST")
 			return SOUTHWEST
+		else
+	return
 
 //Converts an angle (degrees) into a ss13 direction
 GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST))

diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
@@ -229,7 +229,7 @@
 	else
 		return ..()
 
-/obj/item/staff/bostaff/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	if(!wielded)
-		return FALSE
-	return ..()
+/obj/item/staff/bostaff/get_block_chance(atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(wielded)
+		return ..()
+	return FALSE
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -239,9 +239,6 @@ DEFINE_INTERACTABLE(/obj/item)
 
 	/// The baseline chance to block **ANY** attack, projectiles included
 	var/block_chance = 0
-	/// The angle infront of the defender that is a valid block range.
-	var/block_angle = 45 // Infront and infront + sides, but not direct sides
-
 	/// The type of effect to create on a successful block
 	var/obj/effect/temp_visual/block_effect = /obj/effect/temp_visual/block
 
@@ -706,8 +703,7 @@ DEFINE_INTERACTABLE(/obj/item)
 	var/sig_return = SEND_SIGNAL(src, COMSIG_ITEM_CHECK_BLOCK)
 	var/block_result = sig_return & COMPONENT_CHECK_BLOCK_BLOCKED
 
-	if(!block_result && can_block_attack(wielder, hitby, attack_type))
-		block_result = prob(get_block_chance(wielder, hitby, damage, attack_type, armor_penetration))
+	block_result ||= prob(get_block_chance(wielder, hitby, damage, attack_type, armor_penetration))
 
 	var/list/reaction_args = args.Copy()
 	if(block_result)
@@ -724,14 +720,6 @@ DEFINE_INTERACTABLE(/obj/item)
 
 	return block_result
 
-/// Checks if this item can block an incoming attack.
-/obj/item/proc/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	var/angle = get_relative_attack_angle(wielder, hitby)
-	if(angle <= block_angle)
-		return TRUE
-
-	return FALSE
-
 /// Returns a number to feed into prob() to determine if the attack was blocked.
 /obj/item/proc/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	var/block_chance_modifier = round(damage / -3)

diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
@@ -138,10 +138,10 @@
 	else
 		user.stamina.adjust(-25)
 
-/obj/item/dualsaber/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	if(!wielded)
-		return FALSE
-	return ..()
+/obj/item/dualsaber/get_block_chance(atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(wielded)
+		return ..()
+	return FALSE
 
 /obj/item/dualsaber/process()
 	if(!wielded)

diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm
@@ -214,10 +214,10 @@
 /obj/item/grenade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	var/obj/projectile/hit_projectile = hitby
 	if(!istype(hitby))
-		return 0
+		return FALSE
 
 	if(damage && attack_type == PROJECTILE_ATTACK && hit_projectile.damage_type != STAMINA && prob(15))
-		return 100
+		return TRUE
 
 /obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK, block_success = TRUE)
 	. = ..()

diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
@@ -248,7 +248,7 @@
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
 	menu_description = "A sharp claymore which provides a low chance of blocking incoming melee attacks. Can be worn on the back or belt."
 
-/obj/item/nullrod/claymore/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/nullrod/claymore/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(attack_type == PROJECTILE_ATTACK)
 		return FALSE
 	return ..()

diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
@@ -179,10 +179,10 @@
 	block_chance = 50
 	embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
 
-/obj/item/melee/energy/sword/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	if(!blade_active)
-		return FALSE
-	return ..()
+/obj/item/melee/energy/sword/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(blade_active)
+		return ..()
+	return FALSE
 
 /obj/item/melee/energy/sword/cyborg
 	name = "cyborg energy sword"
@@ -223,7 +223,7 @@
 	active_force = 30
 	sword_color_icon = null // Stops icon from breaking when turned on.
 
-/obj/item/melee/energy/sword/cyborg/saw/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/melee/energy/sword/cyborg/saw/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	return FALSE
 
 // The colored energy swords we all know and love.

diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
@@ -76,9 +76,9 @@
 	. = ..()
 	AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
 
-/obj/item/melee/sabre/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/melee/sabre/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(attack_type == PROJECTILE_ATTACK)
-		return FALSE
+		return FALSE //Don't bring a sword to a gunfight
 	return ..()
 
 /obj/item/melee/sabre/on_exit_storage(datum/storage/container)

diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
@@ -28,12 +28,9 @@
 	max_integrity = 75
 
 
-/obj/item/shield/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/shield/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(transparent && (hitby.pass_flags & PASSGLASS))
 		return FALSE
-	return ..()
-
-/obj/item/shield/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	. = ..()
 	if(attack_type == THROWN_PROJECTILE_ATTACK)
 		. += 30
@@ -272,10 +269,10 @@
 		attack_verb_simple_on = list("smack", "strike", "crack", "beat"))
 	RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
 
-/obj/item/shield/riot/tele/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	if(!extended)
-		return FALSE
-	return ..()
+/obj/item/shield/riot/tele/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(extended)
+		return ..()
+	return FALSE
 
 /*
  * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -520,7 +520,7 @@
 	attack_verb_continuous = list("attacks", "strikes", "hits")
 	attack_verb_simple = list("attack", "strike", "hit")
 
-/obj/item/dualsaber/toy/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/dualsaber/toy/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	return FALSE
 
 /obj/item/dualsaber/toy/IsReflect() //Stops Toy Dualsabers from reflecting energy projectiles

diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
@@ -780,7 +780,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 
 /obj/item/highfrequencyblade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if((attack_type == PROJECTILE_ATTACK) && wielded)
-		return 100
+		return TRUE
 
 	. = ..()
 

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
@@ -368,7 +368,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
 /obj/item/chair/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	. = ..()
 	if(prob(50) && ((attack_type == UNARMED_ATTACK) || (attack_type == LEAP_ATTACK)))
-		return 100
+		return TRUE
 
 /obj/item/chair/block_feedback(mob/living/carbon/human/wielder, attack_text, attack_type, do_message = TRUE, do_sound = TRUE)
 	if(do_message)

diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
@@ -37,10 +37,11 @@ Striking a noncultist, however, will tear their flesh."}
 
 	AddComponent(/datum/component/cult_ritual_item, span_cult(examine_text))
 
-/obj/item/melee/cultblade/dagger/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
-	if(attack_type == PROJECTILE_ATTACK)
-		return FALSE
-	return ..()
+/obj/item/melee/cultblade/dagger/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(IS_CULTIST(wielder) && attack_type != PROJECTILE_ATTACK)
+		return ..()
+
+	return FALSE
 
 /obj/item/melee/cultblade/dagger/block_feedback(mob/living/carbon/human/wielder, attack_text, attack_type, do_message = TRUE, do_sound = TRUE)
 	if(do_message)
@@ -77,7 +78,7 @@ Striking a noncultist, however, will tear their flesh."}
 	. = ..()
 	AddComponent(/datum/component/butchering, 40, 100)
 
-/obj/item/melee/cultblade/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/melee/cultblade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(IS_CULTIST(wielder))
 		return ..()
 
@@ -277,15 +278,13 @@ Striking a noncultist, however, will tear their flesh."}
 	holder.apply_status_effect(/datum/status_effect/sword_spin)
 	sword.spinning = TRUE
 	sword.block_chance = 100
-	sword.block_angle = 180
 	sword.slowdown += 1.5
 	addtimer(CALLBACK(src, PROC_REF(stop_spinning)), 50)
 	holder?.update_mob_action_buttons()
 
 /datum/action/innate/cult/spin2win/proc/stop_spinning()
 	sword.spinning = FALSE
 	sword.block_chance = 50
-	sword.block_angle = 45
 	sword.slowdown -= 1.5
 	sleep(sword.spin_cooldown)
 	holder?.update_mob_action_buttons()
@@ -776,6 +775,8 @@ Striking a noncultist, however, will tear their flesh."}
 	qdel(src)
 
 /obj/item/melee/cultblade/halberd/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
+	if(!IS_CULTIST(wielder))
+		return FALSE
 	. = ..()
 	if(wielded)
 		. *= 2

diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm
@@ -67,7 +67,7 @@
 	update_icon()
 	add_fingerprint(user)
 
-/obj/item/clothing/suit/armor/reactive/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/clothing/suit/armor/reactive/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(!active)
 		return FALSE
 

diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
@@ -182,7 +182,7 @@
 	. = ..()
 	AddComponent(/datum/component/butchering, 15, 125, 0, hitsound)
 
-/obj/item/gun/magic/staff/spellblade/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/gun/magic/staff/spellblade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(attack_type == PROJECTILE_ATTACK)
 		return FALSE
 

diff --git a/code/modules/religion/sparring/ceremonial_gear.dm b/code/modules/religion/sparring/ceremonial_gear.dm
@@ -42,12 +42,10 @@
 	force = old_force
 	throwforce = old_throwforce
 
-/obj/item/ceremonial_blade/can_block_attack(mob/living/carbon/human/wielder, atom/movable/hitby, attack_type)
+/obj/item/ceremonial_blade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	if(attack_type != MELEE_ATTACK || !ishuman(hitby.loc))
-		return FALSE
-	return ..()
+		return ..()
 
-/obj/item/ceremonial_blade/get_block_chance(mob/living/carbon/human/wielder, atom/movable/hitby, damage, attack_type, armor_penetration)
 	. = ..()
 	if(HAS_TRAIT(hitby.loc, TRAIT_SPARRING))
 		//becomes 30 block

diff --git a/daedalus.dme b/daedalus.dme
@@ -342,7 +342,6 @@
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_logging.dm"
 #include "code\__HELPERS\_string_lists.dm"
-#include "code\__HELPERS\_type2type.dm"
 #include "code\__HELPERS\admin.dm"
 #include "code\__HELPERS\ai.dm"
 #include "code\__HELPERS\areas.dm"
@@ -356,7 +355,6 @@
 #include "code\__HELPERS\clients.dm"
 #include "code\__HELPERS\cmp.dm"
 #include "code\__HELPERS\colors.dm"
-#include "code\__HELPERS\combat_helpers.dm"
 #include "code\__HELPERS\config.dm"
 #include "code\__HELPERS\construction.dm"
 #include "code\__HELPERS\dates.dm"
@@ -410,6 +408,7 @@
 #include "code\__HELPERS\time.dm"
 #include "code\__HELPERS\traits.dm"
 #include "code\__HELPERS\turfs.dm"
+#include "code\__HELPERS\type2type.dm"
 #include "code\__HELPERS\type_processing.dm"
 #include "code\__HELPERS\typelists.dm"
 #include "code\__HELPERS\varset_callback.dm"