mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-07-22 03:34:14 +00:00
Add support for multiDaysCountAsOneDay == false to evasion (#9077)
* Add support for `multiDaysCountAsOneDay == false` to evasion `if (dailiesDaysMissed > 1) dailiesDaysMissed = 1;` causes the evasion for-loop to only evaluate once even if `multiDaysCountAsOneDay == false`. This statement isn't necessary because `if (multiDaysCountAsOneDay) break;` will cause the for-loop to evaluate only once if `multiDaysCountAsOneDay == true`. Removing this statement makes the `dailiesDaysMissed` variable unnecessary. * Moves break statement out of conditional
This commit is contained in:
parent
b2c1c9d9dc
commit
2a2c525c2d
1 changed files with 2 additions and 6 deletions
|
|
@ -301,10 +301,6 @@ export function cron (options = {}) {
|
|||
let EvadeTask = 0;
|
||||
let scheduleMisses = daysMissed;
|
||||
|
||||
// Only check one day back
|
||||
let dailiesDaysMissed = daysMissed;
|
||||
if (dailiesDaysMissed > 1) dailiesDaysMissed = 1;
|
||||
|
||||
if (completed) {
|
||||
dailyChecked += 1;
|
||||
if (!atLeastOneDailyDue) { // only bother checking until the first thing is found
|
||||
|
|
@ -315,7 +311,7 @@ export function cron (options = {}) {
|
|||
// dailys repeat, so need to calculate how many they've missed according to their own schedule
|
||||
scheduleMisses = 0;
|
||||
|
||||
for (let i = 0; i < dailiesDaysMissed; i++) {
|
||||
for (let i = 0; i < daysMissed; i++) {
|
||||
let thatDay = moment(now).subtract({days: i + 1});
|
||||
|
||||
if (shouldDo(thatDay.toDate(), task, user.preferences)) {
|
||||
|
|
@ -325,8 +321,8 @@ export function cron (options = {}) {
|
|||
user.stats.buffs.stealth--;
|
||||
EvadeTask++;
|
||||
}
|
||||
if (multiDaysCountAsOneDay) break;
|
||||
}
|
||||
if (multiDaysCountAsOneDay) break;
|
||||
}
|
||||
|
||||
if (scheduleMisses > EvadeTask) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue