Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Sidestream biweekly (2020/02/15 to 2020/02/29) #400

Merged
merged 3 commits into from
Mar 1, 2020
Merged

Sidestream biweekly (2020/02/15 to 2020/02/29) #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55281e
Fix IncrediblyEasyPrey typo
nfaletra Feb 18, 2020
d99c2d5
Fix charm chance level and chr ratio calculations
nfaletra Feb 18, 2020
0ef21b6
Commits from sidestream, 2020/02/15 to 2020/02/29
zircon-tpl Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/map/utils/battleutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3867,7 +3867,7 @@ namespace battleutils
CharmTime = 1800000;
break;

case EMobDifficulty::IncredibyEasyPrey:
case EMobDifficulty::IncrediblyEasyPrey:
case EMobDifficulty::EasyPrey:
CharmTime = 1200000;
break;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -4378,7 +4378,7 @@ namespace battleutils
switch (mobCheck)
{
case EMobDifficulty::TooWeak:
case EMobDifficulty::IncredibyEasyPrey:
case EMobDifficulty::IncrediblyEasyPrey:
BindBreakChance = 10;
break;

Expand Down
2 changes: 1 addition & 1 deletion src/map/utils/charutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/map/utils/charutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CAbility;
enum class EMobDifficulty : uint8
{
TooWeak = 0,
IncredibyEasyPrey,
IncrediblyEasyPrey,
EasyPrey,
DecentChallenge,
EvenMatch,
Expand Down