...

2 files changed, 26 insertions, 31 deletions

diff --git a/include/tacticians/conditions.hrl b/include/tacticians/conditions.hrl
new file mode 100644
index 0000000..be0f98e
--- /dev/null
+++ b/include/tacticians/conditions.hrl
@@ -0,0 +1,26 @@
+-define(CONDITION_TRIGGER_START_OF_OWN_ATTACK, soowa).
+-define(CONDITION_TRIGGER_START_OF_OTHER_ATTACK, soota).
+
+-define(CONDITION_TRIGGER_END_OF_OWN_ATTACK, eoowa).
+-define(CONDITION_TRIGGER_END_OF_OTHER_ATTACK, eoota).
+
+-define(CONDITION_TRIGGER_COMPUTED_OWN_ATTACK_DAMAGE, cowad).
+-define(CONDITION_TRIGGER_COMPUTER_OTHER_ATTACK_DAMAGE, cotad).
+
+-define(CONDITION_TRIGGER_END_OF_OWN_HIT, eoowh).
+-define(CONDITION_TRIGGER_END_OF_OTHER_HIT, eooth).
+
+-define(CONDITION_TRIGGER_ROLLED_FOR_OWN_CRITICAL_HITS, rfowch).
+-define(CONDITION_TRIGGER_ROLLED_FOR_OTHER_CRITICAL_HITS, rfotch).
+
+-define(CONDITION_TRIGGER_ROLLED_FOR_OWN_PRECISION, rfowpr).
+-define(CONDITION_TRIGGER_ROLLED_FOR_OTHER_PRECISION, rfotpr).
+
+-define(CONDITION_TRIGGER_ROLLED_FOR_OWN_PARRY, rfowpa).
+-define(CONDITION_TRIGGER_ROLLED_FOR_OTHER_PARRY, rfotpa).
+
+-define(CONDITION_TRIGGER_ROLLED_FOR_OWN_DOUBLE_HITS, rfowdh).
+-define(CONDITION_TRIGGER_ROLLED_FOR_OTHER_DOUBLE_HITS, rfotdh).
+
+-define(CONDITION_TRIGGER_DEFINED_ACTORS_FOR_OWN_HIT, dafowh).
+-define(CONDITION_TRIGGER_DEFINED_ACTORS_FOR_OTHER_HIT, dafoth).
diff --git a/include/tacticians/conditions.hrl.m4 b/include/tacticians/conditions.hrl.m4
deleted file mode 100644
index 0b72b1a..0000000
--- a/include/tacticians/conditions.hrl.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-m4_include(__MAKEFILE_DATA_DIR/condition/trigger.m4.conf)
-
--define(CONDITION_TRIGGER_START_OF_PLAYER_TURN, __COND_TRIG_START_OF_PLAYER_TURN).
--define(CONDITION_TRIGGER_END_OF_PLAYER_TURN, __COND_TRIG_END_OF_PLAYER_TURN).
--define(CONDITION_TRIGGER_START_OF_CHARACTER_TURN, __COND_TRIG_START_OF_CHARACTER_TURN).
--define(CONDITION_TRIGGER_END_OF_CHARACTER_TURN, __COND_TRIG_END_OF_CHARACTER_TURN).
-
--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_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).
-
--define(CONDITION_TRIGGER_WEAPON_SWITCH, __COND_TRIG_WEAPON_SWITCH).
--define(CONDITION_TRIGGER_SKILL_USE, __COND_TRIG_SKILL_USE).
-
--define(CONDITION_TRIGGER_DEATH, __COND_TRIG_DEATH).
-
--define(CONDITION_TRIGGER_START_OF_BATTLE, __COND_TRIG_START_OF_BATTLE).
--define(CONDITION_TRIGGER_END_OF_BATTLE, __COND_TRIG_END_OF_BATTLE).