OSDN Git Service

[Refactor] #37353 cnv_stat() と modify_stat_value() を player-status.c/h へ移動。
[hengband/hengband.git] / src / mind.c
index ce179fc..2b010b2 100644 (file)
@@ -22,6 +22,9 @@
 #include "player-status.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
+#include "spells-floor.h"
+#include "feature.h"
+#include "grid.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =
@@ -677,9 +680,9 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
        int             num = 0;
        TERM_LEN y = 1;
        TERM_LEN x = 10;
-       int             minfail = 0;
+       PERCENTAGE minfail = 0;
        PLAYER_LEVEL plev = p_ptr->lev;
-       int             chance = 0;
+       PERCENTAGE chance = 0;
        int             ask = TRUE;
        char            choice;
        char            out_val[160];
@@ -759,32 +762,32 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
     /* No redraw yet */
     redraw = FALSE;
 
-    for (i = 0; i < MAX_MIND_POWERS; i++)
+       for (i = 0; i < MAX_MIND_POWERS; i++)
        {
-         if (mind_ptr->info[i].min_lev <= plev)
-           {
-             num++;
-           }
+               if (mind_ptr->info[i].min_lev <= plev)
+               {
+                       num++;
+               }
        }
 
-    /* Build a prompt (accept all spells) */
-    if (only_browse)
+       /* Build a prompt (accept all spells) */
+       if (only_browse)
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                      p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
        else
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                               p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
 
        if (use_menu && !only_browse) screen_save();
-       /* Get a spell from the user */
 
