Reworded English message for a monk's successful MA_SLOW attack.

[hengband/hengband.git] / src / cmd-action / cmd-mind.c

diff --git a/src/cmd-action/cmd-mind.c b/src/cmd-action/cmd-mind.c
index 81101df..378fb8b 100644 (file)
--- a/src/cmd-action/cmd-mind.c
+++ b/src/cmd-action/cmd-mind.c
@@ -35,8 +35,8 @@
 #include "mind/mind-types.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
-#include "spell-kind/spells-teleport.h"
 #include "player/player-status-table.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spell-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
@@ -111,12 +111,12 @@ static void decide_mind_ki_chance(player_type *caster_ptr, cm_type *cm_ptr)
 
     if (caster_ptr->icky_wield[0])
         cm_ptr->chance += 20;
-    else if (has_melee_weapon(caster_ptr, INVEN_RARM))
+    else if (has_melee_weapon(caster_ptr, INVEN_MAIN_HAND))
         cm_ptr->chance += 10;
 
     if (caster_ptr->icky_wield[1])
         cm_ptr->chance += 20;
-    else if (has_melee_weapon(caster_ptr, INVEN_LARM))
+    else if (has_melee_weapon(caster_ptr, INVEN_SUB_HAND))
         cm_ptr->chance += 10;
 
     if (cm_ptr->n == 5)
@@ -285,13 +285,14 @@ static bool switch_mind_class(player_type *caster_ptr, cm_type *cm_ptr)
 
 static void mind_turn_passing(player_type *caster_ptr, cm_type *cm_ptr)
 {
-    if (!cm_ptr->on_mirror || (caster_ptr->pclass != CLASS_MIRROR_MASTER)) {
-        take_turn(caster_ptr, 100);
-        return;
+    if (cm_ptr->on_mirror && (caster_ptr->pclass == CLASS_MIRROR_MASTER)) {
+        if (cm_ptr->n == 3 || cm_ptr->n == 5 || cm_ptr->n == 7 || cm_ptr->n == 16) {
+            take_turn(caster_ptr, 50);
+            return;
+        }
     }
 
-    if (cm_ptr->n == 3 || cm_ptr->n == 5 || cm_ptr->n == 7 || cm_ptr->n == 16)
-        take_turn(caster_ptr, 50);
+    take_turn(caster_ptr, 100);
 }
 
 static bool judge_mind_chance(player_type *caster_ptr, cm_type *cm_ptr)
@@ -439,4 +440,4 @@ void do_cmd_mind_browse(player_type *caster_ptr)
             break;
         }
     }
-}
+}
\ No newline at end of file