From b890326545bd9f3b62560ca79ccc475e17226cac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 27 Jan 2015 21:50:41 -0600 Subject: [PATCH 1/5] Added new tasks for onboarding per lemoness --- dist/habitrpg-shared.js | 78 +++++++++++++++++++++++++++++++----- locales/en/defaultTasks.json | 22 ++++++++-- script/content.coffee | 8 +++- 3 files changed, 94 insertions(+), 14 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 4ef7232002..4db6e79054 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -14303,13 +14303,7 @@ api.userDefaults = { { type: 'todo', text: t('defaultTodo1Text'), - notes: t('defaultTodo1Notes'), - completed: false, - attribute: 'int' - }, { - type: 'todo', - text: t('defaultTodo2Text'), - notes: t('defaultTodo2Notes'), + notes: t('defaultTodoBlank'), completed: false, attribute: 'int' }, { @@ -14319,6 +14313,72 @@ api.userDefaults = { value: -3, completed: false, attribute: 'per' + }, { + type: 'todo', + text: t('defaultTodo4Text'), + notes: t('defaultTodoBlank'), + checklist: [ + { + completed: false, + text: t('defaultTodo4Checklist1') + }, { + completed: false, + text: t('defaultTodo4Checklist2') + }, { + completed: false, + text: t('defaultTodo4Checklist3') + } + ], + completed: false, + attribute: 'per' + }, { + type: 'todo', + text: t('defaultTodo5Text'), + notes: t('defaultTodoBlank'), + checklist: [ + { + completed: false, + text: t('defaultTodo5Checklist1') + }, { + completed: false, + text: t('defaultTodo5Checklist2') + }, { + completed: false, + text: t('defaultTodo5Checklist3') + } + ], + completed: false, + attribute: 'per' + }, { + type: 'todo', + text: t('defaultTodo6Text'), + notes: t('defaultTodoBlank'), + checklist: [ + { + completed: false, + text: t('defaultTodo6Checklist1') + }, { + completed: false, + text: t('defaultTodo6Checklist2') + }, { + completed: false, + text: t('defaultTodo6Checklist3') + } + ], + completed: false, + attribute: 'per' + }, { + type: 'todo', + text: t('defaultTodo7Text'), + notes: t('defaultTodoBlank'), + completed: false, + attribute: 'per' + }, { + type: 'todo', + text: t('defaultTodo2Text'), + notes: t('defaultTodo2Notes'), + completed: false, + attribute: 'int' } ], rewards: [ @@ -16800,5 +16860,5 @@ api.wrap = function(user, main) { }; -}).call(this,require("/home/sabrecat/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js")) -},{"./content.coffee":5,"./i18n.coffee":6,"/home/sabrecat/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1]) \ No newline at end of file +}).call(this,require("/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js")) +},{"./content.coffee":5,"./i18n.coffee":6,"/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1]) \ No newline at end of file diff --git a/locales/en/defaultTasks.json b/locales/en/defaultTasks.json index 5ec7a689ab..93e0786f46 100644 --- a/locales/en/defaultTasks.json +++ b/locales/en/defaultTasks.json @@ -23,15 +23,31 @@ "defaultDaily4Checklist2": "Sit-ups", "defaultDaily4Checklist3": "Push-ups", - "defaultTodo1Text": "Use emojis :+1:", - "defaultTodo1Notes": "You can use emojis in all your Habit, Daily, and To-Do titles.", + "defaultTodo1Text": "Join HabitRPG (Check me off!)", "defaultTodo2Text": "_Learn_ **Markdown** :book:", "defaultTodo2Notes": "You can use Markdown for styling your task names.", - "defaultTodo3Text": "Call Mom :telephone_receiver:", + "defaultTodo3Text": "Join the Newbies Guild and introduce yourself (Social > Guilds > Newbies Guild)", "defaultTodo3Notes": "While not completing a To-Do in a set period of time will not hurt you, they will gradually change from yellow to red, thus becoming more valuable. This will encourage you to wrap up stale To-Dos.", + "defaultTodo4Text": "Set up a Habit", + "defaultTodo4Checklist1": "create a Habit", + "defaultTodo4Checklist2": "make it \"+\" only, \"-\" only, or \"+/-\" under Edit", + "defaultTodo4Checklist3": "set difficulty under Advanced Options", + + "defaultTodo5Text": "Set up a Daily", + "defaultTodo5Checklist1": "decide whether to use Dailies (they hurt you if you don't do them every day)", + "defaultTodo5Checklist2": "if so, add a Daily (don't add too many at first!)", + "defaultTodo5Checklist3": "set its due days under Edit", + + "defaultTodo6Text": "Set up a To-Do (can be checked off without ticking all checkboxes!)", + "defaultTodo6Checklist1": "create a To-Do", + "defaultTodo6Checklist2": "set difficulty under Advanced Options", + "defaultTodo6Checklist3": "optional: set a Due Date", + + "defaultTodo7Text": "Start a Party (private group) with Your Friends (Social > Party)", + "defaultReward1Text": "1 Episode of Game of Thrones", "defaultReward1Notes": "Custom rewards can come in many forms. Some people will hold off watching their favorite show unless they have the gold to pay for it.", diff --git a/script/content.coffee b/script/content.coffee index 4f31792094..8091db1112 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -1597,9 +1597,13 @@ api.userDefaults = ] todos: [ - {type: 'todo', text: t('defaultTodo1Text'), notes: t('defaultTodo1Notes'), completed: false, attribute: 'int' } - {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodo2Notes'), completed: false, attribute: 'int' } + {type: 'todo', text: t('defaultTodo1Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'int' } {type: 'todo', text: t('defaultTodo3Text'), notes: t('defaultTodo3Notes'), value: -3, completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo4Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo4Checklist1') }, {completed: false, text: t('defaultTodo4Checklist2')}, {completed: false, text: t('defaultTodo4Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo5Checklist1') }, {completed: false, text: t('defaultTodo5Checklist2')}, {completed: false, text: t('defaultTodo5Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo6Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo6Checklist1') }, {completed: false, text: t('defaultTodo6Checklist2')}, {completed: false, text: t('defaultTodo6Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo7Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodo2Notes'), completed: false, attribute: 'int' } ] rewards: [ From 7ef0c70b8b7dd2ffee0755f0c20572e71021e5f2 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 27 Jan 2015 21:52:54 -0600 Subject: [PATCH 2/5] Added placeholder blank notes --- locales/en/defaultTasks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locales/en/defaultTasks.json b/locales/en/defaultTasks.json index 93e0786f46..461d8ac0d6 100644 --- a/locales/en/defaultTasks.json +++ b/locales/en/defaultTasks.json @@ -23,6 +23,8 @@ "defaultDaily4Checklist2": "Sit-ups", "defaultDaily4Checklist3": "Push-ups", + "defaultTodoBlank": "", + "defaultTodo1Text": "Join HabitRPG (Check me off!)", "defaultTodo2Text": "_Learn_ **Markdown** :book:", From 21be3e8957d90b4865a7b7d1b11d523dea08e5a7 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 28 Jan 2015 13:43:15 -0600 Subject: [PATCH 3/5] Adjusted default tasks per lemoness --- dist/habitrpg-shared.js | 75 +++++++++++++++--------------------- locales/en/defaultTasks.json | 32 +++++++-------- script/content.coffee | 8 ++-- 3 files changed, 47 insertions(+), 68 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 4db6e79054..3aca75d6ff 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -14306,11 +14306,40 @@ api.userDefaults = { notes: t('defaultTodoBlank'), completed: false, attribute: 'int' + }, { + type: 'todo', + text: t('defaultTodo2Text'), + notes: t('defaultTodoBlank'), + checklist: [ + { + completed: false, + text: t('defaultTodo2Checklist1') + }, { + completed: false, + text: t('defaultTodo2Checklist2') + }, { + completed: false, + text: t('defaultTodo2Checklist3') + } + ], + completed: false, + attribute: 'per' }, { type: 'todo', text: t('defaultTodo3Text'), - notes: t('defaultTodo3Notes'), - value: -3, + notes: t('defaultTodoBlank'), + checklist: [ + { + completed: false, + text: t('defaultTodo3Checklist1') + }, { + completed: false, + text: t('defaultTodo3Checklist2') + }, { + completed: false, + text: t('defaultTodo3Checklist3') + } + ], completed: false, attribute: 'per' }, { @@ -14335,50 +14364,8 @@ api.userDefaults = { type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoBlank'), - checklist: [ - { - completed: false, - text: t('defaultTodo5Checklist1') - }, { - completed: false, - text: t('defaultTodo5Checklist2') - }, { - completed: false, - text: t('defaultTodo5Checklist3') - } - ], completed: false, attribute: 'per' - }, { - type: 'todo', - text: t('defaultTodo6Text'), - notes: t('defaultTodoBlank'), - checklist: [ - { - completed: false, - text: t('defaultTodo6Checklist1') - }, { - completed: false, - text: t('defaultTodo6Checklist2') - }, { - completed: false, - text: t('defaultTodo6Checklist3') - } - ], - completed: false, - attribute: 'per' - }, { - type: 'todo', - text: t('defaultTodo7Text'), - notes: t('defaultTodoBlank'), - completed: false, - attribute: 'per' - }, { - type: 'todo', - text: t('defaultTodo2Text'), - notes: t('defaultTodo2Notes'), - completed: false, - attribute: 'int' } ], rewards: [ diff --git a/locales/en/defaultTasks.json b/locales/en/defaultTasks.json index 461d8ac0d6..8d6aba0fc0 100644 --- a/locales/en/defaultTasks.json +++ b/locales/en/defaultTasks.json @@ -27,28 +27,22 @@ "defaultTodo1Text": "Join HabitRPG (Check me off!)", - "defaultTodo2Text": "_Learn_ **Markdown** :book:", - "defaultTodo2Notes": "You can use Markdown for styling your task names.", + "defaultTodo2Text": "Set up a Habit", + "defaultTodo2Checklist1": "create a Habit", + "defaultTodo2Checklist2": "make it \"+\" only, \"-\" only, or \"+/-\" under Edit", + "defaultTodo2Checklist3": "set difficulty under Advanced Options", - "defaultTodo3Text": "Join the Newbies Guild and introduce yourself (Social > Guilds > Newbies Guild)", - "defaultTodo3Notes": "While not completing a To-Do in a set period of time will not hurt you, they will gradually change from yellow to red, thus becoming more valuable. This will encourage you to wrap up stale To-Dos.", + "defaultTodo3Text": "Set up a Daily", + "defaultTodo3Checklist1": "decide whether to use Dailies (they hurt you if you don't do them every day)", + "defaultTodo3Checklist2": "if so, add a Daily (don't add too many at first!)", + "defaultTodo3Checklist3": "set its due days under Edit", - "defaultTodo4Text": "Set up a Habit", - "defaultTodo4Checklist1": "create a Habit", - "defaultTodo4Checklist2": "make it \"+\" only, \"-\" only, or \"+/-\" under Edit", - "defaultTodo4Checklist3": "set difficulty under Advanced Options", + "defaultTodo4Text": "Set up a To-Do (can be checked off without ticking all checkboxes!)", + "defaultTodo4Checklist1": "create a To-Do", + "defaultTodo4Checklist2": "set difficulty under Advanced Options", + "defaultTodo4Checklist3": "optional: set a Due Date", - "defaultTodo5Text": "Set up a Daily", - "defaultTodo5Checklist1": "decide whether to use Dailies (they hurt you if you don't do them every day)", - "defaultTodo5Checklist2": "if so, add a Daily (don't add too many at first!)", - "defaultTodo5Checklist3": "set its due days under Edit", - - "defaultTodo6Text": "Set up a To-Do (can be checked off without ticking all checkboxes!)", - "defaultTodo6Checklist1": "create a To-Do", - "defaultTodo6Checklist2": "set difficulty under Advanced Options", - "defaultTodo6Checklist3": "optional: set a Due Date", - - "defaultTodo7Text": "Start a Party (private group) with Your Friends (Social > Party)", + "defaultTodo5Text": "Start a Party (private group) with your friends (Social > Party)", "defaultReward1Text": "1 Episode of Game of Thrones", "defaultReward1Notes": "Custom rewards can come in many forms. Some people will hold off watching their favorite show unless they have the gold to pay for it.", diff --git a/script/content.coffee b/script/content.coffee index 8091db1112..61a98027b0 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -1598,12 +1598,10 @@ api.userDefaults = todos: [ {type: 'todo', text: t('defaultTodo1Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'int' } - {type: 'todo', text: t('defaultTodo3Text'), notes: t('defaultTodo3Notes'), value: -3, completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo2Checklist1') }, {completed: false, text: t('defaultTodo2Checklist2')}, {completed: false, text: t('defaultTodo2Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo3Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo3Checklist1') }, {completed: false, text: t('defaultTodo3Checklist2')}, {completed: false, text: t('defaultTodo3Checklist3')}], completed: false, attribute: 'per' } {type: 'todo', text: t('defaultTodo4Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo4Checklist1') }, {completed: false, text: t('defaultTodo4Checklist2')}, {completed: false, text: t('defaultTodo4Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo5Checklist1') }, {completed: false, text: t('defaultTodo5Checklist2')}, {completed: false, text: t('defaultTodo5Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo6Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo6Checklist1') }, {completed: false, text: t('defaultTodo6Checklist2')}, {completed: false, text: t('defaultTodo6Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo7Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodo2Notes'), completed: false, attribute: 'int' } + {type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'per' } ] rewards: [ From 520df873623854fd1114584881fa92eb73aca078 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 28 Jan 2015 13:50:11 -0600 Subject: [PATCH 4/5] fixed default todo note --- locales/en/defaultTasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/defaultTasks.json b/locales/en/defaultTasks.json index 8d6aba0fc0..905412f9ed 100644 --- a/locales/en/defaultTasks.json +++ b/locales/en/defaultTasks.json @@ -23,7 +23,7 @@ "defaultDaily4Checklist2": "Sit-ups", "defaultDaily4Checklist3": "Push-ups", - "defaultTodoBlank": "", + "defaultTodoBlank": "You can either complete this To-Do, edit it, or remove it,", "defaultTodo1Text": "Join HabitRPG (Check me off!)", From 75eb6304eb29e7ba0037528efa9477c8fbedf717 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 28 Jan 2015 13:51:03 -0600 Subject: [PATCH 5/5] Renamed variable name --- locales/en/defaultTasks.json | 2 +- script/content.coffee | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/en/defaultTasks.json b/locales/en/defaultTasks.json index 905412f9ed..239c9b645a 100644 --- a/locales/en/defaultTasks.json +++ b/locales/en/defaultTasks.json @@ -23,7 +23,7 @@ "defaultDaily4Checklist2": "Sit-ups", "defaultDaily4Checklist3": "Push-ups", - "defaultTodoBlank": "You can either complete this To-Do, edit it, or remove it,", + "defaultTodoNotes": "You can either complete this To-Do, edit it, or remove it.", "defaultTodo1Text": "Join HabitRPG (Check me off!)", diff --git a/script/content.coffee b/script/content.coffee index 61a98027b0..220ac9b8f5 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -1597,11 +1597,11 @@ api.userDefaults = ] todos: [ - {type: 'todo', text: t('defaultTodo1Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'int' } - {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo2Checklist1') }, {completed: false, text: t('defaultTodo2Checklist2')}, {completed: false, text: t('defaultTodo2Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo3Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo3Checklist1') }, {completed: false, text: t('defaultTodo3Checklist2')}, {completed: false, text: t('defaultTodo3Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo4Text'), notes: t('defaultTodoBlank'), checklist: [{completed: false, text: t('defaultTodo4Checklist1') }, {completed: false, text: t('defaultTodo4Checklist2')}, {completed: false, text: t('defaultTodo4Checklist3')}], completed: false, attribute: 'per' } - {type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoBlank'), completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo1Text'), notes: t('defaultTodoNotes'), completed: false, attribute: 'int' } + {type: 'todo', text: t('defaultTodo2Text'), notes: t('defaultTodoNotes'), checklist: [{completed: false, text: t('defaultTodo2Checklist1') }, {completed: false, text: t('defaultTodo2Checklist2')}, {completed: false, text: t('defaultTodo2Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo3Text'), notes: t('defaultTodoNotes'), checklist: [{completed: false, text: t('defaultTodo3Checklist1') }, {completed: false, text: t('defaultTodo3Checklist2')}, {completed: false, text: t('defaultTodo3Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo4Text'), notes: t('defaultTodoNotes'), checklist: [{completed: false, text: t('defaultTodo4Checklist1') }, {completed: false, text: t('defaultTodo4Checklist2')}, {completed: false, text: t('defaultTodo4Checklist3')}], completed: false, attribute: 'per' } + {type: 'todo', text: t('defaultTodo5Text'), notes: t('defaultTodoNotes'), completed: false, attribute: 'per' } ] rewards: [