From 0033d3970fa3da8defd2126c6b67056f70b3fb87 Mon Sep 17 00:00:00 2001 From: Hourier Date: Wed, 27 May 2020 21:15:53 +0900 Subject: [PATCH] [Refactor] #40399 Separated tr-types.h from object.h --- Hengband/Hengband/Hengband.vcxproj | 1 + Hengband/Hengband/Hengband.vcxproj.filters | 3 + src/Makefile.am | 1 + src/cmd/cmd-activate.h | 4 +- src/cmd/cmd-basic.c | 1 + src/cmd/cmd-smith.c | 3 +- src/combat/player-attack.c | 1 + src/combat/shoot.c | 1 + src/combat/slaying.c | 1 + src/dungeon/dungeon-file.c | 1 + src/effect/effect-item.c | 1 + src/inventory/inventory-curse.c | 5 +- src/io/load.c | 1 + src/knowledge/knowledge-inventory.c | 1 + src/market/building-craft-fix.c | 3 +- src/market/building-craft-weapon.c | 1 + src/mind/samurai-slaying.c | 1 + src/monster/monster-object.c | 1 + src/object/artifact.c | 1 + src/object/death-scythe.c | 1 + src/object/object-boost.c | 1 + src/object/object-broken.c | 1 + src/object/object-curse.c | 1 + src/object/object-flavor.c | 1 + src/object/object-hook.c | 1 + src/object/object.h | 144 --------------------------- src/object/object1.c | 1 + src/object/object2.c | 1 + src/object/tr-types.h | 151 +++++++++++++++++++++++++++++ src/object/warning.c | 1 + src/player/permanent-resistances.c | 1 + src/player/player-damage.c | 1 + src/player/player-status.c | 1 + src/player/race-resistances.c | 1 + src/player/selfinfo.c | 1 + src/player/temporary-resistances.c | 1 + src/realm/realm-hex.c | 1 + src/realm/realm-hissatsu.c | 1 + src/spell/spells-object.c | 2 +- src/spell/spells3.c | 1 + src/store/store-util.c | 1 + src/view/display-characteristic.c | 1 + src/view/display-player-stat-info.c | 1 + src/view/status-first-page.c | 1 + src/wizard/wizard-spoiler.c | 3 +- 45 files changed, 202 insertions(+), 152 deletions(-) create mode 100644 src/object/tr-types.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index faa244818..7d9ea80d9 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -501,6 +501,7 @@ + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 35b4c7ba1..ec72f089b 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2140,6 +2140,9 @@ util + + object + diff --git a/src/Makefile.am b/src/Makefile.am index 79b76bc6b..13623afa1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -204,6 +204,7 @@ hengband_SOURCES = \ object/object-ego.c object/object-ego.h \ object/warning.c object/warning.h \ object/death-scythe.c object/death-scythe.h \ + object/tr-types.h \ \ inventory/simple-appraiser.c inventory/simple-appraiser.h \ inventory/inventory-curse.c inventory/inventory-curse.h \ diff --git a/src/cmd/cmd-activate.h b/src/cmd/cmd-activate.h index d0d805b1a..040fcc212 100644 --- a/src/cmd/cmd-activate.h +++ b/src/cmd/cmd-activate.h @@ -1,5 +1,7 @@ #pragma once +#include "object/tr-types.h" + extern void do_cmd_activate(player_type *user_ptr); extern void exe_activate(player_type *user_ptr, INVENTORY_IDX item); extern bool activate_artifact(player_type *user_ptr, object_type *o_ptr); @@ -19,7 +21,7 @@ typedef struct { extern const activation_type activation_info[]; typedef struct { - int flag; + tr_type flag; int type; concptr name; } dragonbreath_type; diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index 44a8e3ee4..b91b1e458 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -56,6 +56,7 @@ #include "spell/spells3.h" #include "core/output-updater.h" #include "cmd/cmd-attack.h" +#include "object/tr-types.h" /*! * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理 diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c index 84cfdd40c..4d9c22783 100644 --- a/src/cmd/cmd-smith.c +++ b/src/cmd/cmd-smith.c @@ -12,8 +12,7 @@ #include "autopick/autopick.h" #include "view/display-main-window.h" #include "inventory/player-inventory.h" - - +#include "object/tr-types.h" /*! * エッセンス情報の構造体 / A structure for smithing diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c index 93c383d02..5b448ebac 100644 --- a/src/combat/player-attack.c +++ b/src/combat/player-attack.c @@ -28,6 +28,7 @@ #include "realm/realm-hex.h" #include "spell/spells-floor.h" #include "world/world.h" +#include "object/tr-types.h" static player_attack_type *initialize_player_attack_type( player_attack_type *pa_ptr, s16b hand, combat_options mode, monster_type *m_ptr, grid_type *g_ptr, bool *fear, bool *mdeath) diff --git a/src/combat/shoot.c b/src/combat/shoot.c index be6a8c336..98e0b819b 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -26,6 +26,7 @@ #include "io/targeting.h" #include "effect/spells-effect-util.h" #include "spell/process-effect.h" +#include "object/tr-types.h" /*! * @brief 矢弾を射撃した際のスレイ倍率をかけた結果を返す / diff --git a/src/combat/slaying.c b/src/combat/slaying.c index 99a4b7081..f539f8fad 100644 --- a/src/combat/slaying.c +++ b/src/combat/slaying.c @@ -3,6 +3,7 @@ #include "object/artifact.h" #include "realm/realm-hex.h" #include "mind/samurai-slaying.h" +#include "object/tr-types.h" /*! * @brief プレイヤー攻撃の種族スレイング倍率計算 diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index 43280a224..ef2e4de34 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -67,6 +67,7 @@ #include "combat/monster-attack-types.h" #include "main/init.h" +#include "object/tr-types.h" dungeon_grid letter[255]; diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c index c35524172..c9fbab799 100644 --- a/src/effect/effect-item.c +++ b/src/effect/effect-item.c @@ -6,6 +6,7 @@ #include "autopick/autopick.h" #include "spell/spells-type.h" #include "spell/spells3.h" +#include "object/tr-types.h" /*! * @brief 汎用的なビーム/ボルト/ボール系によるアイテムオブジェクトへの効果処理 / Handle a beam/bolt/ball causing damage to a monster. diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c index fd34c8d35..679dc4983 100644 --- a/src/inventory/inventory-curse.c +++ b/src/inventory/inventory-curse.c @@ -13,6 +13,7 @@ #include "player/player-effects.h" #include "object/object-kind.h" #include "player/player-races-table.h" +#include "object/tr-types.h" static bool is_specific_curse(BIT_FLAGS flag) { @@ -37,7 +38,7 @@ static void choise_cursed_item(BIT_FLAGS flag, object_type *o_ptr, int *choices, if (!is_specific_curse(flag)) return; - u32b cf = 0L; + tr_type cf = 0; BIT_FLAGS flgs[TR_FLAG_SIZE]; object_flags(o_ptr, flgs); switch (flag) { @@ -87,7 +88,7 @@ static void choise_cursed_item(BIT_FLAGS flag, object_type *o_ptr, int *choices, break; } - if (!have_flag(flgs, cf)) + if (!have_flag(flgs, (long)cf)) return; choices[*number] = item_num; diff --git a/src/io/load.c b/src/io/load.c index df800b646..243bb6c08 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -88,6 +88,7 @@ #include "birth/quick-start.h" #include "player/player-races-table.h" #include "market/bounty.h" +#include "object/tr-types.h" /* * Maximum number of tries for selection of a proper quest monster diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c index ab1fb838a..6910efaf3 100644 --- a/src/knowledge/knowledge-inventory.c +++ b/src/knowledge/knowledge-inventory.c @@ -13,6 +13,7 @@ #include "floor/floor-town.h" #include "object/object-hook.h" #include "object/object-kind.h" +#include "object/tr-types.h" static concptr inven_res_label = _( " 酸電火冷毒光闇破轟獄因沌劣 盲怖乱痺透命感消復浮", diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c index f499e1515..e45b1178d 100644 --- a/src/market/building-craft-fix.c +++ b/src/market/building-craft-fix.c @@ -9,6 +9,7 @@ #include "object/object-boost.h" #include "player/player-effects.h" #include "core/stuff-handler.h" +#include "object/tr-types.h" /*! * @brief 修復材料のオブジェクトから修復対象に特性を移植する。 @@ -25,7 +26,7 @@ static void give_one_ability_of_object(object_type *to_ptr, object_type *from_pt int n = 0; int cand[TR_FLAG_MAX]; - for (int i = 0; i < TR_FLAG_MAX; i++) { + for (tr_type i = 0; i < TR_FLAG_MAX; i++) { switch (i) { case TR_IGNORE_ACID: case TR_IGNORE_ELEC: diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c index 1495e0276..f776fe51f 100644 --- a/src/market/building-craft-weapon.c +++ b/src/market/building-craft-weapon.c @@ -11,6 +11,7 @@ #include "combat/attack-accuracy.h" #include "market/building-util.h" #include "core/stuff-handler.h" +#include "object/tr-types.h" /*! * @brief 攻撃時スレイによるダメージ期待値修正計算 / critical happens at i / 10000 diff --git a/src/mind/samurai-slaying.c b/src/mind/samurai-slaying.c index aff64a4c8..1e58bf435 100644 --- a/src/mind/samurai-slaying.c +++ b/src/mind/samurai-slaying.c @@ -7,6 +7,7 @@ #include "system/angband.h" #include "mind/samurai-slaying.h" #include "monster/monster-race-hook.h" +#include "object/tr-types.h" typedef struct samurai_slaying_type { MULTIPLY mult; diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c index a3c2d22a0..2df19ab87 100644 --- a/src/monster/monster-object.c +++ b/src/monster/monster-object.c @@ -7,6 +7,7 @@ #include "monster/monster-object.h" #include "object/object-flavor.h" #include "object/object-hook.h" +#include "object/tr-types.h" /*! * @brief オブジェクトのフラグを更新する diff --git a/src/object/artifact.c b/src/object/artifact.c index ff0089664..d3b55ed4d 100644 --- a/src/object/artifact.c +++ b/src/object/artifact.c @@ -34,6 +34,7 @@ #include "player/player-class.h" #include "player/player-personalities-table.h" #include "world/world.h" +#include "object/tr-types.h" /* * The artifact arrays diff --git a/src/object/death-scythe.c b/src/object/death-scythe.c index 703dc094b..6829cbc1d 100644 --- a/src/object/death-scythe.c +++ b/src/object/death-scythe.c @@ -12,6 +12,7 @@ #include "player/player-damage.h" #include "core/stuff-handler.h" #include "combat/attack-criticality.h" +#include "object/tr-types.h" /*! * @brief 死の大鎌ダメージが跳ね返ってきた時の、種族ごとのダメージ倍率を返す diff --git a/src/object/object-boost.c b/src/object/object-boost.c index dae24f0e1..14c633856 100644 --- a/src/object/object-boost.c +++ b/src/object/object-boost.c @@ -3,6 +3,7 @@ #include "object/object-boost.h" #include "object/object-boost.h" #include "cmd-activate.h" +#include "object/tr-types.h" /*! * @brief 上質以上のオブジェクトに与えるための各種ボーナスを正規乱数も加えて算出する。 diff --git a/src/object/object-broken.c b/src/object/object-broken.c index 280fec7bb..fb7c8babb 100644 --- a/src/object/object-broken.c +++ b/src/object/object-broken.c @@ -4,6 +4,7 @@ #include "spell/spells-type.h" #include "spell/process-effect.h" #include "effect/effect-characteristics.h" +#include "object/tr-types.h" /*! * @brief アイテムが酸で破損するかどうかを判定する diff --git a/src/object/object-curse.c b/src/object/object-curse.c index f07d4122e..b81308c20 100644 --- a/src/object/object-curse.c +++ b/src/object/object-curse.c @@ -3,6 +3,7 @@ #include "object/object-flavor.h" #include "object/object-hook.h" +#include "object/tr-types.h" /*! * @brief アイテムに付加される可能性のある呪いを指定する。 diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c index 5ef20ae5a..9e4a66be3 100644 --- a/src/object/object-flavor.c +++ b/src/object/object-flavor.c @@ -28,6 +28,7 @@ #include "monster/monster-race.h" #include "object/object-ego.h" #include "locale/japanese.h" +#include "object/tr-types.h" /*! * @brief アイテムの価値記述テーブル diff --git a/src/object/object-hook.c b/src/object/object-hook.c index 6bc8eb152..a0e287c50 100644 --- a/src/object/object-hook.c +++ b/src/object/object-hook.c @@ -12,6 +12,7 @@ #include "object/object-kind.h" #include "view/display-main-window.h" #include "player/player-races-table.h" +#include "object/tr-types.h" /*! * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/ diff --git a/src/object/object.h b/src/object/object.h index d1b1e2dd3..04f599231 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -28,150 +28,6 @@ * 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 #define OBJ_GOLD_LIST 480 /* First "gold" entry */ diff --git a/src/object/object1.c b/src/object/object1.c index 9b29129a0..73ff6b6a7 100644 --- a/src/object/object1.c +++ b/src/object/object1.c @@ -32,6 +32,7 @@ #include "cmd-smith.h" #include "combat/snipe.h" #include "view/display-main-window.h" +#include "object/tr-types.h" #if defined(MACH_O_CARBON) #ifdef verify diff --git a/src/object/object2.c b/src/object/object2.c index f6280c52f..a6121df2b 100644 --- a/src/object/object2.c +++ b/src/object/object2.c @@ -44,6 +44,7 @@ #include "monster/monster-race-hook.h" #include "object/object-ego.h" #include "view/display-main-window.h" +#include "object/tr-types.h" /* * todo この説明長すぎ。何とかしたい diff --git a/src/object/tr-types.h b/src/object/tr-types.h new file mode 100644 index 000000000..7ffbbfac4 --- /dev/null +++ b/src/object/tr-types.h @@ -0,0 +1,151 @@ +#pragma once + +/*! + * todo TRが何の略か分かる人、補足求む + */ +typedef enum tr_type { + TR_STR = 0, /* STR += "pval" */ + TR_INT = 1, /* INT += "pval" */ + TR_WIS = 2, /* WIS += "pval" */ + TR_DEX = 3, /* DEX += "pval" */ + TR_CON = 4, /* CON += "pval" */ + TR_CHR = 5, /* CHR += "pval" */ + TR_MAGIC_MASTERY = 6, /* Later */ + TR_FORCE_WEAPON = 7, /* Later */ + TR_STEALTH = 8, /* Stealth += "pval" */ + TR_SEARCH = 9, /* Search += "pval" */ + TR_INFRA = 10, /* Infra += "pval" */ + TR_TUNNEL = 11, /* Tunnel += "pval" */ + TR_SPEED = 12, /* Speed += "pval" */ + TR_BLOWS = 13, /* Blows += "pval" */ + TR_CHAOTIC = 14, + TR_VAMPIRIC = 15, + TR_SLAY_ANIMAL = 16, + TR_SLAY_EVIL = 17, + TR_SLAY_UNDEAD = 18, + TR_SLAY_DEMON = 19, + TR_SLAY_ORC = 20, + TR_SLAY_TROLL = 21, + TR_SLAY_GIANT = 22, + TR_SLAY_DRAGON = 23, + TR_KILL_DRAGON = 24, /* Execute Dragon */ + TR_VORPAL = 25, /* Later */ + TR_IMPACT = 26, /* Cause Earthquakes */ + TR_BRAND_POIS = 27, + TR_BRAND_ACID = 28, + TR_BRAND_ELEC = 29, + TR_BRAND_FIRE = 30, + TR_BRAND_COLD = 31, + + TR_SUST_STR = 32, + TR_SUST_INT = 33, + TR_SUST_WIS = 34, + TR_SUST_DEX = 35, + TR_SUST_CON = 36, + TR_SUST_CHR = 37, + TR_RIDING = 38, + TR_EASY_SPELL = 39, + TR_IM_ACID = 40, + TR_IM_ELEC = 41, + TR_IM_FIRE = 42, + TR_IM_COLD = 43, + TR_THROW = 44, /* Later */ + TR_REFLECT = 45, /* Reflect 'bolts' */ + TR_FREE_ACT = 46, /* Free Action */ + TR_HOLD_EXP = 47, /* Hold EXP */ + TR_RES_ACID = 48, + TR_RES_ELEC = 49, + TR_RES_FIRE = 50, + TR_RES_COLD = 51, + TR_RES_POIS = 52, + TR_RES_FEAR = 53, /* Added for Zangband */ + TR_RES_LITE = 54, + TR_RES_DARK = 55, + TR_RES_BLIND = 56, + TR_RES_CONF = 57, + TR_RES_SOUND = 58, + TR_RES_SHARDS = 59, + TR_RES_NETHER = 60, + TR_RES_NEXUS = 61, + TR_RES_CHAOS = 62, + TR_RES_DISEN = 63, + + TR_SH_FIRE = 64, /* Immolation (Fire) */ + TR_SH_ELEC = 65, /* Electric Sheath */ + TR_SLAY_HUMAN = 66, /* Slay human */ + TR_SH_COLD = 67, /* cold aura */ + TR_NO_TELE = 68, /* Anti-teleportation */ + TR_NO_MAGIC = 69, /* Anti-magic */ + TR_DEC_MANA = 70, /* ??? */ + TR_TY_CURSE = 71, /* The Ancient Curse */ + TR_WARNING = 72, /* Warning */ + TR_HIDE_TYPE = 73, /* Hide "pval" description */ + TR_SHOW_MODS = 74, /* Always show Tohit/Todam */ + TR_SLAY_GOOD = 75, + TR_LEVITATION = 76, /* Feather Falling */ + TR_LITE_1 = 77, /* Light Radius 1*/ + TR_SEE_INVIS = 78, /* See Invisible */ + TR_TELEPATHY = 79, /* Telepathy */ + TR_SLOW_DIGEST = 80, /* Item slows down digestion */ + TR_REGEN = 81, /* Item induces regeneration */ + TR_XTRA_MIGHT = 82, /* Bows get extra multiplier */ + TR_XTRA_SHOTS = 83, /* Bows get extra shots */ + TR_IGNORE_ACID = 84, /* Item ignores Acid Damage */ + TR_IGNORE_ELEC = 85, /* Item ignores Elec Damage */ + TR_IGNORE_FIRE = 86, /* Item ignores Fire Damage */ + TR_IGNORE_COLD = 87, /* Item ignores Cold Damage */ + TR_ACTIVATE = 88, /* Item can be activated */ + TR_DRAIN_EXP = 89, /* Item drains Experience */ + TR_TELEPORT = 90, /* Item teleports player */ + TR_AGGRAVATE = 91, /* Item aggravates monsters */ + TR_BLESSED = 92, /* Item is Blessed */ + TR_ES_ATTACK = 93, /* Fake flag for Smith */ + TR_ES_AC = 94, /* Fake flag for Smith */ + TR_KILL_GOOD = 95, + + TR_KILL_ANIMAL = 96, + TR_KILL_EVIL = 97, + TR_KILL_UNDEAD = 98, + TR_KILL_DEMON = 99, + TR_KILL_ORC = 100, + TR_KILL_TROLL = 101, + TR_KILL_GIANT = 102, + TR_KILL_HUMAN = 103, + TR_ESP_ANIMAL = 104, + TR_ESP_UNDEAD = 105, + TR_ESP_DEMON = 106, + TR_ESP_ORC = 107, + TR_ESP_TROLL = 108, + TR_ESP_GIANT = 109, + TR_ESP_DRAGON = 110, + TR_ESP_HUMAN = 111, + TR_ESP_EVIL = 112, + TR_ESP_GOOD = 113, + TR_ESP_NONLIVING = 114, + TR_ESP_UNIQUE = 115, + TR_FULL_NAME = 116, + TR_FIXED_FLAVOR = 117, + TR_ADD_L_CURSE = 118, + TR_ADD_H_CURSE = 119, + TR_DRAIN_HP = 120, + TR_DRAIN_MANA = 121, + TR_LITE_2 = 122, + TR_LITE_3 = 123, + TR_LITE_M1 = 124, /* Permanent decrease Light Area (-1) */ + TR_LITE_M2 = 125, /* Permanent decrease Light Area (-1) */ + TR_LITE_M3 = 126, /* Permanent decrease Light Area (-1) */ + TR_LITE_FUEL = 127, /* Lights need Fuels */ + + TR_CALL_ANIMAL = 128, + TR_CALL_DEMON = 129, + TR_CALL_DRAGON = 130, + TR_CALL_UNDEAD = 131, + TR_COWARDICE = 132, + TR_LOW_MELEE = 133, + TR_LOW_AC = 134, + TR_LOW_MAGIC = 135, + TR_FAST_DIGEST = 136, + TR_SLOW_REGEN = 137, + + TR_FLAG_MAX = 138, +} tr_type; diff --git a/src/object/warning.c b/src/object/warning.c index f88394e47..389e09579 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -20,6 +20,7 @@ #include "mspell/mspell-damage-calculator.h" #include "player/player-races-table.h" #include "combat/monster-attack-types.h" +#include "object/tr-types.h" /*! * @brief 警告を放つアイテムを選択する / diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c index 3124ae319..2f0c0f809 100644 --- a/src/player/permanent-resistances.c +++ b/src/player/permanent-resistances.c @@ -1,6 +1,7 @@ #include "permanent-resistances.h" #include "player/player-personalities-table.h" #include "player/player-races-table.h" +#include "object/tr-types.h" /*! * @brief プレーヤーの職業による耐性フラグを返す diff --git a/src/player/player-damage.c b/src/player/player-damage.c index be9f2eae1..bf439acda 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -34,6 +34,7 @@ #include "io/files-util.h" #include "inventory/inventory-damage.h" #include "mind/racial-mirror-master.h" +#include "object/tr-types.h" /*! * @brief 酸攻撃による装備のAC劣化処理 / diff --git a/src/player/player-status.c b/src/player/player-status.c index 2fe91b8b3..dc47aff6c 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -53,6 +53,7 @@ #include "player/player-races-table.h" #include "combat/attack-power-table.h" #include "mind/racial-force-trainer.h" +#include "object/tr-types.h" /*! * @brief 能力値テーブル / Abbreviations of healthy stats diff --git a/src/player/race-resistances.c b/src/player/race-resistances.c index 028be9e77..8344af937 100644 --- a/src/player/race-resistances.c +++ b/src/player/race-resistances.c @@ -1,5 +1,6 @@ #include "race-resistances.h" #include "player/player-races-table.h" +#include "object/tr-types.h" /*! * @brief プレイヤーの種族による免疫フラグを返す diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c index 2b6ba9907..7d3565086 100644 --- a/src/player/selfinfo.c +++ b/src/player/selfinfo.c @@ -25,6 +25,7 @@ #include "realm/realm.h" #include "realm/realm-hex.h" #include "realm/realm-song.h" +#include "object/tr-types.h" /*! * @brief 自己分析処理(Nethackからのアイデア) / self-knowledge... idea from nethack. diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c index 5c7b67fb7..00a57a8d7 100644 --- a/src/player/temporary-resistances.c +++ b/src/player/temporary-resistances.c @@ -2,6 +2,7 @@ #include "realm/realm-hex.h" #include "realm/realm-song.h" #include "player/player-races-table.h" +#include "object/tr-types.h" /*! * @brief プレイヤーの一時的魔法効果による耐性を返す diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c index f0050aae7..0cd92e1e3 100644 --- a/src/realm/realm-hex.c +++ b/src/realm/realm-hex.c @@ -43,6 +43,7 @@ #include "spell/process-effect.h" #include "spell/spells2.h" #include "spell/spells3.h" +#include "object/tr-types.h" #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */ diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c index cb9510573..457c1f4b8 100644 --- a/src/realm/realm-hissatsu.c +++ b/src/realm/realm-hissatsu.c @@ -29,6 +29,7 @@ #include "spell/spells-detection.h" #include "combat/combat-options-type.h" #include "cmd/cmd-attack.h" +#include "object/tr-types.h" /*! * @brief 剣術の各処理を行う diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c index 6680e0f5f..fc10894d1 100644 --- a/src/spell/spells-object.c +++ b/src/spell/spells-object.c @@ -22,7 +22,7 @@ #include "autopick/autopick.h" #include "io/targeting.h" #include "view/display-main-window.h" - +#include "object/tr-types.h" typedef struct { diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 43ccbb6c3..97aae93bb 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -68,6 +68,7 @@ #include "spell/process-effect.h" #include "mind/racial-force-trainer.h" #include "cmd/cmd-attack.h" +#include "object/tr-types.h" /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */ #define MAX_TRIES 100 diff --git a/src/store/store-util.c b/src/store/store-util.c index 717ffd390..7817bb028 100644 --- a/src/store/store-util.c +++ b/src/store/store-util.c @@ -2,6 +2,7 @@ #include "store/store-util.h" #include "object/object-hook.h" #include "object/object-kind.h" +#include "object/tr-types.h" int cur_store_num = 0; store_type *st_ptr = NULL; diff --git a/src/view/display-characteristic.c b/src/view/display-characteristic.c index 070ad38ce..5763d9798 100644 --- a/src/view/display-characteristic.c +++ b/src/view/display-characteristic.c @@ -9,6 +9,7 @@ #include "player/permanent-resistances.h" #include "player/temporary-resistances.h" #include "player/race-resistances.h" +#include "object/tr-types.h" typedef struct { BIT_FLAGS player_flags[TR_FLAG_SIZE]; diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c index fbf42b2f0..e4710ffad 100644 --- a/src/view/display-player-stat-info.c +++ b/src/view/display-player-stat-info.c @@ -13,6 +13,7 @@ #include "player/player-personality.h" #include "player/permanent-resistances.h" #include "player/player-races-table.h" +#include "object/tr-types.h" /*! * @brief プレーヤーのパラメータ基礎値 (腕力等)を18以下になるようにして返す diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c index e29cf1b6c..acd84e303 100644 --- a/src/view/status-first-page.c +++ b/src/view/status-first-page.c @@ -14,6 +14,7 @@ #include "object/object-hook.h" #include "object/object-kind.h" #include "combat/attack-power-table.h" +#include "object/tr-types.h" static TERM_COLOR likert_color = TERM_WHITE; diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c index d3fdebc6d..27aa6e8d2 100644 --- a/src/wizard/wizard-spoiler.c +++ b/src/wizard/wizard-spoiler.c @@ -27,6 +27,7 @@ #include "object/object-kind.h" #include "floor/floor-town.h" #include "io/files-util.h" +#include "object/tr-types.h" /* * The spoiler file being created @@ -491,7 +492,7 @@ static grouper group_artifact[] = */ typedef struct flag_desc { - const int flag; + const tr_type flag; concptr const desc; } flag_desc; -- 2.11.0