krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gem amount on master key (#10140)

Browse Source 
* Fixed gem amount on master key

* fix(news): update Bailey text
This commit is contained in:
Keith Holliday
2018-03-15 16:19:11 -05:00
committed by Sabe Jones
parent bb6f465ac8
commit 7fe62a731b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/shops/buyModal.vue
View File

@@ -42,7 +42,7 @@
:item="item" :item="item"
) )
.purchase-amount .purchase-amount(v-if='item.value > 0')
.how-many-to-buy(v-if='showAmountToBuy(item)') .how-many-to-buy(v-if='showAmountToBuy(item)')
strong {{ $t('howManyToBuy') }} strong {{ $t('howManyToBuy') }}
div(v-if='showAmountToBuy(item)') div(v-if='showAmountToBuy(item)')

2
website/client/components/shops/market/keysToKennel.vue
View File

@@ -123,7 +123,7 @@ export default {
key: 'keysToBoth', key: 'keysToBoth',
text: this.$t('keyToBoth'), text: this.$t('keyToBoth'),
notes: this.$t('keyToBothDesc'), notes: this.$t('keyToBothDesc'),
value: 6, value: 0,
currency: 'gems', currency: 'gems',
class: 'key_to_both', class: 'key_to_both',
locked: false, locked: false,

4
website/common/script/ops/releaseBoth.js
View File

@@ -10,8 +10,8 @@ import pick from 'lodash/pick';
module.exports = function releaseBoth (user, req = {}, analytics) { module.exports = function releaseBoth (user, req = {}, analytics) {
let animal; let animal;
if (user.balance < 1.5 && !user.achievements.triadBingo) { if (!user.achievements.triadBingo) {
throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); throw new NotAuthorized(i18n.t('notEnoughPetsMounts', req.language));
} }
if (beastMasterProgress(user.items.pets) !== 90 || mountMasterProgress(user.items.mounts) !== 90) { if (beastMasterProgress(user.items.pets) !== 90 || mountMasterProgress(user.items.mounts) !== 90) {

2
website/server/controllers/api-v3/news.js
View File

@@ -37,7 +37,7 @@ api.getNews = {
<div class="media align-items-center"> <div class="media align-items-center">
<div class="media-body"> <div class="media-body">
<h3>Release Pets & Mounts!</h3> <h3>Release Pets & Mounts!</h3>
<p>The Keys to the Kennels have returned! Now, when you collect all 90 standard pets or mounts, you can release them for 4 Gems, letting you collect them all over again! If you want a real challenge, you can attain the elusive Triad Bingo by filling your stable with all of both, then set them all free at once for 6 Gems!</p> <p>The Keys to the Kennels have returned! Now, when you collect all 90 standard pets or mounts, you can release them for 4 Gems, letting you collect them all over again! If you want a real challenge, you can attain the elusive Triad Bingo by filling your stable with all of both, then set them all free at once at no cost!</p>
</div> </div>
<div class="pet_key ml-3"></div> <div class="pet_key ml-3"></div>
</div> </div>