From f83263bd88011c94186c9eeff7f1d98bc71c92ae Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 4 Jul 2020 12:12:39 +0900 Subject: [PATCH] [Refactor] #40482 Separated mutation-flag-types.h from player-status.h --- Hengband/Hengband/Hengband.vcxproj | 1 + Hengband/Hengband/Hengband.vcxproj.filters | 3 + src/Makefile.am | 1 + src/cmd-action/cmd-attack.c | 1 + src/cmd-building/cmd-building.c | 1 + src/cmd-io/cmd-dump.c | 4 +- src/io/mutations-dump.c | 1 + src/mind/racial.c | 1 + src/mutation/mutation-flag-types.h | 106 +++++++++++++++++++++++++++++ src/mutation/mutation-processor.c | 1 + src/mutation/mutation.c | 5 +- src/object-enchant/apply-magic.c | 1 + src/object/warning.c | 1 + src/perception/simple-perception.c | 1 + src/player/eldritch-horror.c | 1 + src/player/patron.c | 1 + src/player/permanent-resistances.c | 1 + src/player/player-damage.c | 1 + src/player/player-move.c | 1 + src/player/player-status.c | 1 + src/player/player-status.h | 98 -------------------------- src/player/race-resistances.c | 1 + src/player/selfinfo.c | 1 + src/spell-kind/spells-teleport.c | 1 + src/view/display-player-stat-info.c | 1 + src/view/display-player.c | 1 + src/view/status-first-page.c | 1 + 27 files changed, 137 insertions(+), 101 deletions(-) create mode 100644 src/mutation/mutation-flag-types.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 398c87767..715db8ecf 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -671,6 +671,7 @@ + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 31678dce3..7c6a4eaf9 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -3430,6 +3430,9 @@ inventory + + mutation + diff --git a/src/Makefile.am b/src/Makefile.am index 5a961ea81..46cfa24a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -405,6 +405,7 @@ hengband_SOURCES = \ mspell/summon-checker.c mspell/summon-checker.h \ \ mutation/mutation.c mutation/mutation.h \ + mutation/mutation-flag-types.h \ mutation/mutation-processor.c mutation/mutation-processor.h \ \ object/item-tester-hooker.c object/item-tester-hooker.h \ diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c index 071367f17..4d0b5e6fd 100644 --- a/src/cmd-action/cmd-attack.c +++ b/src/cmd-action/cmd-attack.c @@ -23,6 +23,7 @@ #include "monster/monster-describer.h" #include "monster/monster-info.h" #include "monster/monster-status.h" +#include "mutation/mutation-flag-types.h" #include "object/item-use-flags.h" #include "player-attack/player-attack.h" #include "player/avatar.h" diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c index 3f032dd81..0b90ad919 100644 --- a/src/cmd-building/cmd-building.c +++ b/src/cmd-building/cmd-building.c @@ -45,6 +45,7 @@ #include "market/play-gamble.h" #include "market/poker.h" #include "monster-race/monster-race.h" +#include "mutation/mutation-flag-types.h" #include "mutation/mutation.h" #include "object-hook/hook-armor.h" #include "object-hook/hook-bow.h" diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c index 807a2a237..3303a4cff 100644 --- a/src/cmd-io/cmd-dump.c +++ b/src/cmd-io/cmd-dump.c @@ -22,8 +22,10 @@ #include "io/input-key-acceptor.h" #include "io/interpret-pref-file.h" #include "io/read-pref-file.h" -#include "main/sound-of-music.h" #include "locale/english.h" +#include "main/sound-of-music.h" +#include "mutation/mutation-flag-types.h" +#include "mutation/mutation.h" #include "player/player-personalities-types.h" #include "system/angband-version.h" #include "term/gameterm.h" diff --git a/src/io/mutations-dump.c b/src/io/mutations-dump.c index c596cea7b..736390ad1 100644 --- a/src/io/mutations-dump.c +++ b/src/io/mutations-dump.c @@ -5,6 +5,7 @@ */ #include "io/mutations-dump.h" +#include "mutation/mutation-flag-types.h" /*! * @brief ファイルポインタを通じて突然変異の一覧を出力する diff --git a/src/mind/racial.c b/src/mind/racial.c index 6768ed882..2435064da 100644 --- a/src/mind/racial.c +++ b/src/mind/racial.c @@ -42,6 +42,7 @@ #include "mind/racial-kutar.h" #include "mind/racial-vampire.h" #include "mind/stances-table.h" +#include "mutation/mutation-flag-types.h" #include "mutation/mutation.h" #include "object/item-tester-hooker.h" #include "status/bad-status-setter.h" diff --git a/src/mutation/mutation-flag-types.h b/src/mutation/mutation-flag-types.h new file mode 100644 index 000000000..51f08c7d7 --- /dev/null +++ b/src/mutation/mutation-flag-types.h @@ -0,0 +1,106 @@ +#pragma once + +typedef enum racial_flag_type { + MUT1_SPIT_ACID = 0x00000001L, /*!< 突然変異: 酸の唾 */ + MUT1_BR_FIRE = 0x00000002L, /*!< 突然変異: 炎のブレス */ + MUT1_HYPN_GAZE = 0x00000004L, /*!< 突然変異: 催眠睨み */ + MUT1_TELEKINES = 0x00000008L, /*!< 突然変異: 念動力 */ + MUT1_VTELEPORT = 0x00000010L, /*!< 突然変異: テレポート / Voluntary teleport */ + MUT1_MIND_BLST = 0x00000020L, /*!< 突然変異: 精神攻撃 */ + MUT1_RADIATION = 0x00000040L, /*!< 突然変異: 放射能 */ + MUT1_VAMPIRISM = 0x00000080L, /*!< 突然変異: 吸血 */ + MUT1_SMELL_MET = 0x00000100L, /*!< 突然変異: 金属嗅覚 */ + MUT1_SMELL_MON = 0x00000200L, /*!< 突然変異: 敵臭嗅覚 */ + MUT1_BLINK = 0x00000400L, /*!< 突然変異: ショート・テレポート */ + MUT1_EAT_ROCK = 0x00000800L, /*!< 突然変異: 岩喰い */ + MUT1_SWAP_POS = 0x00001000L, /*!< 突然変異: 位置交換 */ + MUT1_SHRIEK = 0x00002000L, /*!< 突然変異: 叫び */ + MUT1_ILLUMINE = 0x00004000L, /*!< 突然変異: 照明 */ + MUT1_DET_CURSE = 0x00008000L, /*!< 突然変異: 呪い感知 */ + MUT1_BERSERK = 0x00010000L, /*!< 突然変異: 狂戦士化 */ + MUT1_POLYMORPH = 0x00020000L, /*!< 突然変異: 変身 */ + MUT1_MIDAS_TCH = 0x00040000L, /*!< 突然変異: ミダスの手 */ + MUT1_GROW_MOLD = 0x00080000L, /*!< 突然変異: カビ発生 */ + MUT1_RESIST = 0x00100000L, /*!< 突然変異: エレメント耐性 */ + MUT1_EARTHQUAKE = 0x00200000L, /*!< 突然変異: 地震 */ + MUT1_EAT_MAGIC = 0x00400000L, /*!< 突然変異: 魔力喰い */ + MUT1_WEIGH_MAG = 0x00800000L, /*!< 突然変異: 魔力感知 */ + MUT1_STERILITY = 0x01000000L, /*!< 突然変異: 増殖阻止 */ + MUT1_HIT_AND_AWAY = 0x02000000L, /*!< 突然変異: ヒットアンドアウェイ */ + MUT1_DAZZLE = 0x04000000L, /*!< 突然変異: 眩惑 */ + MUT1_LASER_EYE = 0x08000000L, /*!< 突然変異: レーザー・アイ */ + MUT1_RECALL = 0x10000000L, /*!< 突然変異: 帰還 */ + MUT1_BANISH = 0x20000000L, /*!< 突然変異: 邪悪消滅 */ + MUT1_COLD_TOUCH = 0x40000000L, /*!< 突然変異: 凍結の手 */ + MUT1_LAUNCHER = 0x80000000L, /*!< 突然変異: アイテム投げ */ +} racial_flag_type; + +typedef enum mutation_flag_type_1 { + MUT2_BERS_RAGE = 0x00000001L, /*!< 突然変異: 狂戦士化の発作 */ + MUT2_COWARDICE = 0x00000002L, /*!< 突然変異: 臆病 */ + MUT2_RTELEPORT = 0x00000004L, /*!< 突然変異: ランダムテレポート / Random teleport, instability */ + MUT2_ALCOHOL = 0x00000008L, /*!< 突然変異: アルコール分泌 */ + MUT2_HALLU = 0x00000010L, /*!< 突然変異: 幻覚を引き起こす精神錯乱 */ + MUT2_FLATULENT = 0x00000020L, /*!< 突然変異: 猛烈な屁 */ + MUT2_SCOR_TAIL = 0x00000040L, /*!< 突然変異: サソリの尻尾 */ + MUT2_HORNS = 0x00000080L, /*!< 突然変異: ツノ */ + MUT2_BEAK = 0x00000100L, /*!< 突然変異: クチバシ */ + MUT2_ATT_DEMON = 0x00000200L, /*!< 突然変異: デーモンを引き付ける */ + MUT2_PROD_MANA = 0x00000400L, /*!< 突然変異: 制御できない魔力のエネルギー */ + MUT2_SPEED_FLUX = 0x00000800L, /*!< 突然変異: ランダムな加減速 */ + MUT2_BANISH_ALL = 0x00001000L, /*!< 突然変異: ランダムなモンスター消滅 */ + MUT2_EAT_LIGHT = 0x00002000L, /*!< 突然変異: 光源喰い */ + MUT2_TRUNK = 0x00004000L, /*!< 突然変異: 象の鼻 */ + MUT2_ATT_ANIMAL = 0x00008000L, /*!< 突然変異: 動物を引き寄せる */ + MUT2_TENTACLES = 0x00010000L, /*!< 突然変異: 邪悪な触手 */ + MUT2_RAW_CHAOS = 0x00020000L, /*!< 突然変異: 純カオス */ + MUT2_NORMALITY = 0x00040000L, /*!< 突然変異: ランダムな変異の消滅 */ + MUT2_WRAITH = 0x00080000L, /*!< 突然変異: ランダムな幽体化 */ + MUT2_POLY_WOUND = 0x00100000L, /*!< 突然変異: ランダムな傷の変化 */ + MUT2_WASTING = 0x00200000L, /*!< 突然変異: 衰弱 */ + MUT2_ATT_DRAGON = 0x00400000L, /*!< 突然変異: ドラゴンを引き寄せる */ + MUT2_WEIRD_MIND = 0x00800000L, /*!< 突然変異: ランダムなテレパシー */ + MUT2_NAUSEA = 0x01000000L, /*!< 突然変異: 落ち着きの無い胃 */ + MUT2_CHAOS_GIFT = 0x02000000L, /*!< 突然変異: カオスパトロン */ + MUT2_WALK_SHAD = 0x04000000L, /*!< 突然変異: ランダムな現実変容 */ + MUT2_WARNING = 0x08000000L, /*!< 突然変異: 警告 */ + MUT2_INVULN = 0x10000000L, /*!< 突然変異: ランダムな無敵化 */ + MUT2_SP_TO_HP = 0x20000000L, /*!< 突然変異: ランダムなMPからHPへの変換 */ + MUT2_HP_TO_SP = 0x40000000L, /*!< 突然変異: ランダムなHPからMPへの変換 */ + MUT2_DISARM = 0x80000000L, /*!< 突然変異: ランダムな武器落とし */ +} mutation_flag_type_1; + +typedef enum mutation_flag_type_2 { + MUT3_HYPER_STR = 0x00000001L, /*!< 突然変異: 超人的な力 */ + MUT3_PUNY = 0x00000002L, /*!< 突然変異: 虚弱 */ + MUT3_HYPER_INT = 0x00000004L, /*!< 突然変異: 生体コンピュータ */ + MUT3_MORONIC = 0x00000008L, /*!< 突然変異: 精神薄弱 */ + MUT3_RESILIENT = 0x00000010L, /*!< 突然変異: 弾力のある体 */ + MUT3_XTRA_FAT = 0x00000020L, /*!< 突然変異: 異常な肥満 */ + MUT3_ALBINO = 0x00000040L, /*!< 突然変異: アルビノ */ + MUT3_FLESH_ROT = 0x00000080L, /*!< 突然変異: 腐敗した肉体 */ + MUT3_SILLY_VOI = 0x00000100L, /*!< 突然変異: 間抜けなキーキー声 */ + MUT3_BLANK_FAC = 0x00000200L, /*!< 突然変異: のっぺらぼう */ + MUT3_ILL_NORM = 0x00000400L, /*!< 突然変異: 幻影に覆われた体 */ + MUT3_XTRA_EYES = 0x00000800L, /*!< 突然変異: 第三の目 */ + MUT3_MAGIC_RES = 0x00001000L, /*!< 突然変異: 魔法防御 */ + MUT3_XTRA_NOIS = 0x00002000L, /*!< 突然変異: 騒音 */ + MUT3_INFRAVIS = 0x00004000L, /*!< 突然変異: 赤外線視力 */ + MUT3_XTRA_LEGS = 0x00008000L, /*!< 突然変異: 追加の脚 */ + MUT3_SHORT_LEG = 0x00010000L, /*!< 突然変異: 短い脚 */ + MUT3_ELEC_TOUC = 0x00020000L, /*!< 突然変異: 電撃オーラ */ + MUT3_FIRE_BODY = 0x00040000L, /*!< 突然変異: 火炎オーラ */ + MUT3_WART_SKIN = 0x00080000L, /*!< 突然変異: イボ肌 */ + MUT3_SCALES = 0x00100000L, /*!< 突然変異: 鱗肌 */ + MUT3_IRON_SKIN = 0x00200000L, /*!< 突然変異: 鉄の肌 */ + MUT3_WINGS = 0x00400000L, /*!< 突然変異: 翼 */ + MUT3_FEARLESS = 0x00800000L, /*!< 突然変異: 恐れ知らず */ + MUT3_REGEN = 0x01000000L, /*!< 突然変異: 急回復 */ + MUT3_ESP = 0x02000000L, /*!< 突然変異: テレパシー */ + MUT3_LIMBER = 0x04000000L, /*!< 突然変異: しなやかな肉体 */ + MUT3_ARTHRITIS = 0x08000000L, /*!< 突然変異: 関節の痛み */ + MUT3_BAD_LUCK = 0x10000000L, /*!< 突然変異: 黒いオーラ(不運) */ + MUT3_VULN_ELEM = 0x20000000L, /*!< 突然変異: 元素攻撃弱点 */ + MUT3_MOTION = 0x40000000L, /*!< 突然変異: 正確で力強い動作 */ + MUT3_GOOD_LUCK = 0x80000000L, /*!< 突然変異: 白いオーラ(幸運) */ +} mutation_flag_type_2; diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c index 85e532c10..4c6fa584b 100644 --- a/src/mutation/mutation-processor.c +++ b/src/mutation/mutation-processor.c @@ -8,6 +8,7 @@ #include "monster-floor/place-monster-types.h" #include "monster-race/monster-race.h" #include "monster/monster-status.h" +#include "mutation/mutation-flag-types.h" #include "mutation/mutation.h" #include "object-hook/hook-checker.h" #include "object-hook/hook-enchant.h" diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c index d3b79a475..bd2229452 100644 --- a/src/mutation/mutation.c +++ b/src/mutation/mutation.c @@ -38,6 +38,7 @@ #include "monster/monster-flag-types.h" #include "monster/monster-info.h" #include "monster/smart-learn-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/item-feeling.h" #include "object-hook/hook-checker.h" #include "player/avatar.h" @@ -73,7 +74,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) int attempts_left = 20; concptr muta_desc = ""; bool muta_chosen = FALSE; - BIT_FLAGS muta_which = 0; + int muta_which = 0; // mutation_flag_type_1 とmutation_flag_type_2 の両対応とするため、敢えてint型で定義する BIT_FLAGS *muta_class = NULL; if (choose_mut) attempts_left = 1; @@ -910,7 +911,7 @@ bool lose_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) int attempts_left = 20; concptr muta_desc = ""; bool muta_chosen = FALSE; - BIT_FLAGS muta_which = 0; + int muta_which = 0; // mutation_flag_type_1 とmutation_flag_type_2 の両対応とするため、敢えてint型で定義する BIT_FLAGS *muta_class = NULL; if (choose_mut) attempts_left = 1; diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c index 2ae5f818c..346bf6f3b 100644 --- a/src/object-enchant/apply-magic.c +++ b/src/object-enchant/apply-magic.c @@ -9,6 +9,7 @@ #include "art-definition/art-armor-types.h" #include "dungeon/dungeon.h" #include "floor/floor.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/apply-magic-accessory.h" #include "object-enchant/apply-magic-armor.h" #include "object-enchant/apply-magic-others.h" diff --git a/src/object/warning.c b/src/object/warning.c index fd2c11056..ac67dee7e 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -19,6 +19,7 @@ #include "monster/monster-status.h" #include "mspell/mspell-damage-calculator.h" #include "mspell/mspell-type.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/tr-types.h" #include "object/object-flags.h" #include "object/object-flavor.h" diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c index 9d2b11641..b09a7705d 100644 --- a/src/perception/simple-perception.c +++ b/src/perception/simple-perception.c @@ -10,6 +10,7 @@ #include "game-option/disturbance-options.h" #include "inventory/inventory-describer.h" #include "inventory/inventory-slot-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/special-object-flags.h" #include "object-hook/hook-checker.h" #include "object-hook/hook-enchant.h" diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c index 3a82e95b0..1849386b6 100644 --- a/src/player/eldritch-horror.c +++ b/src/player/eldritch-horror.c @@ -19,6 +19,7 @@ #include "monster/monster-list.h" #include "monster/monster-util.h" #include "monster/smart-learn-types.h" +#include "mutation/mutation-flag-types.h" #include "status/bad-status-setter.h" #include "player/player-status.h" #include "player/mimic-info-table.h" diff --git a/src/player/patron.c b/src/player/patron.c index cd5ede073..3a2626131 100644 --- a/src/player/patron.c +++ b/src/player/patron.c @@ -7,6 +7,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "monster-race/monster-race-hook.h" +#include "mutation/mutation-flag-types.h" #include "mutation/mutation.h" #include "object-enchant/object-curse.h" #include "object/object-flavor.h" diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c index 362e424e2..0a538c089 100644 --- a/src/player/permanent-resistances.c +++ b/src/player/permanent-resistances.c @@ -1,5 +1,6 @@ #include "permanent-resistances.h" #include "inventory/inventory-slot-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/tr-types.h" #include "player/player-personalities-types.h" #include "player/player-race-types.h" diff --git a/src/player/player-damage.c b/src/player/player-damage.c index dc66cd5c7..fbe7e06cb 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -31,6 +31,7 @@ #include "monster/monster-describer.h" #include "monster/monster-description-types.h" #include "monster/monster-info.h" +#include "mutation/mutation-flag-types.h" #include "mspell/mspells3.h" #include "object-enchant/tr-types.h" #include "object-hook/hook-armor.h" diff --git a/src/player/player-move.c b/src/player/player-move.c index 81aba1e78..fb928e6e4 100644 --- a/src/player/player-move.c +++ b/src/player/player-move.c @@ -180,6 +180,7 @@ #include "monster/monster-info.h" #include "monster/monster-status.h" #include "monster/monster-update.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/special-object-flags.h" #include "object/object-flavor.h" #include "object/item-tester-hooker.h" diff --git a/src/player/player-status.c b/src/player/player-status.c index 12bde2e6e..6e7eeaea1 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -39,6 +39,7 @@ #include "monster/monster-status.h" #include "monster/monster-update.h" #include "monster/smart-learn-types.h" +#include "mutation/mutation-flag-types.h" #include "mutation/mutation.h" #include "object-enchant/object-ego.h" #include "object-enchant/special-object-flags.h" diff --git a/src/player/player-status.h b/src/player/player-status.h index f4d35e937..f0f1c9ef9 100644 --- a/src/player/player-status.h +++ b/src/player/player-status.h @@ -217,106 +217,8 @@ typedef struct player_type PATRON_IDX chaos_patron; BIT_FLAGS muta1; /*!< レイシャル型の変異 / "Activatable" mutations must be in MUT1_* */ -#define MUT1_SPIT_ACID 0x00000001L /*!< 突然変異: 酸の唾 */ -#define MUT1_BR_FIRE 0x00000002L /*!< 突然変異: 炎のブレス */ -#define MUT1_HYPN_GAZE 0x00000004L /*!< 突然変異: 催眠睨み */ -#define MUT1_TELEKINES 0x00000008L /*!< 突然変異: 念動力 */ -#define MUT1_VTELEPORT 0x00000010L /*!< 突然変異: テレポート / Voluntary teleport */ -#define MUT1_MIND_BLST 0x00000020L /*!< 突然変異: 精神攻撃 */ -#define MUT1_RADIATION 0x00000040L /*!< 突然変異: 放射能 */ -#define MUT1_VAMPIRISM 0x00000080L /*!< 突然変異: 吸血 */ -#define MUT1_SMELL_MET 0x00000100L /*!< 突然変異: 金属嗅覚 */ -#define MUT1_SMELL_MON 0x00000200L /*!< 突然変異: 敵臭嗅覚 */ -#define MUT1_BLINK 0x00000400L /*!< 突然変異: ショート・テレポート */ -#define MUT1_EAT_ROCK 0x00000800L /*!< 突然変異: 岩喰い */ -#define MUT1_SWAP_POS 0x00001000L /*!< 突然変異: 位置交換 */ -#define MUT1_SHRIEK 0x00002000L /*!< 突然変異: 叫び */ -#define MUT1_ILLUMINE 0x00004000L /*!< 突然変異: 照明 */ -#define MUT1_DET_CURSE 0x00008000L /*!< 突然変異: 呪い感知 */ -#define MUT1_BERSERK 0x00010000L /*!< 突然変異: 狂戦士化 */ -#define MUT1_POLYMORPH 0x00020000L /*!< 突然変異: 変身 */ -#define MUT1_MIDAS_TCH 0x00040000L /*!< 突然変異: ミダスの手 */ -#define MUT1_GROW_MOLD 0x00080000L /*!< 突然変異: カビ発生 */ -#define MUT1_RESIST 0x00100000L /*!< 突然変異: エレメント耐性 */ -#define MUT1_EARTHQUAKE 0x00200000L /*!< 突然変異: 地震 */ -#define MUT1_EAT_MAGIC 0x00400000L /*!< 突然変異: 魔力喰い */ -#define MUT1_WEIGH_MAG 0x00800000L /*!< 突然変異: 魔力感知 */ -#define MUT1_STERILITY 0x01000000L /*!< 突然変異: 増殖阻止 */ -#define MUT1_HIT_AND_AWAY 0x02000000L /*!< 突然変異: ヒットアンドアウェイ */ -#define MUT1_DAZZLE 0x04000000L /*!< 突然変異: 眩惑 */ -#define MUT1_LASER_EYE 0x08000000L /*!< 突然変異: レーザー・アイ */ -#define MUT1_RECALL 0x10000000L /*!< 突然変異: 帰還 */ -#define MUT1_BANISH 0x20000000L /*!< 突然変異: 邪悪消滅 */ -#define MUT1_COLD_TOUCH 0x40000000L /*!< 突然変異: 凍結の手 */ -#define MUT1_LAUNCHER 0x80000000L /*!< 突然変異: アイテム投げ */ - BIT_FLAGS muta2; /*!< 常時効果つきの変異1 / Randomly activating mutations must be MUT2_* */ -#define MUT2_BERS_RAGE 0x00000001L /*!< 突然変異: 狂戦士化の発作 */ -#define MUT2_COWARDICE 0x00000002L /*!< 突然変異: 臆病 */ -#define MUT2_RTELEPORT 0x00000004L /*!< 突然変異: ランダムテレポート / Random teleport, instability */ -#define MUT2_ALCOHOL 0x00000008L /*!< 突然変異: アルコール分泌 */ -#define MUT2_HALLU 0x00000010L /*!< 突然変異: 幻覚を引き起こす精神錯乱 */ -#define MUT2_FLATULENT 0x00000020L /*!< 突然変異: 猛烈な屁 */ -#define MUT2_SCOR_TAIL 0x00000040L /*!< 突然変異: サソリの尻尾 */ -#define MUT2_HORNS 0x00000080L /*!< 突然変異: ツノ */ -#define MUT2_BEAK 0x00000100L /*!< 突然変異: クチバシ */ -#define MUT2_ATT_DEMON 0x00000200L /*!< 突然変異: デーモンを引き付ける */ -#define MUT2_PROD_MANA 0x00000400L /*!< 突然変異: 制御できない魔力のエネルギー */ -#define MUT2_SPEED_FLUX 0x00000800L /*!< 突然変異: ランダムな加減速 */ -#define MUT2_BANISH_ALL 0x00001000L /*!< 突然変異: ランダムなモンスター消滅 */ -#define MUT2_EAT_LIGHT 0x00002000L /*!< 突然変異: 光源喰い */ -#define MUT2_TRUNK 0x00004000L /*!< 突然変異: 象の鼻 */ -#define MUT2_ATT_ANIMAL 0x00008000L /*!< 突然変異: 動物を引き寄せる */ -#define MUT2_TENTACLES 0x00010000L /*!< 突然変異: 邪悪な触手 */ -#define MUT2_RAW_CHAOS 0x00020000L /*!< 突然変異: 純カオス */ -#define MUT2_NORMALITY 0x00040000L /*!< 突然変異: ランダムな変異の消滅 */ -#define MUT2_WRAITH 0x00080000L /*!< 突然変異: ランダムな幽体化 */ -#define MUT2_POLY_WOUND 0x00100000L /*!< 突然変異: ランダムな傷の変化 */ -#define MUT2_WASTING 0x00200000L /*!< 突然変異: 衰弱 */ -#define MUT2_ATT_DRAGON 0x00400000L /*!< 突然変異: ドラゴンを引き寄せる */ -#define MUT2_WEIRD_MIND 0x00800000L /*!< 突然変異: ランダムなテレパシー */ -#define MUT2_NAUSEA 0x01000000L /*!< 突然変異: 落ち着きの無い胃 */ -#define MUT2_CHAOS_GIFT 0x02000000L /*!< 突然変異: カオスパトロン */ -#define MUT2_WALK_SHAD 0x04000000L /*!< 突然変異: ランダムな現実変容 */ -#define MUT2_WARNING 0x08000000L /*!< 突然変異: 警告 */ -#define MUT2_INVULN 0x10000000L /*!< 突然変異: ランダムな無敵化 */ -#define MUT2_SP_TO_HP 0x20000000L /*!< 突然変異: ランダムなMPからHPへの変換 */ -#define MUT2_HP_TO_SP 0x40000000L /*!< 突然変異: ランダムなHPからMPへの変換 */ -#define MUT2_DISARM 0x80000000L /*!< 突然変異: ランダムな武器落とし */ - BIT_FLAGS muta3; /*!< 常時効果つきの変異2 / Other mutations will be mainly in MUT3_* */ -#define MUT3_HYPER_STR 0x00000001L /*!< 突然変異: 超人的な力 */ -#define MUT3_PUNY 0x00000002L /*!< 突然変異: 虚弱 */ -#define MUT3_HYPER_INT 0x00000004L /*!< 突然変異: 生体コンピュータ */ -#define MUT3_MORONIC 0x00000008L /*!< 突然変異: 精神薄弱 */ -#define MUT3_RESILIENT 0x00000010L /*!< 突然変異: 弾力のある体 */ -#define MUT3_XTRA_FAT 0x00000020L /*!< 突然変異: 異常な肥満 */ -#define MUT3_ALBINO 0x00000040L /*!< 突然変異: アルビノ */ -#define MUT3_FLESH_ROT 0x00000080L /*!< 突然変異: 腐敗した肉体 */ -#define MUT3_SILLY_VOI 0x00000100L /*!< 突然変異: 間抜けなキーキー声 */ -#define MUT3_BLANK_FAC 0x00000200L /*!< 突然変異: のっぺらぼう */ -#define MUT3_ILL_NORM 0x00000400L /*!< 突然変異: 幻影に覆われた体 */ -#define MUT3_XTRA_EYES 0x00000800L /*!< 突然変異: 第三の目 */ -#define MUT3_MAGIC_RES 0x00001000L /*!< 突然変異: 魔法防御 */ -#define MUT3_XTRA_NOIS 0x00002000L /*!< 突然変異: 騒音 */ -#define MUT3_INFRAVIS 0x00004000L /*!< 突然変異: 赤外線視力 */ -#define MUT3_XTRA_LEGS 0x00008000L /*!< 突然変異: 追加の脚 */ -#define MUT3_SHORT_LEG 0x00010000L /*!< 突然変異: 短い脚 */ -#define MUT3_ELEC_TOUC 0x00020000L /*!< 突然変異: 電撃オーラ */ -#define MUT3_FIRE_BODY 0x00040000L /*!< 突然変異: 火炎オーラ */ -#define MUT3_WART_SKIN 0x00080000L /*!< 突然変異: イボ肌 */ -#define MUT3_SCALES 0x00100000L /*!< 突然変異: 鱗肌 */ -#define MUT3_IRON_SKIN 0x00200000L /*!< 突然変異: 鉄の肌 */ -#define MUT3_WINGS 0x00400000L /*!< 突然変異: 翼 */ -#define MUT3_FEARLESS 0x00800000L /*!< 突然変異: 恐れ知らず */ -#define MUT3_REGEN 0x01000000L /*!< 突然変異: 急回復 */ -#define MUT3_ESP 0x02000000L /*!< 突然変異: テレパシー */ -#define MUT3_LIMBER 0x04000000L /*!< 突然変異: しなやかな肉体 */ -#define MUT3_ARTHRITIS 0x08000000L /*!< 突然変異: 関節の痛み */ -#define MUT3_BAD_LUCK 0x10000000L /*!< 突然変異: 黒いオーラ(不運) */ -#define MUT3_VULN_ELEM 0x20000000L /*!< 突然変異: 元素攻撃弱点 */ -#define MUT3_MOTION 0x40000000L /*!< 突然変異: 正確で力強い動作 */ -#define MUT3_GOOD_LUCK 0x80000000L /*!< 突然変異: 白いオーラ(幸運) */ s16b virtues[8]; s16b vir_types[8]; diff --git a/src/player/race-resistances.c b/src/player/race-resistances.c index cf4b581b4..1df1e1f97 100644 --- a/src/player/race-resistances.c +++ b/src/player/race-resistances.c @@ -1,5 +1,6 @@ #include "race-resistances.h" #include "inventory/inventory-slot-types.h" +#include "mutation/mutation-flag-types.h" #include "player/player-race-types.h" #include "object/object-flags.h" #include "object-enchant/tr-types.h" diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c index 26591868a..9a712299d 100644 --- a/src/player/selfinfo.c +++ b/src/player/selfinfo.c @@ -17,6 +17,7 @@ #include "player/selfinfo.h" #include "inventory/inventory-slot-types.h" #include "io/input-key-acceptor.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/tr-types.h" #include "object-enchant/trc-types.h" #include "object/object-flags.h" diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c index 21585d690..d4ea0d793 100644 --- a/src/spell-kind/spells-teleport.c +++ b/src/spell-kind/spells-teleport.c @@ -34,6 +34,7 @@ #include "monster/monster-status.h" #include "monster/monster-update.h" #include "monster/smart-learn-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/tr-types.h" #include "object-hook/hook-checker.h" #include "object/object-flags.h" diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c index 69e7cb3ff..74ed00f67 100644 --- a/src/view/display-player-stat-info.c +++ b/src/view/display-player-stat-info.c @@ -8,6 +8,7 @@ #include "display-player-stat-info.h" #include "inventory/inventory-slot-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/tr-types.h" #include "object/object-flags.h" #include "player/mimic-info-table.h" diff --git a/src/view/display-player.c b/src/view/display-player.c index 30a20f3af..048f94ed9 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -14,6 +14,7 @@ #include "info-reader/fixed-map-parser.h" #include "inventory/inventory-slot-types.h" #include "knowledge/knowledge-mutations.h" +#include "mutation/mutation-flag-types.h" #include "object/object-info.h" #include "object/object-kind.h" #include "player/mimic-info-table.h" diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c index 0c94fe32c..56d54c595 100644 --- a/src/view/status-first-page.c +++ b/src/view/status-first-page.c @@ -13,6 +13,7 @@ #include "display-util.h" #include "game-option/text-display-options.h" #include "inventory/inventory-slot-types.h" +#include "mutation/mutation-flag-types.h" #include "object-enchant/special-object-flags.h" #include "object-enchant/tr-types.h" #include "object/object-flags.h" -- 2.11.0