From 1fef5825a9c15824803cb4a01b7dc57e1770c8a7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 30 May 2020 22:09:13 -0700
Subject: [PATCH] definition fixes

---
 code/game/objects/items/melee/misc.dm          | 1 -
 code/game/objects/items/twohanded.dm           | 9 +++------
 code/modules/mob/living/living_active_parry.dm | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index b235dc3bbf..b6672e195c 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -234,7 +234,6 @@
 	. = ..()
 	if(iscarbon(target))
 		var/mob/living/carbon/H = target
-		var/loss = H.getStaminaLoss()
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)
 		if(CHECK_STAMCRIT(H) != NOT_STAMCRIT)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 8c5064fee7..d3bc35cea7 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -339,7 +339,7 @@
 
 	// more efficient vs projectiles
 	block_stamina_efficiency_override = list(
-		"[TEXT_ATTACK_TYPE_PROJECTILE]" = 4
+		TEXT_ATTACK_TYPE_PROJECTILE = 4
 	)
 
 /obj/item/twohanded/dualsaber/suicide_act(mob/living/carbon/user)
@@ -1093,8 +1093,8 @@
 /datum/block_parry_data/electrostaff
 	block_damage_absorption = 0
 	block_damage_multiplier = 1
-	block_attack_types = ~ATTACK_TYPE_PROJECTILE		// only able to parry non projectiles
-	block_damage_multiplier_override(
+	can_block_attack_types = ~ATTACK_TYPE_PROJECTILE		// only able to parry non projectiles
+	block_damage_multiplier_override = list(
 		TEXT_ATTACK_TYPE_MELEE = 0.5,		// only useful on melee and unarmed
 		TEXT_ATTACK_TYPE_UNARMED = 0.3
 	)
@@ -1114,9 +1114,6 @@
 	parry_time_perfect = 0
 	parry_time_perfect_leeway = 1.5
 	parry_efficiency_perfect = 100
-	parry_efficiency_perfect_override = list(
-		TEXT_ATTACK_TYPE_PROJECTILE = 80			// no perfect projectile blocking
-	)
 	parry_imperfect_falloff_percent = 15
 	parry_imperfect_falloff_percent_override = list(
 		TEXT_ATTACK_TYPE_PROJECTILE = 35		// really crappy vs projectiles
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 3bafd07daa..9e8a756b68 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -266,7 +266,7 @@
 		if(data.parry_data[PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN])
 			switch(parrying)
 				if(ITEM_PARRY)
-					active_parry_item.melee_attack_chain(src, attacker, null, ATTACKCHAIN_PARRY_COUNTERATTACK, data.parry_data[PARRY_COUNTERATTACK_DAMAGE_MULTIPLIER])
+					active_parry_item.melee_attack_chain(src, attacker, null, ATTACKCHAIN_PARRY_COUNTERATTACK, data.parry_data[PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN])
 					effect_text += "reflexively counterattacking with [active_parry_item]"
 				if(UNARMED_PARRY)		// WARNING: If you are using these two, the attackchain parry counterattack flags and damage multipliers are unimplemented. Be careful with how you handle this.
 					UnarmedAttack(attacker)