Compare commits

...

2 Commits

Author SHA1 Message Date
SabreCat
5bfdff3cd8 3.83.3 2017-04-01 01:25:05 +00:00
SabreCat
0c161e9bce fix(fooling): add logic to party and member modals 2017-04-01 01:24:41 +00:00
4 changed files with 41 additions and 2 deletions

2
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "3.83.2",
"version": "3.83.3",
"dependencies": {
"@gulp-sourcemaps/map-sources": {
"version": "1.0.0",

View File

@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "3.83.2",
"version": "3.83.3",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

View File

@@ -80,5 +80,24 @@ habitrpg
$scope.$close();
});
}
$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';
}
}
]);

View File

@@ -286,5 +286,25 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
return isQuestLeader;
};
$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';
}
}
]);