From f792155b4551679331136867a1d1f7947d7f8db9 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 17 Aug 2015 21:48:58 -0500 Subject: [PATCH] Order quests with array --- common/script/content.coffee | 35 +++++++++++++------------ website/views/shared/modals/quests.jade | 12 ++++----- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/common/script/content.coffee b/common/script/content.coffee index 7a0a87c375..8413d58c45 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -1200,10 +1200,11 @@ api.food = _.each api.food, (food,key) -> _.defaults food, {value: 1, key, notes: t('foodNotes')} -api.questCategories = - ableUnlock: 'unlockableQuests' - gold: 'goldQuests' - pet: 'petQuests' +api.userCanOwnQuestCategories = [ + 'unlockable' + 'gold' + 'pet' +] api.quests = @@ -1395,7 +1396,7 @@ api.quests = notes: t('questVice1Notes') value: 4 lvl: 30 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questVice1Boss') hp: 750 @@ -1412,7 +1413,7 @@ api.quests = notes: t('questVice2Notes') value: 4 lvl: 30 - category: 'ableUnlock' + category: 'unlockable' previous: 'vice1' collect: lightCrystal: text: t('questVice2CollectLightCrystal'), count: 45 @@ -1430,7 +1431,7 @@ api.quests = previous: 'vice2' value: 4 lvl: 30 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questVice3Boss') hp: 1500 @@ -1536,7 +1537,7 @@ api.quests = notes: t('questAtom1Notes') value: 4 lvl: 15 - category: 'ableUnlock' + category: 'unlockable' collect: soapBars: text: t('questAtom1CollectSoapBars'), count: 20 drop: @@ -1551,7 +1552,7 @@ api.quests = previous: 'atom1' value: 4 lvl: 15 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questAtom2Boss') hp: 300 @@ -1569,7 +1570,7 @@ api.quests = completion: t('questAtom3Completion') value: 4 lvl: 15 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questAtom3Boss') hp: 800 @@ -1648,7 +1649,7 @@ api.quests = notes: t('questMoonstone1Notes') value: 4 lvl: 60 - category: 'ableUnlock' + category: 'unlockable' collect: moonstone: text: t('questMoonstone1CollectMoonstone'), count: 500 drop: @@ -1663,7 +1664,7 @@ api.quests = value: 4 lvl: 60 previous: 'moonstone1' - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questMoonstone2Boss') hp: 1500 @@ -1681,7 +1682,7 @@ api.quests = previous: 'moonstone2' value: 4 lvl: 60 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questMoonstone3Boss') hp: 2000 @@ -1706,7 +1707,7 @@ api.quests = notes: t('questGoldenknight1Notes') value: 4 lvl: 40 - category: 'ableUnlock' + category: 'unlockable' collect: testimony: text: t('questGoldenknight1CollectTestimony'), count: 300 drop: @@ -1721,7 +1722,7 @@ api.quests = value: 4 previous: 'goldenknight1' lvl: 40 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questGoldenknight2Boss') hp: 1000 @@ -1739,7 +1740,7 @@ api.quests = previous: 'goldenknight2' value: 4 lvl: 40 - category: 'ableUnlock' + category: 'unlockable' boss: name: t('questGoldenknight3Boss') hp: 1700 @@ -1761,7 +1762,7 @@ api.quests = notes: t('questBasilistNotes') completion: t('questBasilistCompletion') value: 4 - category: 'ableUnlock' + category: 'unlockable' unlockCondition: condition: 'party invite' text: t('inviteFriends') diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index a9c48ebcea..13b086e7d0 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -19,7 +19,7 @@ mixin questInfo div(ng-bind-html='::selectedQuest.notes()') quest-rewards(key='{{::selectedQuest.key}}', header=env.t('rewards')) -script(type='text/ng-template', id='modals/questCompleted.html') +script(type='text/ng-template', id='modals/questCompleted.html') .modal-header h4 "{{::Content.quests[user.party.quest.completed].text()}}" =env.t('completed') @@ -30,7 +30,7 @@ script(type='text/ng-template', id='modals/questCompleted.html') .modal-footer button.btn.btn-primary(ng-click='set({"party.quest.completed":""}); $close()')=env.t('ok') -script(type='text/ng-template', id='modals/showQuest.html') +script(type='text/ng-template', id='modals/showQuest.html') .modal-header h4 {{::selectedQuest.text()}} .modal-body @@ -43,7 +43,7 @@ script(type='text/ng-template', id='modals/showQuest.html') button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('cancel') button.btn.btn-primary(ng-click='questInit(); $close()')=env.t('inviteParty') -script(type='text/ng-template', id='modals/buyQuest.html') +script(type='text/ng-template', id='modals/buyQuest.html') .modal-header h4 {{::selectedQuest.text()}} .modal-body @@ -53,7 +53,7 @@ script(type='text/ng-template', id='modals/buyQuest.html') button.btn.btn-primary(ng-if='::selectedQuest.category !== "gold"', ng-click='purchase("quests", quest); closeQuest(); $close()')=env.t('buyQuest') + ': {{::selectedQuest.value}} ' + env.t('gems') button.btn.btn-primary(ng-if='::selectedQuest.category === "gold"', ng-click='user.ops.buyQuest({params:{key:selectedQuest.key}}); closeQuest(); $close()')=env.t('buyQuest') + ': {{::selectedQuest.goldValue}} ' + env.t('gold') -script(type='text/ng-template', id='modals/questInvitation.html') +script(type='text/ng-template', id='modals/questInvitation.html') .modal-header h4=env.t('questInvitation') | {{::Content.quests[user.party.quest.key].text()}} @@ -63,7 +63,7 @@ script(type='text/ng-template', id='modals/questInvitation.html') div(ng-if='::Content.quests[user.party.quest.key].boss') h4 {{::Content.quests[user.party.quest.key].boss.name()}} p - strong=env.t('bossHP') + ': ' + strong=env.t('bossHP') + ': ' | {{::Content.quests[user.party.quest.key].boss.hp}} p strong=env.t('bossStrength') + ': ' @@ -71,7 +71,7 @@ script(type='text/ng-template', id='modals/questInvitation.html') div(ng-if='::Content.quests[user.party.quest.key].collect') p(ng-repeat='(k,v) in ::Content.quests[user.party.quest.key].collect') strong=env.t('collect') + ': ' - | {{::Content.quests[user.party.quest.key].collect[k].count}} {{::Content.quests[user.party.quest.key].collect[k].text()}} + | {{::Content.quests[user.party.quest.key].collect[k].count}} {{::Content.quests[user.party.quest.key].collect[k].text()}} div(ng-bind-html='::Content.quests[user.party.quest.key].notes()') quest-rewards(key='{{::user.party.quest.key}}', header=env.t('rewards')) .modal-footer