Merge pull request #1581

apps/openmw/mwclass/npc.cpp

@@ -1129,6 +1129,15 @@ namespace MWClass
             else
             {
                 ratings[i] = it->getClass().getEffectiveArmorRating(*it, ptr);
+
+                // Take in account armor condition
+                const bool hasHealth = it->getClass().hasItemHealth(*it);
+                if (hasHealth)
+                {
+                    int armorHealth = it->getClass().getItemHealth(*it);
+                    int armorMaxHealth = it->getClass().getItemMaxHealth(*it);
+                    ratings[i] *= (float(armorHealth) / armorMaxHealth);
+                }
             }
         }