Handling expressive conditions is difficult...

1 files changed, 11 insertions, 17 deletions

diff --git a/include/tacticians/conditions.hrl.m4 b/include/tacticians/conditions.hrl.m4
index e4f2c34..0b72b1a 100644
--- a/include/tacticians/conditions.hrl.m4
+++ b/include/tacticians/conditions.hrl.m4
@@ -7,23 +7,17 @@ m4_include(__MAKEFILE_DATA_DIR/condition/trigger.m4.conf)
 
 -define(CONDITION_TRIGGER_START_OF_OWN_ATTACK, __COND_TRIG_START_OF_OWN_ATTACK).
 -define(CONDITION_TRIGGER_END_OF_OWN_ATTACK, __COND_TRIG_END_OF_OWN_ATTACK).
--define(CONDITION_TRIGGER_START_OF_OWN_HIT, __COND_TRIG_START_OF_OWN_HIT).
--define(CONDITION_TRIGGER_END_OF_OWN_HIT, __COND_TRIG_END_OF_OWN_HIT).
-
--define(CONDITION_TRIGGER_OWN_DODGE, __COND_TRIG_OWN_DODGE).
--define(CONDITION_TRIGGER_OWN_CRITICAL, __COND_TRIG_OWN_CRITICAL).
--define(CONDITION_TRIGGER_OWN_DOUBLE_HIT, __COND_TRIG_OWN_DOUBLE_HIT).
--define(CONDITION_TRIGGER_OWN_DAMAGE, __COND_TRIG_OWN_DAMAGE).
-
--define(CONDITION_TRIGGER_START_OF_TARGET_ATTACK, __COND_TRIG_START_OF_TARGET_ATTACK).
--define(CONDITION_TRIGGER_END_OF_TARGET_ATTACK, __COND_TRIG_END_OF_TARGET_ATTACK).
--define(CONDITION_TRIGGER_START_OF_TARGET_HIT, __COND_TRIG_START_OF_TARGET_HIT).
--define(CONDITION_TRIGGER_END_OF_TARGET_HIT, __COND_TRIG_END_OF_TARGET_HIT).
-
--define(CONDITION_TRIGGER_TARGET_DODGE, __COND_TRIG_TARGET_DODGE).
--define(CONDITION_TRIGGER_TARGET_CRITICAL, __COND_TRIG_TARGET_CRITICAL).
--define(CONDITION_TRIGGER_TARGET_DOUBLE_HIT, __COND_TRIG_TARGET_DOUBLE_HIT).
--define(CONDITION_TRIGGER_TARGET_DAMAGE, __COND_TRIG_TARGET_DAMAGE).
+
+-define(CONDITION_TRIGGER_INITIAL_DATA_FOR_OWN_HIT, __COND_TRIG_INITIAL_DATA_FOR_OWN_HIT).
+-define(CONDITION_TRIGGER_ROLLS_FOR_OWN_HIT, __ROLLS_FOR_OWN_HIT).
+-define(CONDITION_TRIGGER_END_OF_OWN_HIT, __END_OF_OWN_HIT).
+
+-define(CONDITION_TRIGGER_START_OF_OTHER_ATTACK, __COND_TRIG_START_OF_OTHER_ATTACK).
+-define(CONDITION_TRIGGER_END_OF_OTHER_ATTACK, __COND_TRIG_END_OF_OTHER_ATTACK).
+
+-define(CONDITION_TRIGGER_INITIAL_DATA_FOR_OTHER_HIT, __COND_TRIG_INITIAL_DATA_FOR_OTHER_HIT).
+-define(CONDITION_TRIGGER_ROLLS_FOR_OTHER_HIT, __ROLLS_FOR_OTHER_HIT).
+-define(CONDITION_TRIGGER_END_OF_OTHER_HIT, __END_OF_OTHER_HIT).
 
 -define(CONDITION_TRIGGER_START_OF_MOVEMENT, __COND_TRIG_START_OF_MOVEMENT).
 -define(CONDITION_TRIGGER_END_OF_MOVEMENT, __COND_TRIG_END_OF_MOVEMENT).