parry

code/__DEFINES/combat/block.dm

@@ -53,7 +53,6 @@
 
 /// Block priorities. Higher means it's checked sooner.
 // THESE MUST NEVER BE 0! Block code uses ! instead of isnull for the speed boost.
-#define BLOCK_PRIORITY_ACTIVE_PARRY				300
 #define BLOCK_PRIORITY_ACTIVE_BLOCK				200
 #define BLOCK_PRIORITY_HELD_ITEM				100
 #define BLOCK_PRIORITY_CLOTHING					50

code/__DEFINES/combat/block_parry.dm

@@ -22,3 +22,13 @@ GLOBAL_LIST_INIT(dir2blockdir, list(
 	))
 
 #define DIR2BLOCKDIR(d)			(GLOB.dir2blockdir["[d]"])
+
+/// ""types"" of parry "items"
+#define UNARMED_PARRY		"unarmed"
+#define MARTIAL_PARRY		"martial"
+#define ITEM_PARRY			"item"
+
+/// Parry phase we're in
+#define PARRY_WINDUP		"windup"
+#define PARRY_ACTIVE		"main"
+#define PARRY_SPINDOWN		"spindown"