diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index e80aeee367..c079ca14a3 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -23,6 +23,7 @@ "difficulty": "Difficulty", "difficultyHelpTitle": "How difficult is this task?", "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!", + "trivial": "Trivial", "easy": "Easy", "medium": "Medium", "hard": "Hard", diff --git a/common/script/index.coffee b/common/script/index.coffee index 065971ceb4..7d7ff31bd0 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -316,7 +316,9 @@ api.taskClasses = (task, filters=[], dayStart=0, lastCron=+new Date, showComplet classes += ' habit-wide' if task.down and task.up classes += ' habit-narrow' if !task.down and !task.up - if priority == 1 + if priority == 0.1 + classes += ' difficulty-trivial' + else if priority == 1 classes += ' difficulty-easy' else if priority == 1.5 classes += ' difficulty-medium' diff --git a/website/views/shared/tasks/edit/advanced_options.jade b/website/views/shared/tasks/edit/advanced_options.jade index a34051ddf5..fbd805289e 100644 --- a/website/views/shared/tasks/edit/advanced_options.jade +++ b/website/views/shared/tasks/edit/advanced_options.jade @@ -32,15 +32,19 @@ div(ng-if='::task.type!="reward"') a.hint.priority-multiplier-help(href='http://habitrpg.wikia.com/wiki/Difficulty', target='_blank', popover-title=env.t('difficultyHelpTitle'), popover-trigger='mouseenter', popover=env.t('difficultyHelpContent'))=env.t('difficulty') ul.priority-multiplier li - button(type='button', ng-class='{active: task.priority==1 || !task.priority}', + button(type='button', ng-class='{active: task.priority==0.1}', + ng-click='task.challenge.id || (task.priority=0.1)') + =env.t('trivial') + li + button(type='button', ng-class='{active: task.priority==1 || !task.priority}', ng-click='task.challenge.id || (task.priority=1)') =env.t('easy') li - button(type='button', ng-class='{active: task.priority==1.5}', + button(type='button', ng-class='{active: task.priority==1.5}', ng-click='task.challenge.id || (task.priority=1.5)') =env.t('medium') li - button(type='button', ng-class='{active: task.priority==2}', + button(type='button', ng-class='{active: task.priority==2}', ng-click='task.challenge.id || (task.priority=2)') =env.t('hard') @@ -52,19 +56,19 @@ div(ng-if='::task.type!="reward"') legend.option-title.pull-left=env.t('attributes') ul.task-attributes li - button(type='button', ng-class='{active: task.attribute=="str"}', + button(type='button', ng-class='{active: task.attribute=="str"}', ng-click='task.attribute="str"') =env.t('physical') li - button(type='button', ng-class='{active: task.attribute=="int"}', + button(type='button', ng-class='{active: task.attribute=="int"}', ng-click='task.attribute="int"') =env.t('mental') li - button(type='button', ng-class='{active: task.attribute=="con"}', + button(type='button', ng-class='{active: task.attribute=="con"}', ng-click='task.attribute="con"') =env.t('social') li - button(type='button', ng-class='{active: task.attribute=="per"}', - ng-click='task.attribute="per"', + button(type='button', ng-class='{active: task.attribute=="per"}', + ng-click='task.attribute="per"', popover=env.t('otherExamples'), popover-trigger='mouseenter', popover-placement='top') =env.t('other')