Merge pull request #11627 from kevinz000/combat_rework

"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
parent 9215b484f4 b3afed69f4
commit bfe8ccdfb5
83 changed files with 2073 additions and 462 deletions
@@ -49,6 +49,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"DROPDEL" = DROPDEL,
 		"NOBLUDGEON" = NOBLUDGEON,
 		"ABSTRACT" = ABSTRACT,
+		"ITEM_CAN_BLOCK" = ITEM_CAN_BLOCK,
+		"ITEM_CAN_PARRY" = ITEM_CAN_PARRY
 		),
 	"admin_flags" = list(
 		"BUILDMODE" = R_BUILDMODE,