[Refactor] #40392 種族を表すenum値をゲーム内表記に合わせた (ANGEL => ARCHON、DEMON => BALROG) / Adjusted...

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 4704366..8e746df 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -24,7 +24,7 @@ static bool is_leave_special_item(player_type *player_ptr, object_type *o_ptr)
 {
        if (!leave_special) return TRUE;
 
-       if (player_ptr->prace == RACE_DEMON)
+       if (player_ptr->prace == RACE_BALROG)
        {
                if (o_ptr->tval == TV_CORPSE &&
                        o_ptr->sval == SV_CORPSE &&

diff --git a/src/birth/history-generator.c b/src/birth/history-generator.c
index 3e8b365..1d06fa9 100644 (file)
--- a/src/birth/history-generator.c
+++ b/src/birth/history-generator.c
@@ -67,9 +67,9 @@ static int get_history_chart(player_type *creature_ptr)
         return 129;
     case RACE_ENT:
         return 137;
-    case RACE_ANGEL:
+    case RACE_ARCHON:
         return 142;
-    case RACE_DEMON:
+    case RACE_BALROG:
         return 145;
     case RACE_S_FAIRY:
         return 148;

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index a176c52..15910ff 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -71,7 +71,7 @@ static void decide_initial_items(player_type *creature_ptr, object_type *q_ptr)
         /* Nothing! */
         /* Vampires can drain blood of creatures */
         break;
-    case RACE_DEMON:
+    case RACE_BALROG:
         /* Demon can drain vitality from humanoid corpse */
         get_mon_num_prep(creature_ptr, monster_hook_human, NULL);
         for (int i = rand_range(3, 4); i > 0; i--) {

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index cc20bc7..770af4a 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -411,7 +411,7 @@ void exe_eat_food(player_type *creature_ptr, INVENTORY_IDX item)
                return;
        }
 
-       if ((PRACE_IS_(creature_ptr, RACE_DEMON) ||
+       if ((PRACE_IS_(creature_ptr, RACE_BALROG) ||
                (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)) &&
                (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE &&
                        my_strchr("pht", r_info[o_ptr->pval].d_char)))
@@ -444,7 +444,7 @@ void exe_eat_food(player_type *creature_ptr, INVENTORY_IDX item)
        else if (PRACE_IS_(creature_ptr, RACE_GOLEM) ||
                PRACE_IS_(creature_ptr, RACE_ZOMBIE) ||
                PRACE_IS_(creature_ptr, RACE_ENT) ||
-               PRACE_IS_(creature_ptr, RACE_DEMON) ||
+               PRACE_IS_(creature_ptr, RACE_BALROG) ||
                PRACE_IS_(creature_ptr, RACE_ANDROID) ||
                PRACE_IS_(creature_ptr, RACE_SPECTRE) ||
                (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 8351c77..dff46f3 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -115,7 +115,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
 
                        if (!(PRACE_IS_(creature_ptr, RACE_GOLEM) ||
                              PRACE_IS_(creature_ptr, RACE_ZOMBIE) ||
-                             PRACE_IS_(creature_ptr, RACE_DEMON) ||
+                             PRACE_IS_(creature_ptr, RACE_BALROG) ||
                              PRACE_IS_(creature_ptr, RACE_ANDROID) ||
                              PRACE_IS_(creature_ptr, RACE_SPECTRE) ||
                              (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)))
@@ -531,7 +531,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
                                break;
                        case RACE_GOLEM:
                        case RACE_ZOMBIE:
-                       case RACE_DEMON:
+                       case RACE_BALROG:
                        case RACE_SPECTRE:
                                set_food(creature_ptr, creature_ptr->food + ((q_ptr->pval) / 20));
                                break;

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 902c7cc..d661dbe 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -1492,7 +1492,7 @@ static void py_attack_aux(player_type *attacker_ptr, POSITION y, POSITION x, boo
                                                case RACE_ZOMBIE:
                                                case RACE_VAMPIRE:
                                                case RACE_SPECTRE:
-                                               case RACE_DEMON:
+                                               case RACE_BALROG:
                                                case RACE_DRACONIAN:
                                                        mult = 30; break;
                                                default:
@@ -3565,7 +3565,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
                                                case RACE_VAMPIRE:
                                                case RACE_SPECTRE:
                                                case RACE_SKELETON:
-                                               case RACE_DEMON:
+                                               case RACE_BALROG:
                                                case RACE_GOLEM:
                                                case RACE_ANDROID:
                                                        resist_drain = TRUE;

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index 3c5a60d..b704063 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -91,7 +91,7 @@ void effect_player_death_ray(player_type *target_ptr,
   case RACE_SKELETON:
   case RACE_ZOMBIE:
   case RACE_VAMPIRE:
-  case RACE_DEMON:
+  case RACE_BALROG:
   case RACE_SPECTRE: {
     ep_ptr->dam = 0;
     break;

diff --git a/src/mind/racial.c b/src/mind/racial.c
index ad91fd7..4008692 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -702,7 +702,7 @@ static bool exe_racial_power(player_type *creature_ptr, s32b command)
                        else (void)sleep_monsters(creature_ptr, plev);
                        break;
 
-               case RACE_DEMON:
+               case RACE_BALROG:
                        return demonic_breath(creature_ptr); 
                        break;
 
@@ -1324,7 +1324,7 @@ void do_cmd_racial_power(player_type *creature_ptr)
                        power_desc[num].fail = 15;
                        power_desc[num++].number = -1;
                        break;
-               case RACE_DEMON:
+               case RACE_BALROG:
                        sprintf(power_desc[num].name, _("地獄/火炎のブレス (ダメージ %d)", "Nether or Fire Breath (dam %d)"), lvl * 3);
                        power_desc[num].level = 15;
                        power_desc[num].cost = 10 + lvl / 3;

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index 8fc0b90..e79ad6c 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -907,7 +907,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx)
 
        if (r_ptr->flags4 & RF4_BR_FIRE)
        {
-               if (!((creature_ptr->prace == RACE_DEMON) && creature_ptr->lev > 44))
+               if (!((creature_ptr->prace == RACE_BALROG) && creature_ptr->lev > 44))
                {
                        if (!creature_ptr->immune_fire && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) return TRUE;
                        if (creature_ptr->special_defense & DEFENSE_FIRE) return TRUE;

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 4b8aec6..6bc8eb1 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -132,7 +132,7 @@ bool item_tester_hook_eatable(object_type *o_ptr)
                if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)
                        return TRUE;
        }
-       else if (PRACE_IS_(p_ptr, RACE_DEMON) || (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
+       else if (PRACE_IS_(p_ptr, RACE_BALROG) || (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
        {
                if (o_ptr->tval == TV_CORPSE &&
                        o_ptr->sval == SV_CORPSE &&

diff --git a/src/object/warning.c b/src/object/warning.c
index 7f2a939..6c03d7a 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -234,7 +234,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
                case RACE_SKELETON:
                case RACE_ZOMBIE:
                case RACE_VAMPIRE:
-               case RACE_DEMON:
+               case RACE_BALROG:
                case RACE_SPECTRE:
                        dam = 0;
                        ignore_wraith_form = TRUE;

diff --git a/src/player/avatar.c b/src/player/avatar.c
index d0a423b..d1c3d23 100644 (file)
--- a/src/player/avatar.c
+++ b/src/player/avatar.c
@@ -336,7 +336,7 @@ void get_virtues(player_type *creature_ptr)
        case RACE_HIGH_ELF: case RACE_KUTAR:
                creature_ptr->vir_types[i++] = V_VITALITY;
                break;
-       case RACE_HALF_GIANT: case RACE_GOLEM: case RACE_ANGEL: case RACE_DEMON:
+       case RACE_HALF_GIANT: case RACE_GOLEM: case RACE_ARCHON: case RACE_BALROG:
                creature_ptr->vir_types[i++] = V_JUSTICE;
                break;
        case RACE_HALF_TITAN:

diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c
index d9f75b6..345621e 100644 (file)
--- a/src/player/permanent-resistances.c
+++ b/src/player/permanent-resistances.c
@@ -409,13 +409,13 @@ static void add_race_flags(player_type *creature_ptr, BIT_FLAGS *flags)
                add_flag(flags, TR_RES_CONF);
                break;
        }
-       case RACE_ANGEL:
+       case RACE_ARCHON:
        {
                add_flag(flags, TR_LEVITATION);
                add_flag(flags, TR_SEE_INVIS);
                break;
        }
-       case RACE_DEMON:
+       case RACE_BALROG:
        {
                add_flag(flags, TR_RES_FIRE);
                add_flag(flags, TR_RES_NETHER);

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 9d137d8..bbb998b 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -269,7 +269,7 @@ void reset_tim_flags(player_type *creature_ptr)
        while(creature_ptr->energy_need < 0) creature_ptr->energy_need += ENERGY_NEED();
        creature_ptr->timewalk = FALSE;
 
-       if (PRACE_IS_(creature_ptr, RACE_DEMON) && (creature_ptr->lev > 44)) creature_ptr->oppose_fire = 1;
+       if (PRACE_IS_(creature_ptr, RACE_BALROG) && (creature_ptr->lev > 44)) creature_ptr->oppose_fire = 1;
        if ((creature_ptr->pclass == CLASS_NINJA) && (creature_ptr->lev > 44)) creature_ptr->oppose_pois = 1;
        if (creature_ptr->pclass == CLASS_BERSERKER) creature_ptr->shero = 1;
 
@@ -2347,7 +2347,7 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
        if (creature_ptr->is_dead) return FALSE;
 
-       if ((PRACE_IS_(creature_ptr, RACE_DEMON) && (creature_ptr->lev > 44)) || (creature_ptr->mimic_form == MIMIC_DEMON)) v = 1;
+       if ((PRACE_IS_(creature_ptr, RACE_BALROG) && (creature_ptr->lev > 44)) || (creature_ptr->mimic_form == MIMIC_DEMON)) v = 1;
        if (v)
        {
                if (creature_ptr->oppose_fire && !do_dec)

diff --git a/src/player/player-race.c b/src/player/player-race.c
index 5cfecf3..86ddb66 100644 (file)
--- a/src/player/player-race.c
+++ b/src/player/player-race.c
@@ -85,10 +85,10 @@ SYMBOL_CODE get_summon_symbol_from_player(player_type *creature_ptr)
                case RACE_ENT:
                        symbol = '#';
                        break;
-               case RACE_ANGEL:
+               case RACE_ARCHON:
                        symbol = 'A';
                        break;
-               case RACE_DEMON:
+               case RACE_BALROG:
                        symbol = 'U';
                        break;
                default:

diff --git a/src/player/player-races-table.h b/src/player/player-races-table.h
index b192e3a..51906a6 100644 (file)
--- a/src/player/player-races-table.h
+++ b/src/player/player-races-table.h
@@ -35,8 +35,8 @@ typedef enum player_race_table {
     RACE_SPRITE = 28,
     RACE_BEASTMAN = 29,
     RACE_ENT = 30,
-    RACE_ANGEL = 31,
-    RACE_DEMON = 32,
+    RACE_ARCHON = 31,
+    RACE_BALROG = 32,
     RACE_DUNADAN = 33,
     RACE_S_FAIRY = 34,
     RACE_KUTAR = 35,

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 8500567..eabc93b 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -1733,11 +1733,11 @@ void calc_bonuses(player_type *creature_ptr)
                        if (creature_ptr->lev > 40) creature_ptr->stat_add[A_CON]++;
                        if (creature_ptr->lev > 45) creature_ptr->stat_add[A_CON]++;
                        break;
-               case RACE_ANGEL:
+               case RACE_ARCHON:
                        creature_ptr->levitation = TRUE;
                        creature_ptr->see_inv = TRUE;
                        break;
-               case RACE_DEMON:
+               case RACE_BALROG:
                        creature_ptr->resist_fire = TRUE;
                        creature_ptr->resist_neth = TRUE;
                        creature_ptr->hold_exp = TRUE;
@@ -3498,10 +3498,10 @@ static void calc_alignment(player_type *creature_ptr)
        {
                switch (creature_ptr->prace)
                {
-               case RACE_ANGEL:
+               case RACE_ARCHON:
                        creature_ptr->align += 200;
                        break;
-               case RACE_DEMON:
+               case RACE_BALROG:
                        creature_ptr->align -= 200;
                        break;
                }
@@ -4634,7 +4634,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
 
                see_eldritch_horror(m_name, r_ptr);
                if (PRACE_IS_(creature_ptr, RACE_IMP) ||
-                       PRACE_IS_(creature_ptr, RACE_DEMON) ||
+                       PRACE_IS_(creature_ptr, RACE_BALROG) ||
                        (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON) ||
                        current_world_ptr->wizard)
                        return;
@@ -4697,7 +4697,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
                        switch (creature_ptr->prace)
                        {
                        case RACE_IMP:
-                       case RACE_DEMON:
+                       case RACE_BALROG:
                                if (saving_throw(20 + creature_ptr->lev)) return;
                                break;
                        case RACE_SKELETON:

diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c
index 27fc62a..2b6ba99 100644 (file)
--- a/src/player/selfinfo.c
+++ b/src/player/selfinfo.c
@@ -335,7 +335,7 @@ void self_knowledge(player_type *creature_ptr)
                                info[i++] = _("あなたは敵を眠らせる魔法の粉を投げることができる。(12 MP)", "You can throw magical dust which induces sleep (cost 12).");
                        }
                        break;
-               case RACE_DEMON:
+               case RACE_BALROG:
                        sprintf(Dummy, _("あなたは %d ダメージの地獄か火炎のブレスを吐くことができる。(%d MP)",
                                "You can breathe nether, dam. %d (cost %d)."), 3 * plev, 10 + plev / 3);