From c7039bc9ea51b05a75d444be63ca525fd02b7bac Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Mon, 28 Nov 2016 20:57:35 +0000
Subject: [PATCH] fix(incentives): pixel paws, purple background Also turns off
 automatic Base Turkey pet award for new users.

---
 website/common/script/content/loginIncentives.js | 2 +-
 website/server/models/user/hooks.js              | 2 --
 website/views/options/inventory/pets.jade        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/website/common/script/content/loginIncentives.js b/website/common/script/content/loginIncentives.js
index 812e40cb67..6b205aad7c 100644
--- a/website/common/script/content/loginIncentives.js
+++ b/website/common/script/content/loginIncentives.js
@@ -10,7 +10,7 @@ module.exports = function getLoginIncentives (api) {
       },
     },
     2: {
-      rewardKey: ['background_blue'],
+      rewardKey: ['background_purple'],
       reward: [api.backgrounds.incentiveBackgrounds],
       assignReward: function assignReward (user) {
         user.purchased.background.blue = true;
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index 5f921d06bf..3c0004e788 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -78,8 +78,6 @@ function _setUpNewUser (user) {
   let iterableFlags = user.flags.toObject();
 
   user._ABtest = '';
-  user.items.pets['Turkey-Base'] = 1;
-  user.migration = '20161122_turkey_ladder.js';
   user.items.quests.dustbunnies = 1;
 
   if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') {
diff --git a/website/views/options/inventory/pets.jade b/website/views/options/inventory/pets.jade
index 2cb6793af7..1c7c673e54 100644
--- a/website/views/options/inventory/pets.jade
+++ b/website/views/options/inventory/pets.jade
@@ -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}")')
                   .progress(ng-show='!user.items.mounts["#{petKey}"]')
                     .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
                 button(class="pet-evolved pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]<0')
   .row: .col-md-12