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

fix(incentives): pixel paws, purple background

Browse Source 
Also turns off automatic Base Turkey pet award for new users.
This commit is contained in:
Sabe Jones
2016-11-28 20:57:35 +00:00
parent f929d36e1a
commit c7039bc9ea
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/common/script/content/loginIncentives.js
View File

@@ -10,7 +10,7 @@ module.exports = function getLoginIncentives (api) {
}, },
}, },
2: { 2: {
rewardKey: ['background_blue'], rewardKey: ['background_purple'],
reward: [api.backgrounds.incentiveBackgrounds], reward: [api.backgrounds.incentiveBackgrounds],
assignReward: function assignReward (user) { assignReward: function assignReward (user) {
user.purchased.background.blue = true; user.purchased.background.blue = true;

2
website/server/models/user/hooks.js
View File

@@ -78,8 +78,6 @@ function _setUpNewUser (user) {
let iterableFlags = user.flags.toObject(); let iterableFlags = user.flags.toObject();
user._ABtest = ''; user._ABtest = '';
user.items.pets['Turkey-Base'] = 1;
user.migration = '20161122_turkey_ladder.js';
user.items.quests.dustbunnies = 1; user.items.quests.dustbunnies = 1;
if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') { if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') {

2
website/views/options/inventory/pets.jade
View File

@@ -39,7 +39,7 @@ mixin petList(eggSource, potionSource)
button(class="pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]>0', ng-class='{active: user.items.currentPet == "#{petKey}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{petKey}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")') button(class="pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]>0', ng-class='{active: user.items.currentPet == "#{petKey}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{petKey}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")')
.progress(ng-show='!user.items.mounts["#{petKey}"]') .progress(ng-show='!user.items.mounts["#{petKey}"]')
.progress-bar.progress-bar-success(ng-style='{width: user.items.pets["#{petKey}"]/.5 + "%"}') .progress-bar.progress-bar-success(ng-style='{width: user.items.pets["#{petKey}"]/.5 + "%"}')
button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{petKey}"] && (#{potion.canBuy()} || user.items.hatchingPotions["#{potion.key}"]) || "#{potion.key}" === "RoyalPurple"') button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{petKey}"] && (#{potion.canBuy()} || user.items.hatchingPotions["#{potion.key}"] || "#{potion.key}" === "RoyalPurple")')
.PixelPaw .PixelPaw
button(class="pet-evolved pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]<0') button(class="pet-evolved pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]<0')
.row: .col-md-12 .row: .col-md-12