乗馬中のマーシャルアーツに関する変更.

* 素手の修行僧, 練気術師, 狂戦士が乗馬中ならばマーシャルアーツ技で攻
  撃しないように変更.
* 修行僧のレイシャルパワーは乗馬中は不可とした. 構えている間に乗馬す
  ると構えは解かれる.

diff --git a/src/cmd1.c b/src/cmd1.c
index 3b0056b..91d49dd 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2029,7 +2029,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
        case CLASS_MONK:
        case CLASS_FORCETRAINER:
        case CLASS_BERSERKER:
-               if (empty_hands(TRUE) & EMPTY_HAND_RARM) monk_attack = TRUE;
+               if ((empty_hands(TRUE) & EMPTY_HAND_RARM) && !p_ptr->riding) monk_attack = TRUE;
                break;
        }
 

diff --git a/src/cmd5.c b/src/cmd5.c
index 71a2a66..6f8a60b 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -2159,6 +2159,8 @@ bool do_riding(bool force)
 #endif
                }
 
+               if (p_ptr->action == ACTION_KAMAE) set_action(ACTION_NONE);
+
                p_ptr->riding = c_ptr->m_idx;
 
                /* Hack -- remove tracked monster */

diff --git a/src/racial.c b/src/racial.c
index 0ba4a29..7705512 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -1009,6 +1009,15 @@ static bool cmd_racial_power_aux(s32b command)
 #endif
                                return FALSE;
                        }
+                       if (p_ptr->riding)
+                       {
+#ifdef JP
+                               msg_print("¾èÇÏÃæ¤Ï¤Ç¤­¤Þ¤»¤ó¡£");
+#else
+                               msg_print("You need to get off a pet.");
+#endif
+                               return FALSE;
+                       }
 
                        if (command == -3)
                        {