-       choice= (always_show_list || use_menu) ? ESCAPE:1 ;
+       choice = (always_show_list || use_menu) ? ESCAPE : 1;
+
        while (!flag)
        {
                if(choice==ESCAPE) choice = ' '; 
@@ -836,8 +839,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
                        {
                                char psi_desc[80];
                                bool has_weapon[2];
-
-                               /* Show list */
                                redraw = TRUE;
                                if (!only_browse && !use_menu) screen_save();
 
@@ -1014,7 +1015,7 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
 static bool cast_mindcrafter_spell(int spell)
 {
        int             b = 0;
-       int             dir;
+       DIRECTION dir;
        TIME_EFFECT t;
        PLAYER_LEVEL plev = p_ptr->lev;
 
@@ -1230,7 +1231,7 @@ static bool cast_force_spell(int spell)
                MONSTER_IDX m_idx;
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               m_idx = grid_array[target_row][target_col].m_idx;
+               m_idx = current_floor_ptr->grid_array[target_row][target_col].m_idx;
                if (!m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
@@ -1284,9 +1285,9 @@ static int number_of_mirrors(void)
 {
        POSITION x, y;
        int val = 0;
-       for (x = 0; x < cur_wid; x++) {
-               for (y = 0; y < cur_hgt; y++) {
-                       if (is_mirror_grid(&grid_array[y][x])) val++;
+       for (x = 0; x < current_floor_ptr->width; x++) {
+               for (y = 0; y < current_floor_ptr->height; y++) {
+                       if (is_mirror_grid(&current_floor_ptr->grid_array[y][x])) val++;
                }
        }
        return val;
@@ -1300,7 +1301,7 @@ static int number_of_mirrors(void)
  */
 static bool cast_mirror_spell(int spell)
 {
-       int             dir;
+       DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;
        int             tmp;
        TIME_EFFECT t;
@@ -1311,7 +1312,7 @@ static bool cast_mirror_spell(int spell)
        {
                /* mirror of seeing */
        case 0:
-               tmp = is_mirror_grid(&grid_array[p_ptr->y][p_ptr->x]) ? 4 : 0;
+               tmp = is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]) ? 4 : 0;
                if (plev + tmp > 4)detect_monsters_normal(DETECT_RAD_DEFAULT);
                if (plev + tmp > 18)detect_monsters_invis(DETECT_RAD_DEFAULT);
                if (plev + tmp > 28)set_tim_esp((TIME_EFFECT)plev, FALSE);
@@ -1331,7 +1332,7 @@ static bool cast_mirror_spell(int spell)
                break;
        case 2:
                if (!get_aim_dir(&dir)) return FALSE;
-               if (plev > 9 && is_mirror_grid(&grid_array[p_ptr->y][p_ptr->x])) {
+               if (plev > 9 && is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x])) {
                        fire_beam(GF_LITE, dir, damroll(3 + ((plev - 1) / 5), 4));
                }
                else {
@@ -1367,9 +1368,9 @@ static bool cast_mirror_spell(int spell)
                break;
                /* mirror sleeping */
        case 9:
-               for (x = 0; x < cur_wid; x++) {
-                       for (y = 0; y < cur_hgt; y++) {
-                               if (is_mirror_grid(&grid_array[y][x])) {
+               for (x = 0; x < current_floor_ptr->width; x++) {
+                       for (y = 0; y < current_floor_ptr->height; y++) {
+                               if (is_mirror_grid(&current_floor_ptr->grid_array[y][x])) {
                                        project(0, 2, y, x, (HIT_POINT)plev, GF_OLD_SLEEP, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
                                }
                        }
@@ -1398,7 +1399,7 @@ static bool cast_mirror_spell(int spell)
                break;
                /* illusion light */
        case 14:
-               tmp = is_mirror_grid(&grid_array[p_ptr->y][p_ptr->x]) ? 4 : 3;
+               tmp = is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]) ? 4 : 3;
                slow_monsters(plev);
                stun_monsters(plev*tmp);
                confuse_monsters(plev*tmp);
@@ -1408,7 +1409,7 @@ static bool cast_mirror_spell(int spell)
                break;
                /* mirror shift */
        case 15:
-               if (!is_mirror_grid(&grid_array[p_ptr->y][p_ptr->x])) {
+               if (!is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x])) {
                        msg_print(_("鏡の国の場所がわからない!", "You cannot find out where is the world of mirror!"));
                        break;
                }
@@ -1474,7 +1475,7 @@ static bool cast_berserk_spell(int spell)
                y = p_ptr->y + ddy[dir];
                x = p_ptr->x + ddx[dir];
 
-               if (!grid_array[y][x].m_idx)
+               if (!current_floor_ptr->grid_array[y][x].m_idx)
                {
                        msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
                        return FALSE;
@@ -1482,13 +1483,13 @@ static bool cast_berserk_spell(int spell)
 
                py_attack(y, x, 0);
 
-               if (!player_can_enter(grid_array[y][x].feat, 0) || is_trap(grid_array[y][x].feat))
+               if (!player_can_enter(current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(current_floor_ptr->grid_array[y][x].feat))
                        break;
 
                y += ddy[dir];
                x += ddx[dir];
 
-               if (player_can_enter(grid_array[y][x].feat, 0) && !is_trap(grid_array[y][x].feat) && !grid_array[y][x].m_idx)
+               if (player_can_enter(current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(current_floor_ptr->grid_array[y][x].feat) && !current_floor_ptr->grid_array[y][x].m_idx)
                {
                        msg_print(NULL);
                        (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
@@ -1615,7 +1616,7 @@ static bool cast_ninja_spell(int spell)
                        /* Gives a multiplier of 2 at first, up to 3 at 40th */
                        do_cmd_throw(1, FALSE, slot);
 
-                       take_turn(p_ptr, 100);;
+                       take_turn(p_ptr, 100);
                }
                break;
        }
@@ -1630,12 +1631,12 @@ static bool cast_ninja_spell(int spell)
                POSITION ty, tx;
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               m_idx = grid_array[target_row][target_col].m_idx;
+               m_idx = current_floor_ptr->grid_array[target_row][target_col].m_idx;
                if (!m_idx) break;
                if (m_idx == p_ptr->riding) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
-               m_ptr = &m_list[m_idx];
+               m_ptr = &current_floor_ptr->m_list[m_idx];
                monster_desc(m_name, m_ptr, 0);
                msg_format(_("%sを引き戻した。", "You pull back %s."), m_name);
                path_n = project_path(path_g, MAX_RANGE, target_row, target_col, p_ptr->y, p_ptr->x, 0);
@@ -1644,10 +1645,10 @@ static bool cast_ninja_spell(int spell)
                {
                        POSITION ny = GRID_Y(path_g[i]);
                        POSITION nx = GRID_X(path_g[i]);
-                       grid_type *c_ptr = &grid_array[ny][nx];
+                       grid_type *g_ptr = &current_floor_ptr->grid_array[ny][nx];
 
                        if (in_bounds(ny, nx) && cave_empty_bold(ny, nx) &&
-                           !(c_ptr->info & CAVE_OBJECT) &&
+                           !(g_ptr->info & CAVE_OBJECT) &&
                                !pattern_tile(ny, nx))
                        {
                                ty = ny;
@@ -1655,14 +1656,14 @@ static bool cast_ninja_spell(int spell)
                        }
                }
                /* Update the old location */
-               grid_array[target_row][target_col].m_idx = 0;
+               current_floor_ptr->grid_array[target_row][target_col].m_idx = 0;
 
                /* Update the new location */
-               grid_array[ty][tx].m_idx = (s16b)m_idx;
+               current_floor_ptr->grid_array[ty][tx].m_idx = m_idx;
 
                /* Move the monster */
-               m_ptr->fy = (byte_hack)ty;
-               m_ptr->fx = (byte_hack)tx;
+               m_ptr->fy = ty;
+               m_ptr->fx = tx;
 
                /* Wake the monster up */
                (void)set_monster_csleep(m_idx, 0);
@@ -1752,8 +1753,8 @@ void do_cmd_mind(void)
 {
        SPELL_IDX n = 0;
        int b = 0;
-       int             chance;
-       int             minfail = 0;
+       PERCENTAGE chance;
+       PERCENTAGE minfail = 0;
        PLAYER_LEVEL plev = p_ptr->lev;
        int             old_csp = p_ptr->csp;
        mind_type       spell;
@@ -1764,7 +1765,6 @@ void do_cmd_mind(void)
 
        if (cmd_limit_confused(p_ptr)) return;
 
-       /* get power */
        if (!get_mind_power(&n, FALSE)) return;
 
 #ifdef JP
@@ -1953,24 +1953,24 @@ void do_cmd_mind(void)
                switch(use_mind)
                {
                case MIND_MINDCRAFTER:
-                       /* Cast the spell */
+                       
                        cast = cast_mindcrafter_spell(n);
                        break;
                case MIND_KI:
-                       /* Cast the spell */
+                       
                        cast = cast_force_spell(n);
                        break;
                case MIND_BERSERKER:
-                       /* Cast the spell */
+                       
                        cast = cast_berserk_spell(n);
                        break;
                case MIND_MIRROR_MASTER:
-                       /* Cast the spell */
-                       if( is_mirror_grid(&grid_array[p_ptr->y][p_ptr->x]) )on_mirror = TRUE;
+                       
+                       if( is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]) )on_mirror = TRUE;
                        cast = cast_mirror_spell(n);
                        break;
                case MIND_NINJUTSU:
-                       /* Cast the spell */
+                       
                        cast = cast_ninja_spell(n);
                        break;
                default:
@@ -1982,11 +1982,14 @@ void do_cmd_mind(void)
        }
 
 
-       take_turn(p_ptr, 100);;
        /* teleport from mirror costs small energy */
-       if( on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER )
+       if(on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER)
+       {
+         if( n==3 || n==5 || n==7 || n==16 ) take_turn(p_ptr, 50);
+       }
+       else
        {
-         if( n==3 || n==5 || n==7 || n==16 ) p_ptr->energy_use = 50;
+               take_turn(p_ptr, 100);
        }
 
        if ((use_mind == MIND_BERSERKER) || (use_mind == MIND_NINJUTSU))
@@ -2066,7 +2069,6 @@ void do_cmd_mind_browse(void)
 
        while(1)
        {
-               /* get power */
                if (!get_mind_power(&n, TRUE))
                {
                        screen_load();