[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / mind.c

diff --git a/src/mind.c b/src/mind.c
index 3752fae..3b3a389 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -551,22 +551,22 @@ void mindcraft_info(char *p, int use_mind, int power)
                switch (power)
                {
                case 0:  break;
-               case 1:  sprintf(p, " %s%dd%d", s_dam, 3 + ((plev - 1) / 4), 3 + plev/15); break;
-               case 2:  sprintf(p, " %s10", s_range); break;
-               case 3:  sprintf(p, " %s%d", s_range, plev * 5);  break;
+               case 1:  sprintf(p, " %s%dd%d", KWD_DAM, 3 + ((plev - 1) / 4), 3 + plev/15); break;
+               case 2:  sprintf(p, " %s10", KWD_SPHERE); break;
+               case 3:  sprintf(p, " %s%d", KWD_SPHERE, plev * 5);  break;
                case 4:  break;
-               case 5: sprintf(p, " %s%dd8", s_dam, 8 + ((plev - 5) / 4));  break;
-               case 6:  sprintf(p, " %s%d", s_dur, plev);  break;
+               case 5: sprintf(p, " %s%dd8", KWD_DAM, 8 + ((plev - 5) / 4));  break;
+               case 6:  sprintf(p, " %s%d", KWD_DURATION, plev);  break;
                case 7:  break;
-               case 8:  sprintf(p, (plev < 25 ? " %s%d" : " %sd%d"), s_dam, (plev < 25 ? plev * 3 / 2 : plev * ((plev - 5) / 10 + 1))); break;
-               case 9:  sprintf(p, " %s10+d%d", s_dur, plev * 3 / 2);  break;
+               case 8:  sprintf(p, (plev < 25 ? " %s%d" : " %sd%d"), KWD_DAM, (plev < 25 ? plev * 3 / 2 : plev * ((plev - 5) / 10 + 1))); break;
+               case 9:  sprintf(p, " %s10+d%d", KWD_DURATION, plev * 3 / 2);  break;
 #ifdef JP
                case 10: sprintf(p, " 最大重量:%d.%dkg", lbtokg1(plev * 15),lbtokg2(plev * 15));  break;
 #else
                case 10: sprintf(p, " max wgt %d", plev * 15);  break;
 #endif
-               case 11: sprintf(p, " %s%dd6", s_dam, plev / 2);  break;
-               case 12: sprintf(p, " %sd%d+%d", s_dam, plev * 3, plev * 3); break;
+               case 11: sprintf(p, " %s%dd6", KWD_DAM, plev / 2);  break;
+               case 12: sprintf(p, " %sd%d+%d", KWD_DAM, plev * 3, plev * 3); break;
                case 13: sprintf(p, _(" 行動:%ld回", " %ld acts."), (long int)(p_ptr->csp + 100-p_ptr->energy_need - 50)/100); break;
                }
                break;
@@ -578,19 +578,19 @@ void mindcraft_info(char *p, int use_mind, int power)
 
                switch (power)
                {
-               case 0:  sprintf(p, " %s%dd4", s_dam, 3 + ((plev - 1) / 5) + boost / 12); break;
+               case 0:  sprintf(p, " %s%dd4", KWD_DAM, 3 + ((plev - 1) / 5) + boost / 12); break;
                case 1:  break;
-               case 2:  sprintf(p, " %s%d+d30", s_dur, 30 + boost / 5); break;
-               case 3:  sprintf(p, " %s%dd5", s_dam, 5 + ((plev - 1) / 5) + boost / 10); break;
-               case 4:  sprintf(p, " %s%d+d20", s_dur, 20 + boost / 5); break;
+               case 2:  sprintf(p, " %s%d+d30", KWD_DURATION, 30 + boost / 5); break;
+               case 3:  sprintf(p, " %s%dd5", KWD_DAM, 5 + ((plev - 1) / 5) + boost / 10); break;
+               case 4:  sprintf(p, " %s%d+d20", KWD_DURATION, 20 + boost / 5); break;
                case 5:  break;
-               case 6:  sprintf(p, " %s%d+d%d", s_dur, 15 + boost / 7, plev / 2); break;
-               case 7:  sprintf(p, " %s%dd8", s_dam, 8 + ((plev - 5) / 4) + boost / 12); break;
-               case 8:  sprintf(p, " %s10d6+%d", s_dam, plev * 3 / 2 + boost * 3 / 5); break;
+               case 6:  sprintf(p, " %s%d+d%d", KWD_DURATION, 15 + boost / 7, plev / 2); break;
+               case 7:  sprintf(p, " %s%dd8", KWD_DAM, 8 + ((plev - 5) / 4) + boost / 12); break;
+               case 8:  sprintf(p, " %s10d6+%d", KWD_DAM, plev * 3 / 2 + boost * 3 / 5); break;
                case 9:  break;
                case 10: sprintf(p, _(" 最大%d体", " max %d"), 1+boost/100); break;
-               case 11: sprintf(p, " %s%d", s_dam, 100 + plev + boost); break;
-               case 12: sprintf(p, " %s%dd15", s_dam, 10 + plev / 2 + boost * 3 / 10); break;
+               case 11: sprintf(p, " %s%d", KWD_DAM, 100 + plev + boost); break;
+               case 12: sprintf(p, " %s%dd15", KWD_DAM, 10 + plev / 2 + boost * 3 / 10); break;
                case 13: sprintf(p, _(" 行動:%d+d16回", " %d+d16 acts"), 16+boost/20); break;
                }
                break;
@@ -601,25 +601,25 @@ void mindcraft_info(char *p, int use_mind, int power)
                {
                case 0:  break;
                case 1:  break;
-               case 2:  sprintf(p, " %s%dd4", s_dam,  3 + ((plev - 1) / 5) ); break;
-               case 3:  sprintf(p, " %s10", s_range); break;
+               case 2:  sprintf(p, " %s%dd4", KWD_DAM,  3 + ((plev - 1) / 5) ); break;
+               case 3:  sprintf(p, " %s10", KWD_SPHERE); break;
                case 4:  break;
-               case 5:  sprintf(p, " %s%d", s_range, plev *5); break;
-               case 6:  sprintf(p, " %s20+d20", s_dur);  break;
+               case 5:  sprintf(p, " %s%d", KWD_SPHERE, plev *5); break;
+               case 6:  sprintf(p, " %s20+d20", KWD_DURATION);  break;
                case 7:  break;
-               case 8:  sprintf(p, " %s%dd8", s_dam, 8+((plev -5)/4) ); break;
+               case 8:  sprintf(p, " %s%dd8", KWD_DAM, 8+((plev -5)/4) ); break;
                case 9:  break;
-               case 10: sprintf(p, " %s%dd8", s_dam, 11+(plev-5)/4 ); break;
+               case 10: sprintf(p, " %s%dd8", KWD_DAM, 11+(plev-5)/4 ); break;
                case 11: break;
-               case 12: sprintf(p, " %s20+d20", s_dur);  break;
-               case 13: sprintf(p, " %s150+d%d", s_dam, plev*2 ); break;
+               case 12: sprintf(p, " %s20+d20", KWD_DURATION);  break;
+               case 13: sprintf(p, " %s150+d%d", KWD_DAM, plev*2 ); break;
                case 14: break;
                case 15: break;
-               case 16: sprintf(p, " %s%d", s_range, plev/2 +10); break;
+               case 16: sprintf(p, " %s%d", KWD_SPHERE, plev/2 +10); break;
                case 17: break;
-               case 18: sprintf(p, " %s6+d6", s_dur);  break;
-               case 19: sprintf(p, " %s%d", s_dam, plev*11+5 ); break;
-               case 20: sprintf(p, " %s4+d4", s_dur);  break;
+               case 18: sprintf(p, " %s6+d6", KWD_DURATION);  break;
+               case 19: sprintf(p, " %s%d", KWD_DAM, plev*11+5 ); break;
+               case 20: sprintf(p, " %s4+d4", KWD_DURATION);  break;
                }
                break;
        }
