From 74229490e44e74f9b59cd49f02895091acfce825 Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Mon, 20 Aug 2018 21:38:57 +0300
Subject: [PATCH] Use the correct skill for creature AI weapon hit chance
 rating

---
 apps/openmw/mwmechanics/weaponpriority.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 26c784c4d3..9030d6254a 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -108,11 +108,19 @@ namespace MWMechanics
             }
         }
 
-        int skill = item.getClass().getEquipmentSkill(item);
-        if (skill != -1)
+        if (actor.getClass().isNpc())
         {
-            int value = actor.getClass().getSkill(actor, skill);
-            rating *= MWMechanics::getHitChance(actor, enemy, value) / 100.f;
+            int skill = item.getClass().getEquipmentSkill(item);
+            if (skill != -1)
+            {
+               int value = actor.getClass().getSkill(actor, skill);
+               rating *= MWMechanics::getHitChance(actor, enemy, value) / 100.f;
+            }
+        }
+        else
+        {
+            MWWorld::LiveCellRef<ESM::Creature> *ref = actor.get<ESM::Creature>();
+            rating *= MWMechanics::getHitChance(actor, enemy, ref->mBase->mData.mCombat) / 100.f;
         }
 
         return rating * rangedMult;