OSDN Git Service

[Refactor] #37353 コメント整理 / Refactor comments.
[hengband/hengband.git] / src / xtra2.c
index b19131c..0dad02e 100644 (file)
@@ -12,6 +12,7 @@
 
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 #define REWARD_CHANCE 10
 
@@ -27,7 +28,7 @@ void check_experience(void)
        bool level_mutation = FALSE;
        bool level_inc_stat = FALSE;
        bool android = (p_ptr->prace == RACE_ANDROID ? TRUE : FALSE);
-       int  old_lev = p_ptr->lev;
+       PLAYER_LEVEL old_lev = p_ptr->lev;
 
        /* Hack -- lower limit */
        if (p_ptr->exp < 0) p_ptr->exp = 0;
@@ -99,16 +100,9 @@ void check_experience(void)
                        do_cmd_write_nikki(NIKKI_LEVELUP, p_ptr->lev, NULL);
                }
 
-               /* Sound */
                sound(SOUND_LEVEL);
 
-               /* Message */
-#ifdef JP
-msg_format("レベル %d にようこそ。", p_ptr->lev);
-#else
-               msg_format("Welcome to level %d.", p_ptr->lev);
-
-#endif
+               msg_format(_("レベル %d にようこそ。", "Welcome to level %d."), p_ptr->lev);
 
                /* Update some stuff */
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
@@ -399,7 +393,7 @@ static bool kind_is_hafted(KIND_OBJECT_IDX k_idx)
  * @param quest_num 達成状態にしたいクエストのID
  * @return なし
  */
