From 7bd28912b2f22c63aacb48fae6029ed943dba6f2 Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 28 May 2019 21:57:14 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=A2=E3=82=A4?= =?utf8?q?=E3=83=86=E3=83=A0=E7=89=B9=E6=80=A7=E5=AE=9A=E7=BE=A9=20TR=5F*?= =?utf8?q?=20=E3=82=92=20object.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 145 --------------------------------------------------------- src/object.h | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 145 deletions(-) diff --git a/src/defines.h b/src/defines.h index bb135748f..084cce5ed 100644 --- a/src/defines.h +++ b/src/defines.h @@ -1233,151 +1233,6 @@ #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f)) -#define TR_STR 0 /* STR += "pval" */ -#define TR_INT 1 /* INT += "pval" */ -#define TR_WIS 2 /* WIS += "pval" */ -#define TR_DEX 3 /* DEX += "pval" */ -#define TR_CON 4 /* CON += "pval" */ -#define TR_CHR 5 /* CHR += "pval" */ -#define TR_MAGIC_MASTERY 6 /* Later */ -#define TR_FORCE_WEAPON 7 /* Later */ -#define TR_STEALTH 8 /* Stealth += "pval" */ -#define TR_SEARCH 9 /* Search += "pval" */ -#define TR_INFRA 10 /* Infra += "pval" */ -#define TR_TUNNEL 11 /* Tunnel += "pval" */ -#define TR_SPEED 12 /* Speed += "pval" */ -#define TR_BLOWS 13 /* Blows += "pval" */ -#define TR_CHAOTIC 14 -#define TR_VAMPIRIC 15 -#define TR_SLAY_ANIMAL 16 -#define TR_SLAY_EVIL 17 -#define TR_SLAY_UNDEAD 18 -#define TR_SLAY_DEMON 19 -#define TR_SLAY_ORC 20 -#define TR_SLAY_TROLL 21 -#define TR_SLAY_GIANT 22 -#define TR_SLAY_DRAGON 23 -#define TR_KILL_DRAGON 24 /* Execute Dragon */ -#define TR_VORPAL 25 /* Later */ -#define TR_IMPACT 26 /* Cause Earthquakes */ -#define TR_BRAND_POIS 27 -#define TR_BRAND_ACID 28 -#define TR_BRAND_ELEC 29 -#define TR_BRAND_FIRE 30 -#define TR_BRAND_COLD 31 - -#define TR_SUST_STR 32 -#define TR_SUST_INT 33 -#define TR_SUST_WIS 34 -#define TR_SUST_DEX 35 -#define TR_SUST_CON 36 -#define TR_SUST_CHR 37 -#define TR_RIDING 38 -#define TR_EASY_SPELL 39 -#define TR_IM_ACID 40 -#define TR_IM_ELEC 41 -#define TR_IM_FIRE 42 -#define TR_IM_COLD 43 -#define TR_THROW 44 /* Later */ -#define TR_REFLECT 45 /* Reflect 'bolts' */ -#define TR_FREE_ACT 46 /* Free Action */ -#define TR_HOLD_EXP 47 /* Hold EXP */ -#define TR_RES_ACID 48 -#define TR_RES_ELEC 49 -#define TR_RES_FIRE 50 -#define TR_RES_COLD 51 -#define TR_RES_POIS 52 -#define TR_RES_FEAR 53 /* Added for Zangband */ -#define TR_RES_LITE 54 -#define TR_RES_DARK 55 -#define TR_RES_BLIND 56 -#define TR_RES_CONF 57 -#define TR_RES_SOUND 58 -#define TR_RES_SHARDS 59 -#define TR_RES_NETHER 60 -#define TR_RES_NEXUS 61 -#define TR_RES_CHAOS 62 -#define TR_RES_DISEN 63 - -#define TR_SH_FIRE 64 /* Immolation (Fire) */ -#define TR_SH_ELEC 65 /* Electric Sheath */ -#define TR_SLAY_HUMAN 66 /* Slay human */ -#define TR_SH_COLD 67 /* cold aura */ -#define TR_NO_TELE 68 /* Anti-teleportation */ -#define TR_NO_MAGIC 69 /* Anti-magic */ -#define TR_DEC_MANA 70 /* ??? */ -#define TR_TY_CURSE 71 /* The Ancient Curse */ -#define TR_WARNING 72 /* Warning */ -#define TR_HIDE_TYPE 73 /* Hide "pval" description */ -#define TR_SHOW_MODS 74 /* Always show Tohit/Todam */ -#define TR_SLAY_GOOD 75 -#define TR_LEVITATION 76 /* Feather Falling */ -#define TR_LITE_1 77 /* Light Radius 1*/ -#define TR_SEE_INVIS 78 /* See Invisible */ -#define TR_TELEPATHY 79 /* Telepathy */ -#define TR_SLOW_DIGEST 80 /* Item slows down digestion */ -#define TR_REGEN 81 /* Item induces regeneration */ -#define TR_XTRA_MIGHT 82 /* Bows get extra multiplier */ -#define TR_XTRA_SHOTS 83 /* Bows get extra shots */ -#define TR_IGNORE_ACID 84 /* Item ignores Acid Damage */ -#define TR_IGNORE_ELEC 85 /* Item ignores Elec Damage */ -#define TR_IGNORE_FIRE 86 /* Item ignores Fire Damage */ -#define TR_IGNORE_COLD 87 /* Item ignores Cold Damage */ -#define TR_ACTIVATE 88 /* Item can be activated */ -#define TR_DRAIN_EXP 89 /* Item drains Experience */ -#define TR_TELEPORT 90 /* Item teleports player */ -#define TR_AGGRAVATE 91 /* Item aggravates monsters */ -#define TR_BLESSED 92 /* Item is Blessed */ -#define TR_ES_ATTACK 93 /* Fake flag for Smith */ -#define TR_ES_AC 94 /* Fake flag for Smith */ -#define TR_KILL_GOOD 95 - -#define TR_KILL_ANIMAL 96 -#define TR_KILL_EVIL 97 -#define TR_KILL_UNDEAD 98 -#define TR_KILL_DEMON 99 -#define TR_KILL_ORC 100 -#define TR_KILL_TROLL 101 -#define TR_KILL_GIANT 102 -#define TR_KILL_HUMAN 103 -#define TR_ESP_ANIMAL 104 -#define TR_ESP_UNDEAD 105 -#define TR_ESP_DEMON 106 -#define TR_ESP_ORC 107 -#define TR_ESP_TROLL 108 -#define TR_ESP_GIANT 109 -#define TR_ESP_DRAGON 110 -#define TR_ESP_HUMAN 111 -#define TR_ESP_EVIL 112 -#define TR_ESP_GOOD 113 -#define TR_ESP_NONLIVING 114 -#define TR_ESP_UNIQUE 115 -#define TR_FULL_NAME 116 -#define TR_FIXED_FLAVOR 117 -#define TR_ADD_L_CURSE 118 -#define TR_ADD_H_CURSE 119 -#define TR_DRAIN_HP 120 -#define TR_DRAIN_MANA 121 -#define TR_LITE_2 122 -#define TR_LITE_3 123 -#define TR_LITE_M1 124 /* Permanent decrease Light Area (-1) */ -#define TR_LITE_M2 125 /* Permanent decrease Light Area (-1) */ -#define TR_LITE_M3 126 /* Permanent decrease Light Area (-1) */ -#define TR_LITE_FUEL 127 /* Lights need Fuels */ - -#define TR_CALL_ANIMAL 128 -#define TR_CALL_DEMON 129 -#define TR_CALL_DRAGON 130 -#define TR_CALL_UNDEAD 131 -#define TR_COWARDICE 132 -#define TR_LOW_MELEE 133 -#define TR_LOW_AC 134 -#define TR_LOW_MAGIC 135 -#define TR_FAST_DIGEST 136 -#define TR_SLOW_REGEN 137 - -#define TR_FLAG_MAX 138 -#define TR_FLAG_SIZE 5 #define TRG_INSTA_ART 0x00000001L /* Item must be an artifact */ diff --git a/src/object.h b/src/object.h index 325b96cac..e781f2e1b 100644 --- a/src/object.h +++ b/src/object.h @@ -29,6 +29,153 @@ * is holding the object. Objects being held have "ix=0" and "iy=0". */ +#define TR_STR 0 /* STR += "pval" */ +#define TR_INT 1 /* INT += "pval" */ +#define TR_WIS 2 /* WIS += "pval" */ +#define TR_DEX 3 /* DEX += "pval" */ +#define TR_CON 4 /* CON += "pval" */ +#define TR_CHR 5 /* CHR += "pval" */ +#define TR_MAGIC_MASTERY 6 /* Later */ +#define TR_FORCE_WEAPON 7 /* Later */ +#define TR_STEALTH 8 /* Stealth += "pval" */ +#define TR_SEARCH 9 /* Search += "pval" */ +#define TR_INFRA 10 /* Infra += "pval" */ +#define TR_TUNNEL 11 /* Tunnel += "pval" */ +#define TR_SPEED 12 /* Speed += "pval" */ +#define TR_BLOWS 13 /* Blows += "pval" */ +#define TR_CHAOTIC 14 +#define TR_VAMPIRIC 15 +#define TR_SLAY_ANIMAL 16 +#define TR_SLAY_EVIL 17 +#define TR_SLAY_UNDEAD 18 +#define TR_SLAY_DEMON 19 +#define TR_SLAY_ORC 20 +#define TR_SLAY_TROLL 21 +#define TR_SLAY_GIANT 22 +#define TR_SLAY_DRAGON 23 +#define TR_KILL_DRAGON 24 /* Execute Dragon */ +#define TR_VORPAL 25 /* Later */ +#define TR_IMPACT 26 /* Cause Earthquakes */ +#define TR_BRAND_POIS 27 +#define TR_BRAND_ACID 28 +#define TR_BRAND_ELEC 29 +#define TR_BRAND_FIRE 30 +#define TR_BRAND_COLD 31 + +#define TR_SUST_STR 32 +#define TR_SUST_INT 33 +#define TR_SUST_WIS 34 +#define TR_SUST_DEX 35 +#define TR_SUST_CON 36 +#define TR_SUST_CHR 37 +#define TR_RIDING 38 +#define TR_EASY_SPELL 39 +#define TR_IM_ACID 40 +#define TR_IM_ELEC 41 +#define TR_IM_FIRE 42 +#define TR_IM_COLD 43 +#define TR_THROW 44 /* Later */ +#define TR_REFLECT 45 /* Reflect 'bolts' */ +#define TR_FREE_ACT 46 /* Free Action */ +#define TR_HOLD_EXP 47 /* Hold EXP */ +#define TR_RES_ACID 48 +#define TR_RES_ELEC 49 +#define TR_RES_FIRE 50 +#define TR_RES_COLD 51 +#define TR_RES_POIS 52 +#define TR_RES_FEAR 53 /* Added for Zangband */ +#define TR_RES_LITE 54 +#define TR_RES_DARK 55 +#define TR_RES_BLIND 56 +#define TR_RES_CONF 57 +#define TR_RES_SOUND 58 +#define TR_RES_SHARDS 59 +#define TR_RES_NETHER 60 +#define TR_RES_NEXUS 61 +#define TR_RES_CHAOS 62 +#define TR_RES_DISEN 63 + +#define TR_SH_FIRE 64 /* Immolation (Fire) */ +#define TR_SH_ELEC 65 /* Electric Sheath */ +#define TR_SLAY_HUMAN 66 /* Slay human */ +#define TR_SH_COLD 67 /* cold aura */ +#define TR_NO_TELE 68 /* Anti-teleportation */ +#define TR_NO_MAGIC 69 /* Anti-magic */ +#define TR_DEC_MANA 70 /* ??? */ +#define TR_TY_CURSE 71 /* The Ancient Curse */ +#define TR_WARNING 72 /* Warning */ +#define TR_HIDE_TYPE 73 /* Hide "pval" description */ +#define TR_SHOW_MODS 74 /* Always show Tohit/Todam */ +#define TR_SLAY_GOOD 75 +#define TR_LEVITATION 76 /* Feather Falling */ +#define TR_LITE_1 77 /* Light Radius 1*/ +#define TR_SEE_INVIS 78 /* See Invisible */ +#define TR_TELEPATHY 79 /* Telepathy */ +#define TR_SLOW_DIGEST 80 /* Item slows down digestion */ +#define TR_REGEN 81 /* Item induces regeneration */ +#define TR_XTRA_MIGHT 82 /* Bows get extra multiplier */ +#define TR_XTRA_SHOTS 83 /* Bows get extra shots */ +#define TR_IGNORE_ACID 84 /* Item ignores Acid Damage */ +#define TR_IGNORE_ELEC 85 /* Item ignores Elec Damage */ +#define TR_IGNORE_FIRE 86 /* Item ignores Fire Damage */ +#define TR_IGNORE_COLD 87 /* Item ignores Cold Damage */ +#define TR_ACTIVATE 88 /* Item can be activated */ +#define TR_DRAIN_EXP 89 /* Item drains Experience */ +#define TR_TELEPORT 90 /* Item teleports player */ +#define TR_AGGRAVATE 91 /* Item aggravates monsters */ +#define TR_BLESSED 92 /* Item is Blessed */ +#define TR_ES_ATTACK 93 /* Fake flag for Smith */ +#define TR_ES_AC 94 /* Fake flag for Smith */ +#define TR_KILL_GOOD 95 + +#define TR_KILL_ANIMAL 96 +#define TR_KILL_EVIL 97 +#define TR_KILL_UNDEAD 98 +#define TR_KILL_DEMON 99 +#define TR_KILL_ORC 100 +#define TR_KILL_TROLL 101 +#define TR_KILL_GIANT 102 +#define TR_KILL_HUMAN 103 +#define TR_ESP_ANIMAL 104 +#define TR_ESP_UNDEAD 105 +#define TR_ESP_DEMON 106 +#define TR_ESP_ORC 107 +#define TR_ESP_TROLL 108 +#define TR_ESP_GIANT 109 +#define TR_ESP_DRAGON 110 +#define TR_ESP_HUMAN 111 +#define TR_ESP_EVIL 112 +#define TR_ESP_GOOD 113 +#define TR_ESP_NONLIVING 114 +#define TR_ESP_UNIQUE 115 +#define TR_FULL_NAME 116 +#define TR_FIXED_FLAVOR 117 +#define TR_ADD_L_CURSE 118 +#define TR_ADD_H_CURSE 119 +#define TR_DRAIN_HP 120 +#define TR_DRAIN_MANA 121 +#define TR_LITE_2 122 +#define TR_LITE_3 123 +#define TR_LITE_M1 124 /* Permanent decrease Light Area (-1) */ +#define TR_LITE_M2 125 /* Permanent decrease Light Area (-1) */ +#define TR_LITE_M3 126 /* Permanent decrease Light Area (-1) */ +#define TR_LITE_FUEL 127 /* Lights need Fuels */ + +#define TR_CALL_ANIMAL 128 +#define TR_CALL_DEMON 129 +#define TR_CALL_DRAGON 130 +#define TR_CALL_UNDEAD 131 +#define TR_COWARDICE 132 +#define TR_LOW_MELEE 133 +#define TR_LOW_AC 134 +#define TR_LOW_MAGIC 135 +#define TR_FAST_DIGEST 136 +#define TR_SLOW_REGEN 137 + +#define TR_FLAG_MAX 138 +#define TR_FLAG_SIZE 5 + + typedef struct object_type object_type; struct object_type -- 2.11.0