v3.83.5 End Fooling (#8638)

* chore(event): no more foolin

* chore(sprites): compile

* 3.83.5
This commit is contained in:
Sabe Jones
2017-04-02 09:02:15 -05:00
committed by GitHub
parent 82e9afe9ce
commit d166de8ad0
45 changed files with 2688 additions and 2910 deletions

View File

@@ -117,25 +117,5 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$
$scope.achievements = Shared.achievements.getAchievementsForProfile($scope.profile);
$scope.achievPopoverPlacement = 'right';
$scope.achievAppendToBody = 'true'; // append-to-body breaks popovers in modal windows
$scope.aprilFool = function (pet) {
if (!pet) return 'Pet-AprilFool-None';
if (pet === 'Phoenix-Base') return 'Pet-AprilFool-Red';
var petStringArray = pet.split('-');
var petColor = petStringArray[1];
var standardColors = ['Base', 'CottonCandyBlue', 'CottonCandyPink', 'Desert', 'Golden', 'Red', 'Shade', 'Skeleton', 'White', 'Zombie'];
if (standardColors.indexOf(petColor) !== -1) return 'Pet-AprilFool-' + petColor;
if (petColor === 'Cerberus') return 'Pet-AprilFool-Zombie';
if (petColor === 'Cupid') return 'Pet-AprilFool-CottonCandyPink';
if (petColor === 'Ghost') return 'Pet-AprilFool-Skeleton';
if (petColor === 'Gilded') return 'Pet-AprilFool-Golden';
if (petColor === 'Hydra') return 'Pet-AprilFool-Zombie';
if (petColor === 'Polar') return 'Pet-AprilFool-White';
if (petColor === 'RoyalPurple') return 'Pet-AprilFool-Golden';
if (petColor === 'Shimmer') return 'Pet-AprilFool-Red';
if (petColor === 'Spooky') return 'Pet-AprilFool-Zombie';
if (petColor === 'Veteran') return 'Pet-AprilFool-Shade';
return 'Pet-AprilFool-Magic';
}
}
]);