From d6466872bcf4dd50da6fb90d7ae88e1a91f1818f Mon Sep 17 00:00:00 2001
From: iks <iks@users.sorceforge.jp>
Date: Sun, 15 Nov 2020 15:55:12 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20#38888=20=E5=96=84=E6=82=AA=E3=81=8C?=
 =?utf8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E3=81=A8=E5=8F=8D?=
 =?utf8?q?=E5=AF=BE=E3=81=AE=E3=83=A6=E3=83=8B=E3=83=BC=E3=82=AF=E3=81=AE?=
 =?utf8?q?=E3=83=9A=E3=83=83=E3=83=88=E3=81=AB=E4=B9=97=E9=A6=AC=E3=81=97?=
 =?utf8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=80=81=E4=B9=97=E9=A6=AC=E3=81=97?=
 =?utf8?q?=E3=81=9F=E3=81=BE=E3=81=BE=E3=81=A7=E6=95=B5=E3=81=AB=E5=9B=9E?=
 =?utf8?q?=E3=82=8A=E3=81=9D=E3=81=AE=E5=BE=8C=E3=81=8C=E3=81=8A=E3=81=8B?=
 =?utf8?q?=E3=81=97=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=81?=
 =?utf8?q?=E7=A2=BA=E7=8E=87=E7=9A=84=E3=81=AB=E8=90=BD=E9=A6=AC=E5=87=A6?=
 =?utf8?q?=E7=90=86=E3=82=92=E8=A1=8C=E3=81=84=E3=80=81=E8=90=BD=E9=A6=AC?=
 =?utf8?q?=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=84=E3=81=9F=E5=A0=B4=E5=90=88?=
 =?utf8?q?=E3=81=AF=E3=83=9A=E3=83=83=E3=83=88=E3=81=AE=E3=81=BE=E3=81=BE?=
 =?utf8?q?=E3=81=AB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3=E3=80=82=20/=20When=20be=20riding,=20fall=20from=20hos?=
 =?utf8?q?tile=20unique=20pet=20probabilistically,=20and=20when=20fail=20t?=
 =?utf8?q?o=20fall,=20the=20pet=20is=20tamed=20yet.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/monster/monster-processor.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index e8c37174e..1c786b74b 100644
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -53,6 +53,7 @@
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
 #include "player-info/avatar.h"
+#include "player/player-skill.h"
 #include "player/player-move.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
@@ -289,7 +290,7 @@ bool awake_monster(player_type *target_ptr, MONSTER_IDX m_idx)
 }
 
 /*!
- * @brief モンスターの怒り状態を判定する (起こっていたら敵に回す)
+ * @brief モンスターの怒り状態を判定する (怒っていたら敵に回す)
  * @param target_ptr プレーヤーへの参照ポインタ
  * @param m_idx モンスターID
  * @param see_m モンスターが視界内にいたらTRUE
@@ -311,9 +312,22 @@ void process_angar(player_type *target_ptr, MONSTER_IDX m_idx, bool see_m)
     if (target_ptr->phase_out || !gets_angry)
         return;
 
+    GAME_TEXT m_name[MAX_NLEN];
+    monster_desc(target_ptr, m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
+
+    /* When riding a hostile align pet */
+    if (target_ptr->riding == m_idx) {
+        if (abs(target_ptr->align / 10) < randint0(target_ptr->skill_exp[GINOU_RIDING]))
+            return;
+
+        msg_format(_("%^sが突然暴れだした！", "%^s suddenly begins unruly!"), m_name);
+        if (!process_fall_off_horse(target_ptr, 1, TRUE))
+            return;
+
+        msg_format(_("あなたは振り落とされた。", "You have fallen."));
+    }
+
     if (is_pet(m_ptr) || see_m) {
-        GAME_TEXT m_name[MAX_NLEN];
-        monster_desc(target_ptr, m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
         msg_format(_("%^sは突然敵にまわった！", "%^s suddenly becomes hostile!"), m_name);
     }
 
-- 
2.11.0