From 68e2a10b2d76cb3a2f5aa6818b4b184b6a02ef14 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<> --- src/monster_race_flag_list.hpp | 159 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 src/monster_race_flag_list.hpp (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp new file mode 100644 index 00000000..10a36a3f --- /dev/null +++ b/src/monster_race_flag_list.hpp @@ -0,0 +1,159 @@ +/** + * X-macro list of all the monster race flags + */ + +/* RF(, , ) */ + +RF(1, 0, UNIQUE) +RF(1, 1, QUESTOR) +RF(1, 2, MALE) +RF(1, 3, FEMALE) +RF(1, 4, CHAR_CLEAR) +RF(1, 5, CHAR_MULTI) +RF(1, 6, ATTR_CLEAR) +RF(1, 7, ATTR_MULTI) +RF(1, 8, FORCE_DEPTH) +RF(1, 9, FORCE_MAXHP) +RF(1, 10, FORCE_SLEEP) +RF(1, 11, FORCE_EXTRA) +RF(1, 12, FRIEND) +RF(1, 13, FRIENDS) +RF(1, 14, ESCORT) +RF(1, 15, ESCORTS) +RF(1, 16, NEVER_BLOW) +RF(1, 17, NEVER_MOVE) +RF(1, 18, RAND_25) +RF(1, 19, RAND_50) +RF(1, 20, ONLY_GOLD) +RF(1, 21, ONLY_ITEM) +RF(1, 22, DROP_60) +RF(1, 23, DROP_90) +RF(1, 24, DROP_1D2) +RF(1, 25, DROP_2D2) +RF(1, 26, DROP_3D2) +RF(1, 27, DROP_4D2) +RF(1, 28, DROP_GOOD) +RF(1, 29, DROP_GREAT) +RF(1, 30, DROP_USEFUL) +RF(1, 31, DROP_CHOSEN) + +RF(2, 0, STUPID) +RF(2, 1, SMART) +RF(2, 2, CAN_SPEAK) +RF(2, 3, REFLECTING) +RF(2, 4, INVISIBLE) +RF(2, 5, COLD_BLOOD) +RF(2, 6, EMPTY_MIND) +RF(2, 7, WEIRD_MIND) +RF(2, 8, DEATH_ORB) +RF(2, 9, REGENERATE) +RF(2, 10, SHAPECHANGER) +RF(2, 11, ATTR_ANY) +RF(2, 12, POWERFUL) +RF(2, 13, ELDRITCH_HORROR) +RF(2, 14, AURA_FIRE) +RF(2, 15, AURA_ELEC) +RF(2, 16, OPEN_DOOR) +RF(2, 17, BASH_DOOR) +RF(2, 18, PASS_WALL) +RF(2, 19, KILL_WALL) +RF(2, 20, MOVE_BODY) +RF(2, 21, KILL_BODY) +RF(2, 22, TAKE_ITEM) +RF(2, 23, KILL_ITEM) +RF(2, 24, BRAIN_1) +RF(2, 25, BRAIN_2) +RF(2, 26, BRAIN_3) +RF(2, 27, BRAIN_4) +RF(2, 28, BRAIN_5) +RF(2, 29, BRAIN_6) +RF(2, 30, BRAIN_7) +RF(2, 31, BRAIN_8) + +RF(3, 0, ORC) +RF(3, 1, TROLL) +RF(3, 2, GIANT) +RF(3, 3, DRAGON) +RF(3, 4, DEMON) +RF(3, 5, UNDEAD) +RF(3, 6, EVIL) +RF(3, 7, ANIMAL) +RF(3, 8, THUNDERLORD) +RF(3, 9, GOOD) +RF(3, 10, AURA_COLD) +RF(3, 11, NONLIVING) +RF(3, 12, HURT_LITE) +RF(3, 13, HURT_ROCK) +RF(3, 14, SUSCEP_FIRE) +RF(3, 15, SUSCEP_COLD) +RF(3, 16, IM_ACID) +RF(3, 17, IM_ELEC) +RF(3, 18, IM_FIRE) +RF(3, 19, IM_COLD) +RF(3, 20, IM_POIS) +RF(3, 21, RES_TELE) +RF(3, 22, RES_NETH) +RF(3, 23, RES_WATE) +RF(3, 24, RES_PLAS) +RF(3, 25, RES_NEXU) +RF(3, 26, RES_DISE) +RF(3, 27, UNIQUE_4) +RF(3, 28, NO_FEAR) +RF(3, 29, NO_STUN) +RF(3, 30, NO_CONF) +RF(3, 31, NO_SLEEP) + +RF(4, 0, AQUATIC) +RF(4, 1, CAN_SWIM) +RF(4, 2, CAN_FLY) +RF(4, 3, FRIENDLY) +RF(4, 4, PET) +RF(4, 5, MORTAL) +RF(4, 6, SPIDER) +RF(4, 7, NAZGUL) +RF(4, 8, DG_CURSE) +RF(4, 9, POSSESSOR) +RF(4, 10, NO_DEATH) +RF(4, 11, NO_TARGET) +RF(4, 12, AI_ANNOY) +RF(4, 13, AI_SPECIAL) +RF(4, 14, NEUTRAL) +RF(4, 15, DROP_ART) +RF(4, 16, DROP_RANDART) +RF(4, 17, AI_PLAYER) +RF(4, 18, NO_THEFT) +RF(4, 19, SPIRIT) + +RF(5, 0, WILD_ONLY) +RF(5, 1, WILD_TOWN) +RF(5, 2, XXX8X02) +RF(5, 3, WILD_SHORE) +RF(5, 4, WILD_OCEAN) +RF(5, 5, WILD_WASTE) +RF(5, 6, WILD_WOOD) +RF(5, 7, WILD_VOLCANO) +RF(5, 8, XXX8X08) +RF(5, 9, WILD_MOUNTAIN) +RF(5, 10, WILD_GRASS) +RF(5, 11, NO_CUT) +RF(5, 12, CTHANGBAND) +RF(5, 14, ZANGBAND) +RF(5, 15, JOKEANGBAND) +RF(5, 16, BASEANGBAND) +RF(5, 31, WILD_TOO) + +RF(6, 0, DROP_CORPSE) +RF(6, 1, DROP_SKELETON) +RF(6, 2, HAS_LITE) +RF(6, 3, MIMIC) +RF(6, 4, HAS_EGG) +RF(6, 5, IMPRESED) +RF(6, 6, SUSCEP_ACID) +RF(6, 7, SUSCEP_ELEC) +RF(6, 8, SUSCEP_POIS) +RF(6, 9, KILL_TREES) +RF(6, 10, WYRM_PROTECT) +RF(6, 11, DOPPLEGANGER) +RF(6, 12, ONLY_DEPTH) +RF(6, 13, SPECIAL_GENE) +RF(6, 14, NEVER_GENE) -- cgit v1.2.3 From 796f29b346bcad753b2e2b96e4454de0e9adb0cc Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove ZANGBAND and CTHANGBAND monsters There was no way to enable them anyway, so we might as well remove them + the code for them. --- src/monster_race_flag_list.hpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index 10a36a3f..5179a040 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -136,8 +136,6 @@ RF(5, 8, XXX8X08) RF(5, 9, WILD_MOUNTAIN) RF(5, 10, WILD_GRASS) RF(5, 11, NO_CUT) -RF(5, 12, CTHANGBAND) -RF(5, 14, ZANGBAND) RF(5, 15, JOKEANGBAND) RF(5, 16, BASEANGBAND) RF(5, 31, WILD_TOO) -- cgit v1.2.3 From 0e4dc49ff31f216a4f553f54e0da8b4bc569f8f7 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove unused UNIQUE_4 monster race flag --- src/monster_race_flag_list.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index 5179a040..0484e3af 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -97,7 +97,6 @@ RF(3, 23, RES_WATE) RF(3, 24, RES_PLAS) RF(3, 25, RES_NEXU) RF(3, 26, RES_DISE) -RF(3, 27, UNIQUE_4) RF(3, 28, NO_FEAR) RF(3, 29, NO_STUN) RF(3, 30, NO_CONF) -- cgit v1.2.3 From fe10c22d4ad3fbc84a5c033e96782a8e6da3e1e0 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove unused DROP_ART monster race flag --- src/monster_race_flag_list.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index 0484e3af..01ad2e8d 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -117,7 +117,6 @@ RF(4, 11, NO_TARGET) RF(4, 12, AI_ANNOY) RF(4, 13, AI_SPECIAL) RF(4, 14, NEUTRAL) -RF(4, 15, DROP_ART) RF(4, 16, DROP_RANDART) RF(4, 17, AI_PLAYER) RF(4, 18, NO_THEFT) -- cgit v1.2.3 From 5cc007ae05746810aebb104b8ec7fd3e32d68131 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove unused XXX8X02 monster race flag --- src/monster_race_flag_list.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index 01ad2e8d..d1ef367c 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -124,7 +124,6 @@ RF(4, 19, SPIRIT) RF(5, 0, WILD_ONLY) RF(5, 1, WILD_TOWN) -RF(5, 2, XXX8X02) RF(5, 3, WILD_SHORE) RF(5, 4, WILD_OCEAN) RF(5, 5, WILD_WASTE) -- cgit v1.2.3 From ff78c154d2848aa15df9c13026ee9cd75f8b95f1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove unused XXX8X08 monster race flag --- src/monster_race_flag_list.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index d1ef367c..4754ce2b 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -129,7 +129,6 @@ RF(5, 4, WILD_OCEAN) RF(5, 5, WILD_WASTE) RF(5, 6, WILD_WOOD) RF(5, 7, WILD_VOLCANO) -RF(5, 8, XXX8X08) RF(5, 9, WILD_MOUNTAIN) RF(5, 10, WILD_GRASS) RF(5, 11, NO_CUT) -- cgit v1.2.3 From ae90af873f4cd3450d5e04a65e84040b4ddad1bd Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Remove unused BASEANGBAND flag --- src/monster_race_flag_list.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/monster_race_flag_list.hpp') diff --git a/src/monster_race_flag_list.hpp b/src/monster_race_flag_list.hpp index 4754ce2b..b9d2b079 100644 --- a/src/monster_race_flag_list.hpp +++ b/src/monster_race_flag_list.hpp @@ -133,7 +133,6 @@ RF(5, 9, WILD_MOUNTAIN) RF(5, 10, WILD_GRASS) RF(5, 11, NO_CUT) RF(5, 15, JOKEANGBAND) -RF(5, 16, BASEANGBAND) RF(5, 31, WILD_TOO) RF(6, 0, DROP_CORPSE) -- cgit v1.2.3