-void complete_quest(int quest_num)
+void complete_quest(QUEST_IDX quest_num)
 {
        quest_type* const q_ptr = &quest[quest_num];
 
@@ -430,10 +424,10 @@ void complete_quest(int quest_num)
  * @brief 現在フロアに残っている敵モンスターの数を返す /
  * @return 現在の敵モンスターの数
  */
-static int count_all_hostile_monsters(void)
+static MONSTER_NUMBER count_all_hostile_monsters(void)
 {
-       int x, y;
-       int number_mon = 0;
+       POSITION x, y;
+       MONSTER_NUMBER number_mon = 0;
 
        for (x = 0; x < cur_wid; ++ x)
        {
@@ -443,7 +437,7 @@ static int count_all_hostile_monsters(void)
 
                        if (m_idx > 0 && is_hostile(&m_list[m_idx]))
                        {
-                               ++ number_mon;
+                               ++number_mon;
                        }
                }
        }
@@ -460,8 +454,7 @@ static int count_all_hostile_monsters(void)
 void check_quest_completion(monster_type *m_ptr)
 {
        POSITION y, x;
-
-       int quest_num;
+       QUEST_IDX quest_num;
 
        bool create_stairs = FALSE;
        bool reward = FALSE;
@@ -474,14 +467,14 @@ void check_quest_completion(monster_type *m_ptr)
        x = m_ptr->fx;
 
        /* Inside a quest */
-       quest_num = p_ptr->inside_quest;                
+       quest_num = p_ptr->inside_quest;
 
        /* Search for an active quest on this dungeon level */
        if (!quest_num)
        {
-               int i;
+               QUEST_IDX i;
 
-               for (i = max_quests - 1; i > 0; i--)
+               for (i = max_q_idx - 1; i > 0; i--)
                {
                        quest_type* const q_ptr = &quest[i];
                        
@@ -678,13 +671,13 @@ void check_quest_completion(monster_type *m_ptr)
  */
 void check_find_art_quest_completion(object_type *o_ptr)
 {
-       int i;
+       QUEST_IDX i;
        /* Check if completed a quest */
-       for (i = 0; i < max_quests; i++)
+       for (i = 0; i < max_q_idx; i++)
        {
-               if ((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) &&
-                   (quest[i].status == QUEST_STATUS_TAKEN) &&
-                          (quest[i].k_idx == o_ptr->name1))
+               if((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) &&
+                       (quest[i].status == QUEST_STATUS_TAKEN) &&
+                       (quest[i].k_idx == o_ptr->name1))
                {
                        complete_quest(i);
                }
@@ -793,7 +786,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                if (r_ptr->blow[i].method == RBM_EXPLODE)
                {
                        BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
-                       int typ = mbe_info[r_ptr->blow[i].effect].explode_type;
+                       EFFECT_ID typ = mbe_info[r_ptr->blow[i].effect].explode_type;
                        DICE_NUMBER d_dice = r_ptr->blow[i].d_dice;
                        DICE_SID d_side = r_ptr->blow[i].d_side;
                        HIT_POINT damage = damroll(d_dice, d_side);
@@ -1028,7 +1021,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                /* Reward for "lazy" player */
                if (p_ptr->pseikaku == SEIKAKU_NAMAKE)
                {
-                       int a_idx = 0;
+                       ARTIFACT_IDX a_idx = 0;
                        artifact_type *a_ptr = NULL;
 
                        if (!drop_chosen_item) break;
@@ -1248,7 +1241,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        /* Mega-Hack -- drop fixed items */
        if (drop_chosen_item)
        {
-               int a_idx = 0;
+               ARTIFACT_IDX a_idx = 0;
                int chance = 0;
 
                for(i = 0; i < 4; i++)
@@ -1278,7 +1271,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                if ((r_ptr->flags7 & RF7_GUARDIAN) && (d_info[dungeon_type].final_guardian == m_ptr->r_idx))
                {
-                       IDX k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
+                       KIND_OBJECT_IDX k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
                                : lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
 
                        if (d_info[dungeon_type].final_artifact)
@@ -1527,7 +1520,7 @@ static void get_exp_from_mon(HIT_POINT dam, monster_type *m_ptr)
        }
        
        /* Special penalty for rest_and_shoot exp scum */
-       if ((m_ptr->dealt_damage > (u32b)m_ptr->max_maxhp) && (m_ptr->hp >= 0))
+       if ((m_ptr->dealt_damage > m_ptr->max_maxhp) && (m_ptr->hp >= 0))
        {
                int over_damage = m_ptr->dealt_damage / m_ptr->max_maxhp;
                if (over_damage > 32) over_damage = 32;
@@ -1588,7 +1581,6 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
        bool        innocent = TRUE, thief = FALSE;
        int         i;
        int         expdam;
-       int                     dealt_damage;
 
        (void)COPY(&exp_mon, m_ptr, monster_type);
        
@@ -1615,14 +1607,11 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
        /* Genocided by chaos patron */
        if (!m_idx) return TRUE;
        
-       /* Remember dealt_damage before this attack*/
-       dealt_damage = m_ptr->dealt_damage;
-
        /* Hurt it */
        m_ptr->hp -= dam;
        
        m_ptr->dealt_damage += dam;
-       if(m_ptr->dealt_damage > (u32b)m_ptr->max_maxhp * 100) m_ptr->dealt_damage = m_ptr->max_maxhp * 100;
+       if(m_ptr->dealt_damage > m_ptr->max_maxhp * 100) m_ptr->dealt_damage = m_ptr->max_maxhp * 100;
        if (p_ptr->wizard)
        {
                msg_format( _("合計%d/%dのダメージを与えた。","You do %d (out of %d) damage."),
@@ -2034,7 +2023,7 @@ msg_format("%sを葬り去った。", m_name);
  * @param hgt_p コンソールの表示行数を返す
  * @return なし
  */
-void get_screen_size(int *wid_p, int *hgt_p)
+void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p)
 {
        Term_get_size(wid_p, hgt_p);
        *hgt_p -= ROW_MAP + 2;
@@ -2146,10 +2135,10 @@ void redraw_window(void)
  * Also used in do_cmd_locate
  * @return 実際に再描画が必要だった場合TRUEを返す
  */
-bool change_panel(int dy, int dx)
+bool change_panel(POSITION dy, POSITION dx)
 {
-       int y, x;
-       int wid, hgt;
+       POSITION y, x;
+       TERM_LEN wid, hgt;
 
        /* Get size */
        get_screen_size(&wid, &hgt);
@@ -2203,10 +2192,10 @@ bool change_panel(int dy, int dx)
  * Also used in do_cmd_locate
  * @return 実際に再描画が必要だった場合TRUEを返す
  */
-bool change_panel_xy(int y, int x)
+static bool change_panel_xy(POSITION y, POSITION x)
 {
-       int dy = 0, dx = 0;
-       int wid, hgt;
+       POSITION dy = 0, dx = 0;
+       TERM_LEN wid, hgt;
 
        /* Get size */
        get_screen_size(&wid, &hgt);
@@ -2233,8 +2222,8 @@ bool change_panel_xy(int y, int x)
  */
 void verify_panel(void)
 {
-       int y = p_ptr->y;
-       int x = p_ptr->x;
+       POSITION y = p_ptr->y;
+       POSITION x = p_ptr->x;
        int wid, hgt;
 
        int prow_min;
@@ -2720,13 +2709,11 @@ static void ang_sort_swap_distance(vptr u, vptr v, int a, int b)
 /*
  * Hack -- help "select" a location (see below)
  */
-static s16b target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx)
+static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx)
 {
-       int i, v;
-
-       int x2, y2, x3, y3, x4, y4;
-
-       int b_i = -1, b_v = 9999;
+       POSITION_IDX i, v;
+       POSITION x2, y2, x3, y3, x4, y4;
+       POSITION_IDX b_i = -1, b_v = 9999;
 
 
        /* Scan the locations */
@@ -2772,11 +2759,10 @@ static s16b target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx)
 /*
  * Hack -- determine if a given location is "interesting"
  */
-static bool target_set_accept(int y, int x)
+static bool target_set_accept(POSITION y, POSITION x)
 {
        cave_type *c_ptr;
-
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        /* Bounds */
        if (!(in_bounds(y, x))) return (FALSE);
@@ -2784,11 +2770,9 @@ static bool target_set_accept(int y, int x)
        /* Player grid is always interesting */
        if (player_bold(y, x)) return (TRUE);
 
-
        /* Handle hallucination */
        if (p_ptr->image) return (FALSE);
 
-
        /* Examine the grid */
        c_ptr = &cave[y][x];
 
@@ -2998,19 +2982,20 @@ bool show_gold_on_floor = FALSE;
  *
  * This function must handle blindness/hallucination.
  */
-static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
+static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 {
        cave_type *c_ptr = &cave[y][x];
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        cptr s1 = "", s2 = "", s3 = "", x_info = "";
        bool boring = TRUE;
-       s16b feat;
+       FEAT_IDX feat;
        feature_type *f_ptr;
-       int query = '\001';
+       char query = '\001';
        char out_val[MAX_NLEN+80];
 
 #ifdef ALLOW_EASY_FLOOR
-       int floor_list[23], floor_num = 0;
+       OBJECT_IDX floor_list[23];
+       ITEM_NUMBER floor_num = 0;
 
        /* Scan all objects in the grid */
        if (easy_floor)
@@ -3239,7 +3224,6 @@ static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
                                /* Describe the object */
                                object_desc(o_name, o_ptr, 0);
 
-                               /* Message */
 #ifdef JP
                                sprintf(out_val, "%s%s%s%s[%s]",
                                        s1, o_name, s2, s3, info);
@@ -3264,10 +3248,10 @@ static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
                                /* Display rough information about items */
 #ifdef JP
                                sprintf(out_val, "%s %d個のアイテム%s%s ['x'で一覧, %s]",
-                                       s1, floor_num, s2, s3, info);
+                                       s1, (int)floor_num, s2, s3, info);
 #else
                                sprintf(out_val, "%s%s%sa pile of %d items [x,%s]",
-                                       s1, s2, s3, floor_num, info);
+                                       s1, s2, s3, (int)floor_num, info);
 #endif
 
                                prt(out_val, 0, 0);
@@ -3287,7 +3271,7 @@ static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
                        while (1)
                        {
                                int i;
-                               IDX o_idx;
+                               OBJECT_IDX o_idx;
 
                                /* Save screen */
                                screen_save();
@@ -3300,10 +3284,10 @@ static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
                                /* Prompt */
 #ifdef JP
                                sprintf(out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]",
-                                       s1, floor_num, s2, s3, info);
+                                       s1, (int)floor_num, s2, s3, info);
 #else
                                sprintf(out_val, "%s%s%sa pile of %d items [Enter,%s]",
-                                       s1, s2, s3, floor_num, info);
+                                       s1, s2, s3, (int)floor_num, info);
 #endif
                                prt(out_val, 0, 0);
 
@@ -3511,9 +3495,9 @@ static int target_set_aux(int y, int x, BIT_FLAGS mode, cptr info)
                        if (c_ptr->mimic) sprintf(f_idx_str, "%d/%d", c_ptr->feat, c_ptr->mimic);
                        else sprintf(f_idx_str, "%d", c_ptr->feat);
 #ifdef JP
-                       sprintf(out_val, "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", s1, name, s2, s3, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, y, x, travel.cost[y][x]);
+                       sprintf(out_val, "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", s1, name, s2, s3, info, (unsigned int)c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, (int)y, (int)x, travel.cost[y][x]);
 #else
-                       sprintf(out_val, "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", s1, s2, s3, name, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, y, x);
+                       sprintf(out_val, "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", s1, s2, s3, name, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, (int)y, (int)x);
 #endif
                }
                else
@@ -3649,6 +3633,15 @@ bool target_set(BIT_FLAGS mode)
                        {
                                strcpy(info, _("q止 p自 o現 +次 -前", "q,p,o,+,-,<dir>"));
                        }
+
+                       if (cheat_sight)
+                       {
+                               char cheatinfo[30];
+                               sprintf(cheatinfo, " LOS:%d, PROJECTABLE:%d",
+                                       los(p_ptr->y, p_ptr->x, y, x),
+                                       projectable(p_ptr->y, p_ptr->x, y, x));
+                               strcat(info, cheatinfo);
+                       }
                        
                        /* Describe and Prompt */
                        while (TRUE){
@@ -3778,8 +3771,8 @@ bool target_set(BIT_FLAGS mode)
                        if (d)
                        {
                                /* Modified to scroll to monster */
-                               int y2 = panel_row_min;
-                               int x2 = panel_col_min;
+                               POSITION y2 = panel_row_min;
+                               POSITION x2 = panel_col_min;
 
                                /* Find a new monster */
                                i = target_pick(temp_y[m], temp_x[m], ddy[d], ddx[d]);
@@ -3888,6 +3881,15 @@ bool target_set(BIT_FLAGS mode)
                        /* Default prompt */
                        strcpy(info, _("q止 t決 p自 m近 +次 -前", "q,t,p,m,+,-,<dir>"));
 
+                       if (cheat_sight)
+                       {
+                               char cheatinfo[30];
+                               sprintf(cheatinfo, " LOS:%d, PROJECTABLE:%d",
+                                       los(p_ptr->y, p_ptr->x, y, x),
+                                       projectable(p_ptr->y, p_ptr->x, y, x));
+                               strcat(info, cheatinfo);
+                       }
+
                        /* Describe and Prompt (enable "TARGET_LOOK") */
                        while ((query = target_set_aux(y, x, mode | TARGET_LOOK, info)) == 0);
 
@@ -4092,6 +4094,7 @@ bool get_aim_dir(DIRECTION *dp)
        DIRECTION dir;
        char    command;
        cptr    p;
+       COMMAND_CODE code;
 
        /* Initialize */
        (*dp) = 0;
@@ -4104,17 +4107,18 @@ bool get_aim_dir(DIRECTION *dp)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-       if (repeat_pull(dp))
+       if (repeat_pull(&code))
        {
                /* Confusion? */
 
                /* Verify */
-               if (!(*dp == 5 && !target_okay()))
+               if (!(code == 5 && !target_okay()))
                {
 /*                     return (TRUE); */
-                       dir = *dp;
+                       dir = (DIRECTION)code;
                }
        }
+       *dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4209,7 +4213,7 @@ bool get_aim_dir(DIRECTION *dp)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*     repeat_push(dir); */
-       repeat_push(command_dir);
+       repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4239,6 +4243,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 {
        DIRECTION dir;
        cptr prompt;
+       COMMAND_CODE code;
 
        /* Initialize */
        (*dp) = 0;
@@ -4248,11 +4253,12 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-       if (repeat_pull(dp))
+       if (repeat_pull(&code))
        {
-               dir = *dp;
+               dir = (DIRECTION)code;
 /*             return (TRUE); */
        }
+       *dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4364,7 +4370,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*     repeat_push(dir); */
-       repeat_push(command_dir);
+       repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4376,6 +4382,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 bool get_rep_dir2(DIRECTION *dp)
 {
        DIRECTION dir;
+       COMMAND_CODE code;
 
        /* Initialize */
        (*dp) = 0;
@@ -4385,11 +4392,12 @@ bool get_rep_dir2(DIRECTION *dp)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-       if (repeat_pull(dp))
+       if (repeat_pull(&code))
        {
-               dir = *dp;
+               dir = (DIRECTION)code;
 /*             return (TRUE); */
        }
+       *dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4441,7 +4449,7 @@ bool get_rep_dir2(DIRECTION *dp)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*     repeat_push(dir); */
-       repeat_push(command_dir);
+       repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4484,27 +4492,13 @@ void gain_level_reward(int chosen_reward)
        type--;
 
 
-#ifdef JP
-sprintf(wrath_reason, "%sの怒り",
-               chaos_patrons[p_ptr->chaos_patron]);
-#else
-       sprintf(wrath_reason, "the Wrath of %s",
-               chaos_patrons[p_ptr->chaos_patron]);
-#endif
-
+       sprintf(wrath_reason, _("%sの怒り", "the Wrath of %s"), chaos_patrons[p_ptr->chaos_patron]);
 
        effect = chaos_rewards[p_ptr->chaos_patron][type];
 
        if (one_in_(6) && !chosen_reward)
        {
-#ifdef JP
-msg_format("%^sは褒美としてあなたを突然変異させた。",
-                       chaos_patrons[p_ptr->chaos_patron]);
-#else
-               msg_format("%^s rewards you with a mutation!",
-                       chaos_patrons[p_ptr->chaos_patron]);
-#endif
-
+               msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), chaos_patrons[p_ptr->chaos_patron]);
                (void)gain_random_mutation(0);
                reward = _("変異した。", "mutation");
        }
@@ -4512,29 +4506,19 @@ msg_format("%^sは褒美としてあなたを突然変異させた。",
        {
        switch (chosen_reward ? chosen_reward : effect)
        {
+
                case REW_POLY_SLF:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝、新たなる姿を必要とせり!」", "'Thou needst a new form, mortal!'"));
 
                        do_poly_self();
                        reward = _("変異した。", "polymorphing");
                        break;
+
                case REW_GAIN_EXP:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝は良く行いたり!続けよ!」", "'Well done, mortal! Lead on!'"));
 
                        if (p_ptr->prace == RACE_ANDROID)
@@ -4551,15 +4535,10 @@ msg_format("%sの声が響き渡った:",
                                reward = _("経験値を得た", "experience");
                        }
                        break;
+
                case REW_LOSE_EXP:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「下僕よ、汝それに値せず。」", "'Thou didst not deserve that, slave.'"));
 
                        if (p_ptr->prace == RACE_ANDROID)
@@ -4572,9 +4551,10 @@ msg_format("%sの声が響き渡った:",
                                reward = _("経験値を失った。", "losing experience");
                        }
                        break;
+
                case REW_GOOD_OBJ:
 #ifdef JP
-msg_format("%sの声がささやいた:",
+                       msg_format("%sの声がささやいた:",
                                chaos_patrons[p_ptr->chaos_patron]);
 #else
                        msg_format("The voice of %s whispers:",
@@ -4586,29 +4566,19 @@ msg_format("%sの声がささやいた:",
                        acquirement(p_ptr->y, p_ptr->x, 1, FALSE, FALSE, FALSE);
                        reward = _("上質なアイテムを手に入れた。", "a good item");
                        break;
+
                case REW_GREA_OBJ:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
 
                        acquirement(p_ptr->y, p_ptr->x, 1, TRUE, FALSE, FALSE);
                        reward = _("高級品のアイテムを手に入れた。", "an excellent item");
                        break;
+
                case REW_CHAOS_WP:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝の行いは貴き剣に値せり。」", "'Thy deed hath earned thee a worthy blade.'"));
 
                        /* Get local object */
@@ -4711,41 +4681,30 @@ msg_format("%sの声が響き渡った:",
                        (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
                        reward = _("(混沌)の武器を手に入れた。", "chaos weapon");
                        break;
+
                case REW_GOOD_OBS:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝の行いは貴き報いに値せり。」", "'Thy deed hath earned thee a worthy reward.'"));
 
                        acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, FALSE, FALSE, FALSE);
                        reward = _("上質なアイテムを手に入れた。", "good items");
                        break;
+
                case REW_GREA_OBS:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「下僕よ、汝の献身への我が惜しみ無き報いを見るがよい。」", "'Behold, mortal, how generously I reward thy loyalty.'"));
 
                        acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE);
                        reward = _("高級品のアイテムを手に入れた。", "excellent items");
                        break;
+
                case REW_TY_CURSE:
 #ifdef JP
-msg_format("%sの声が轟き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
+                       msg_format("%sの声が轟き渡った:", chaos_patrons[p_ptr->chaos_patron]);
 #else
-                       msg_format("The voice of %s thunders:",
-                               chaos_patrons[p_ptr->chaos_patron]);
+                       msg_format("The voice of %s thunders:", chaos_patrons[p_ptr->chaos_patron]);
 #endif
 
                        msg_print(_("「下僕よ、汝傲慢なり。」", "'Thou art growing arrogant, mortal.'"));
@@ -4753,15 +4712,10 @@ msg_format("%sの声が轟き渡った:",
                        (void)activate_ty_curse(FALSE, &count);
                        reward = _("禍々しい呪いをかけられた。", "cursing");
                        break;
+
                case REW_SUMMON_M:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「我が下僕たちよ、かの傲慢なる者を倒すべし!」", "'My pets, destroy the arrogant mortal!'"));
 
                        for (dummy = 0; dummy < randint1(5) + 1; dummy++)
@@ -4770,23 +4724,21 @@ msg_format("%sの声が響き渡った:",
                        }
                        reward = _("モンスターを召喚された。", "summoning hostile monsters");
                        break;
+
+
                case REW_H_SUMMON:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝、より強き敵を必要とせり!」", "'Thou needst worthier opponents!'"));
 
                        activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
                        reward = _("モンスターを召喚された。", "summoning many hostile monsters");
                        break;
+
+
                case REW_DO_HAVOC:
 #ifdef JP
-msg_format("%sの声が響き渡った:",
+                       msg_format("%sの声が響き渡った:",
                                chaos_patrons[p_ptr->chaos_patron]);
 #else
                        msg_format("The voice of %s booms out:",
@@ -4798,9 +4750,11 @@ msg_format("%sの声が響き渡った:",
                        call_chaos();
                        reward = _("カオスの力が渦巻いた。", "calling chaos");
                        break;
+
+
                case REW_GAIN_ABL:
 #ifdef JP
-msg_format("%sの声が鳴り響いた:",
+                       msg_format("%sの声が鳴り響いた:",
                                chaos_patrons[p_ptr->chaos_patron]);
 #else
                        msg_format("The voice of %s rings out:",
@@ -4815,9 +4769,11 @@ msg_format("%sの声が鳴り響いた:",
                                do_inc_stat(randint0(6));
                        reward = _("能力値が上がった。", "increasing a stat");
                        break;
+
+
                case REW_LOSE_ABL:
 #ifdef JP
-msg_format("%sの声が響き渡った:",
+                       msg_format("%sの声が響き渡った:",
                                chaos_patrons[p_ptr->chaos_patron]);
 #else
                        msg_format("The voice of %s booms out:",
@@ -4832,9 +4788,12 @@ msg_format("%sの声が響き渡った:",
                                (void)do_dec_stat(randint0(6));
                        reward = _("能力値が下がった。", "decreasing a stat");
                        break;
+
+
                case REW_RUIN_ABL:
+
 #ifdef JP
-msg_format("%sの声が轟き渡った:",
+                       msg_format("%sの声が轟き渡った:",
                                chaos_patrons[p_ptr->chaos_patron]);
 #else
                        msg_format("The voice of %s thunders:",
@@ -4850,21 +4809,18 @@ msg_format("%sの声が轟き渡った:",
                        }
                        reward = _("全能力値が下がった。", "decreasing all stats");
                        break;
+
                case REW_POLY_WND:
-                       msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."),
 
+                       msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."),
                                chaos_patrons[p_ptr->chaos_patron]);
                        do_poly_wounds();
                        reward = _("傷が変化した。", "polymorphing wounds");
                        break;
+
                case REW_AUGM_ABL:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
+
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
 
                        msg_print(_("「我がささやかなる賜物を受けとるがよい!」", "'Receive this modest gift from me!'"));
 
@@ -4874,56 +4830,30 @@ msg_format("%sの声が響き渡った:",
                        }
                        reward = _("全能力値が上がった。", "increasing all stats");
                        break;
+
                case REW_HURT_LOT:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「苦しむがよい、無能な愚か者よ!」", "'Suffer, pathetic fool!'"));
 
                        fire_ball(GF_DISINTEGRATE, 0, p_ptr->lev * 4, 4);
                        take_hit(DAMAGE_NOESCAPE, p_ptr->lev * 4, wrath_reason, -1);
                        reward = _("分解の球が発生した。", "generating disintegration ball");
                        break;
-          case REW_HEAL_FUL:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
-                       msg_print(_("「甦るがよい、我が下僕よ!」", "'Rise, my servant!'"));
+               case REW_HEAL_FUL:
 
-                       restore_level();
-                       (void)set_poisoned(0);
-                       (void)set_blind(0);
-                       (void)set_confused(0);
-                       (void)set_image(0);
-                       (void)set_stun(0);
-                       (void)set_cut(0);
-                       hp_player(5000);
-                       for (dummy = 0; dummy < 6; dummy++)
-                       {
-                               (void)do_res_stat(dummy);
-                       }
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
+                       (void)restore_level();
+                       (void)restore_all_status();
+                       (void)true_healing(5000);
                        reward = _("体力が回復した。", "healing");
                        break;
+
                case REW_CURSE_WP:
-                       if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) break;
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) break;
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝、武器に頼ることなかれ。」", "'Thou reliest too much on thy weapon.'"));
 
                        dummy = INVEN_RARM;
@@ -4936,16 +4866,11 @@ msg_format("%sの声が響き渡った:",
                        (void)curse_weapon(FALSE, dummy);
                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                        break;
+
                case REW_CURSE_AR:
-                       if (!inventory[INVEN_BODY].k_idx) break;
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       if (!inventory[INVEN_BODY].k_idx) break;
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝、防具に頼ることなかれ。」", "'Thou reliest too much on thine equipment.'"));
 
                        object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
@@ -4953,14 +4878,8 @@ msg_format("%sの声が響き渡った:",
                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                        break;
                case REW_PISS_OFF:
-#ifdef JP
-msg_format("%sの声がささやいた:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s whispers:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「我を怒りしめた罪を償うべし。」", "'Now thou shalt pay for annoying me.'"));
 
                        switch (randint1(4))
@@ -5004,10 +4923,10 @@ msg_format("%sの声がささやいた:",
                                        break;
                        }
                        break;
+
                case REW_WRATH:
-                       msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"),
 
-                               chaos_patrons[p_ptr->chaos_patron]);
+                       msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「死ぬがよい、下僕よ!」", "'Die, mortal!'"));
 
                        take_hit(DAMAGE_LOSELIFE, p_ptr->lev * 4, wrath_reason, -1);
@@ -5032,70 +4951,46 @@ msg_format("%sの声がささやいた:",
                        }
                        if (one_in_(2)) (void)curse_armor();
                        break;
+
                case REW_DESTRUCT:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「死と破壊こそ我が喜びなり!」", "'Death and destruction! This pleaseth me!'"));
 
                        (void)destroy_area(p_ptr->y, p_ptr->x, 25, FALSE);
                        reward = _("ダンジョンが*破壊*された。", "*destruct*ing dungeon");
                        break;
+
                case REW_GENOCIDE:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「我、汝の敵を抹殺せん!」", "'Let me relieve thee of thine oppressors!'"));
-
                        (void)symbol_genocide(0, FALSE);
                        reward = _("モンスターが抹殺された。", "genociding monsters");
                        break;
+
                case REW_MASS_GEN:
-#ifdef JP
-msg_format("%sの声が響き渡った:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("The voice of %s booms out:",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「我、汝の敵を抹殺せん!」", "'Let me relieve thee of thine oppressors!'"));
 
                        (void)mass_genocide(0, FALSE);
                        reward = _("モンスターが抹殺された。", "genociding nearby monsters");
                        break;
+
                case REW_DISPEL_C:
-#ifdef JP
-msg_format("%sの力が敵を攻撃するのを感じた!",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("You can feel the power of %s assault your enemies!",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sの力が敵を攻撃するのを感じた!", "You can feel the power of %s assault your enemies!"), chaos_patrons[p_ptr->chaos_patron]);
                        (void)dispel_monsters(p_ptr->lev * 4);
                        break;
+
                case REW_IGNORE:
-#ifdef JP
-msg_format("%sはあなたを無視した。",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#else
-                       msg_format("%s ignores you.",
-                               chaos_patrons[p_ptr->chaos_patron]);
-#endif
 
+                       msg_format(_("%sはあなたを無視した。", "%s ignores you."), chaos_patrons[p_ptr->chaos_patron]);
                        break;
+
                case REW_SER_DEMO:
+
                        msg_format(_("%sは褒美として悪魔の使いをよこした!", "%s rewards you with a demonic servant!"),chaos_patrons[p_ptr->chaos_patron]);
 
                        if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, PM_FORCE_PET))
@@ -5104,6 +4999,7 @@ msg_format("%sはあなたを無視した。",
                                reward = _("悪魔がペットになった。", "a demonic servant");
 
                        break;
+
                case REW_SER_MONS:
                        msg_format(_("%sは褒美として使いをよこした!", "%s rewards you with a servant!"),chaos_patrons[p_ptr->chaos_patron]);
 
@@ -5113,6 +5009,7 @@ msg_format("%sはあなたを無視した。",
                                reward = _("モンスターがペットになった。", "a servant");
 
                        break;
+
                case REW_SER_UNDE:
                        msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"),chaos_patrons[p_ptr->chaos_patron]);
 
@@ -5122,6 +5019,7 @@ msg_format("%sはあなたを無視した。",
                                reward = _("アンデッドがペットになった。", "an undead servant");
 
                        break;
+
                default:
                        msg_format(_("%sの声がどもった:", "The voice of %s stammers:"),
 
@@ -5525,12 +5423,14 @@ s16b gain_energy(void)
 }
 
 
-/*
- * Return bow energy 
+/*!
+ * @brief 射撃武器の攻撃に必要な基本消費エネルギーを返す/Return bow energy
+ * @param sval 射撃武器のアイテム副分類ID 
+ * @return 消費する基本エネルギー
  */
-s16b bow_energy(OBJECT_SUBTYPE_VALUE sval)
+ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval)
 {
-       int energy = 100;
+       ENERGY energy = 10000;
 
        /* Analyze the launcher */
        switch (sval)
@@ -5797,9 +5697,9 @@ void display_rumor(bool ex)
                                        r_ptr->r_sights++;
                                }
                        }
-                       else if  (strcmp(zz[0], "DUNGEON") == 0)
+                       else if (strcmp(zz[0], "DUNGEON") == 0)
                        {
-                               int d_idx;
+                               DUNGEON_IDX d_idx;
                                dungeon_info_type *d_ptr;
 
                                while (1)