From 80f3bd9f86fd94a3701989de29f1cca72879ef71 Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Thu, 2 Aug 2018 08:31:45 +0300
Subject: [PATCH 1/2] Don't apply iWereWolfFleeMod to creatures

---
 CHANGELOG.md                               | 1 +
 apps/openmw/mwmechanics/aicombataction.cpp | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1923e5237..ee560b680 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@
     Bug #4510: Division by zero in MWMechanics::CreatureStats::setAttribute
     Bug #4519: Knockdown does not discard movement in the 1st-person mode
     Bug #4539: Paper Doll is affected by GUI scaling
+    Bug #4545: Creatures flee from werewolves
     Feature #2606: Editor: Implemented (optional) case sensitive global search
     Feature #3083: Play animation when NPC is casting spell via script
     Feature #3276: Editor: Search- Show number of (remaining) search results and indicate a search without any results
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 0ccd0b6ec..b83f4c331 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -494,10 +494,13 @@ namespace MWMechanics
 
         static const int iWereWolfLevelToAttack = gmst.find("iWereWolfLevelToAttack")->getInt();
 
-        if (enemy.getClass().isNpc() && enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
+        if (actor.getClass().isNpc() && enemy.getClass().isNpc())
         {
-            static const int iWereWolfFleeMod = gmst.find("iWereWolfFleeMod")->getInt();
-            rating = iWereWolfFleeMod;
+            if (enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
+            {
+                static const int iWereWolfFleeMod = gmst.find("iWereWolfFleeMod")->getInt();
+                rating += iWereWolfFleeMod;
+            }
         }
 
         if (rating != 0.0f)

From 73d549671132b73f57e7e2ee5c98ca86678242c3 Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Thu, 2 Aug 2018 13:01:23 +0300
Subject: [PATCH 2/2] Revert addition change

---
 apps/openmw/mwmechanics/aicombataction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index b83f4c331..2685e0e0c 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -499,7 +499,7 @@ namespace MWMechanics
             if (enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
             {
                 static const int iWereWolfFleeMod = gmst.find("iWereWolfFleeMod")->getInt();
-                rating += iWereWolfFleeMod;
+                rating = iWereWolfFleeMod;
             }
         }