@@ -629,24 +629,24 @@ void mindcraft_info(char *p, int use_mind, int power)
                {
                case 0:  break;
                case 1:  break;
-               case 2:  sprintf(p, " %s10", s_range); break;
+               case 2:  sprintf(p, " %s10", KWD_SPHERE); break;
                case 3:  break;
-               case 4:  sprintf(p, " %s%d", s_range , plev *5); break;
-               case 5:  sprintf(p, " %s30", s_range); break;
+               case 4:  sprintf(p, " %s%d", KWD_SPHERE , plev *5); break;
+               case 5:  sprintf(p, " %s30", KWD_SPHERE); break;
                case 6:  break;
                case 7:  break;
-               case 8:  sprintf(p, " %s20+d20", s_dur);  break;
-               case 9:  sprintf(p, " %s%d", s_dam, (50+plev)/2 ); break;
+               case 8:  sprintf(p, " %s20+d20", KWD_DURATION);  break;
+               case 9:  sprintf(p, " %s%d", KWD_DAM, (50+plev)/2 ); break;
                case 10: break;
                case 11: break;
                case 12: break;
                case 13: break;
                case 14: break;
                case 15: break;
-               case 16: sprintf(p, " %s%d+d%d", s_dur, plev/2, plev/2);  break;
-               case 17: sprintf(p, " %s%d*3", s_dam, (75+plev*2/3)/2 ); break;
-               case 18: sprintf(p, " %s%dd10", s_dam, 6+plev/8 ); break;
-               case 19: sprintf(p, " %s6+d6", s_dur);  break;
+               case 16: sprintf(p, " %s%d+d%d", KWD_DURATION, plev/2, plev/2);  break;
+               case 17: sprintf(p, " %s%d*3", KWD_DAM, (75+plev*2/3)/2 ); break;
+               case 18: sprintf(p, " %s%dd10", KWD_DAM, 6+plev/8 ); break;
+               case 19: sprintf(p, " %s6+d6", KWD_DURATION);  break;
                }
                break;
        }
@@ -1615,7 +1615,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);
 
-                       p_ptr->energy_use = 100;
+                       take_turn(p_ptr, 100);;
                }
                break;
        }
@@ -1762,12 +1762,7 @@ void do_cmd_mind(void)
        concptr            p;
        bool            on_mirror = FALSE;
 
-       /* not if confused */
-       if (p_ptr->confused)
-       {
-               msg_print(_("混乱していて集中できない！", "You are too confused!"));
-               return;
-       }
+       if (cmd_limit_confused(p_ptr)) return;
 
        /* get power */
        if (!get_mind_power(&n, FALSE)) return;
@@ -1987,7 +1982,7 @@ void do_cmd_mind(void)
        }
 
 
-       p_ptr->energy_use = 100;
+       take_turn(p_ptr, 100);;
        /* teleport from mirror costs small energy */
        if( on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER )
        {