From 4a0f165af8243022472718fddc9a3e1fcf6f0c1e Mon Sep 17 00:00:00 2001 From: Verabird Date: Sun, 22 Feb 2015 21:22:49 -0500 Subject: [PATCH] Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys --- common/script/content.coffee | 4 ++-- common/script/index.coffee | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/common/script/content.coffee b/common/script/content.coffee index 08b41e97bb..658f85f3b4 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -611,8 +611,8 @@ api.spells = notes: t('spellRogueStealthNotes') cast: (user, target) -> user.stats.buffs.stealth ?= 0 - ## scales to user's # of dailies; maxes out at 100% at 100 per ## - user.stats.buffs.stealth += Math.ceil(user.dailys.length * user._statsComputed.per / 100) + ## scales to user's # of dailies; Diminishing Returns, maxes out at 25%, halfway point at 100 PER## + user.stats.buffs.stealth += Math.ceil( diminishingReturns(user._statsComputed.per, user.dailys.length*0.25,100)) healer: heal: diff --git a/common/script/index.coffee b/common/script/index.coffee index 03684dbb46..8c3edbae63 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -1493,28 +1493,35 @@ api.wrap = (user, main=true) -> {id, type, completed, repeat} = task - return if (type is 'daily') && !completed && user.stats.buffs.stealth && user.stats.buffs.stealth-- # User "evades" a certain number of uncompleted dailies +# return if (type is 'daily') && !completed && user.stats.buffs.stealth && user.stats.buffs.stealth-- # User "evades" a certain number of uncompleted dailies # Deduct experience for missed Daily tasks, but not for Todos (just increase todo's value) + EvadeTask = 0 + scheduleMisses = daysMissed unless completed - scheduleMisses = daysMissed # for dailys which have repeat dates, need to calculate how many they've missed according to their own schedule if (type is 'daily') and repeat scheduleMisses = 0 _.times daysMissed, (n) -> thatDay = moment(now).subtract({days: n + 1}) - scheduleMisses++ if api.shouldDo(thatDay, repeat, user.preferences) - if scheduleMisses > 0 + if api.shouldDo(thatDay, repeat, user.preferences) + scheduleMisses++ + if user.stats.buffs.stealth + user.stats.buffs.stealth-- + EvadeTask++ + if scheduleMisses > EvadeTask perfect = false if type is 'daily' - delta = user.ops.score({params:{id:task.id, direction:'down'}, query:{times:scheduleMisses, cron:true}}); + delta = user.ops.score({params:{id:task.id, direction:'down'}, query:{times:(scheduleMisses-EvadeTask), cron:true}}); # this line occurs for todos or dailys user.party.quest.progress.down += delta if type is 'daily' switch type when 'daily' + # This occurs whether or not the task is completed (task.history ?= []).push({ date: +new Date, value: task.value }) task.completed = false - _.each task.checklist, ((i)->i.completed=false;true) + if completed || (scheduleMisses > 0) + _.each task.checklist, ((i)->i.completed=false;true) # this should not happen for grey tasks unless they are completed when 'todo' #get updated value absVal = if (completed) then Math.abs(task.value) else task.value