From b55281ef25b8a8821beb273de570afd66a16fb57 Mon Sep 17 00:00:00 2001 From: Autkast Date: Tue, 18 Feb 2020 07:09:05 -0700 Subject: [PATCH 1/3] Fix IncrediblyEasyPrey typo --- src/map/utils/battleutils.cpp | 6 +++--- src/map/utils/charutils.cpp | 2 +- src/map/utils/charutils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp index 7a15eecde66..954401031ec 100644 --- 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; @@ -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 index e390155764f..fecd877ad29 100644 --- 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 index 2c2459b5ad5..06162f9682e 100644 --- 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, From d99c2d50e67f255a3ae01a9a6629bd6a7c520b61 Mon Sep 17 00:00:00 2001 From: Autkast Date: Tue, 18 Feb 2020 07:07:38 -0700 Subject: [PATCH 2/3] Fix charm chance level and chr ratio calculations --- src/map/utils/battleutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp index 954401031ec..646749c622c 100644 --- a/src/map/utils/battleutils.cpp +++ b/src/map/utils/battleutils.cpp @@ -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 From 0ef21b6c5f28931e442ada19f9005abfcb930ea4 Mon Sep 17 00:00:00 2001 From: zircon-tpl <60901633+zircon-tpl@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:24:48 -0800 Subject: [PATCH 3/3] Commits from sidestream, 2020/02/15 to 2020/02/29