Merge pull request #400 from zircon-tpl/sidestream-biweekly

Sidestream biweekly (2020/02/15 to 2020/02/29)
project-topaz · Mar 1, 2020 · 31114b4 · 31114b4
2 parents 9587080 + 0ef21b6
commit 31114b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp
@@ -3867,7 +3867,7 @@ namespace battleutils
                 CharmTime = 1800000;
                 break;
 
-            case EMobDifficulty::IncredibyEasyPrey:
+            case EMobDifficulty::IncrediblyEasyPrey:
             case EMobDifficulty::EasyPrey:
                 CharmTime = 1200000;
                 break;
@@ -4025,7 +4025,7 @@ namespace battleutils
         case EMobDifficulty::TooWeak:
             charmChance = 90.f;
             break;
-        case EMobDifficulty::IncredibyEasyPrey:
+        case EMobDifficulty::IncrediblyEasyPrey:
         case EMobDifficulty::EasyPrey:
             charmChance = 75.f;
             break;
@@ -4063,10 +4063,10 @@ namespace battleutils
         }
 
         // FIXME: Level and CHR ratios are complete guesses
-        const float levelRatio = (targetLvl - charmerBSTlevel) / 100.f;
+        const float levelRatio = (charmerBSTlevel - targetLvl) / 100.f;
         charmChance *= (1.f + levelRatio);
 
-        const float chrRatio = (PTarget->CHR() - PCharmer->CHR()) / 100.f;
+        const float chrRatio = (PCharmer->CHR() - PTarget->CHR()) / 100.f;
         charmChance *= (1.f + chrRatio);
 
         // Retail doesn't take light/apollo into account for Gauge
@@ -4378,7 +4378,7 @@ namespace battleutils
             switch (mobCheck)
             {
             case EMobDifficulty::TooWeak:
-            case EMobDifficulty::IncredibyEasyPrey:
+            case EMobDifficulty::IncrediblyEasyPrey:
                 BindBreakChance = 10;
                 break;
 

diff --git a/src/map/utils/charutils.cpp b/src/map/utils/charutils.cpp
@@ -3095,7 +3095,7 @@ namespace charutils
         if (baseExp >= 200) return EMobDifficulty::EvenMatch;
         if (baseExp >= 160) return EMobDifficulty::DecentChallenge;
         if (baseExp >= 60) return EMobDifficulty::EasyPrey;
-        if (baseExp >= 14) return EMobDifficulty::IncredibyEasyPrey;
+        if (baseExp >= 14) return EMobDifficulty::IncrediblyEasyPrey;
 
         return EMobDifficulty::TooWeak;
     }

diff --git a/src/map/utils/charutils.h b/src/map/utils/charutils.h
@@ -40,7 +40,7 @@ class CAbility;
 enum class EMobDifficulty : uint8
 {
     TooWeak = 0,
-    IncredibyEasyPrey,
+    IncrediblyEasyPrey,
     EasyPrey,
     DecentChallenge,
     EvenMatch,