Merge branch 'master' into wound-port

2020-07-18 23:06:49 +01:00
parent 3b78ac58bd ee8162ea8b
commit 1a5008fee7
203 changed files with 364 additions and 307 deletions
@@ -142,6 +142,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 /// The attack is from a parry counterattack.
 #define ATTACKCHAIN_PARRY_COUNTERATTACK			(1<<0)

+// UnarmedAttack() flags
+/// Attack is from a parry counterattack
+#define UNARMED_ATTACK_PARRY					(1<<0)
+
 /// If the thing can reflect light (lasers/energy)
 #define RICOCHET_SHINY			(1<<0)
 /// If the thing can reflect matter (bullets/bomb shrapnel)