mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-01 15:31:16 +00:00
add hair to customizer options & run grunt
This commit is contained in:
Tyler Renelle
parent
c15ab8d413
commit
e84b1975a9
3 changed files with 23 additions and 63 deletions
|
|
@ -7,6 +7,7 @@
|
|||
.customize-menu .f_hair_brown {width: 60px; height: 60px; background-position: -2099px -8px;}
|
||||
.customize-menu .f_hair_black {width: 60px; height: 60px; background-position: -2189px -8px;}
|
||||
.customize-menu .f_hair_blond {width: 60px; height: 60px; background-position: -2279px -8px;}
|
||||
.customize-menu .f_hair_red {width: 60px; height: 60px; background-position: -4979px -8px;}
|
||||
|
||||
.customize-menu .f_skin_dead {width: 60px; height: 60px; background-position: -2997px -20px;}
|
||||
.customize-menu .f_skin_orc {width: 60px; height: 60px; background-position: -3087px -20px;}
|
||||
|
|
@ -40,6 +41,7 @@
|
|||
.customize-menu .m_hair_black {width: 60px; height: 60px; background-position: -1737px -6px;}
|
||||
.customize-menu .m_hair_brown {width: 60px; height: 60px; background-position: -1827px -6px;}
|
||||
.customize-menu .m_hair_white {width: 60px; height: 60px; background-position: -1917px -6px;}
|
||||
.customize-menu .m_hair_red {width: 60px; height: 60px; background-position: -4528px -6px;}
|
||||
|
||||
.customize-menu .m_skin_dead {width: 60px; height: 60px; background-position: -2547px -20px;}
|
||||
.customize-menu .m_skin_orc {width: 60px; height: 60px; background-position: -2637px -20px;}
|
||||
|
|
|
|||
82
dist/habitrpg-shared.js
vendored
82
dist/habitrpg-shared.js
vendored
|
|
@ -53,7 +53,7 @@ process.chdir = function (dir) {
|
|||
};
|
||||
|
||||
},{}],2:[function(require,module,exports){
|
||||
var global=typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};/**
|
||||
var global=self;/**
|
||||
* @license
|
||||
* Lo-Dash 1.3.1 (Custom Build) <http://lodash.com/>
|
||||
* Build: `lodash modern -o ./dist/lodash.js`
|
||||
|
|
@ -7347,7 +7347,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.revive = function(user, options) {
|
||||
var candidate, loseThisItem, owned, paths;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7397,7 +7396,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.tnl = function(level) {
|
||||
var value;
|
||||
|
||||
if (level >= 100) {
|
||||
value = 0;
|
||||
} else {
|
||||
|
|
@ -7417,7 +7415,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.expModifier = function(value, weaponStr, level, priority) {
|
||||
var exp, str, strMod, totalStr;
|
||||
|
||||
if (priority == null) {
|
||||
priority = '!';
|
||||
}
|
||||
|
|
@ -7440,7 +7437,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.hpModifier = function(value, armorDef, helmDef, shieldDef, level, priority) {
|
||||
var def, defMod, hp, totalDef;
|
||||
|
||||
if (priority == null) {
|
||||
priority = '!';
|
||||
}
|
||||
|
|
@ -7459,7 +7455,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.gpModifier = function(value, modifier, priority, streak, user) {
|
||||
var afterStreak, streakBonus, val;
|
||||
|
||||
if (priority == null) {
|
||||
priority = '!';
|
||||
}
|
||||
|
|
@ -7486,7 +7481,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
obj.taskDeltaFormula = function(currentValue, direction) {
|
||||
var delta;
|
||||
|
||||
if (currentValue < -47.27) {
|
||||
currentValue = -47.27;
|
||||
} else if (currentValue > 21.27) {
|
||||
|
|
@ -7505,8 +7499,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
|
||||
randomDrop = function(user, delta, priority, streak, options) {
|
||||
var acceptableDrops, chanceMultiplier, drop, paths, rarity, reachedDropLimit, _base, _base1, _base2, _ref1, _ref2, _ref3, _ref4;
|
||||
|
||||
var acceptableDrops, chanceMultiplier, drop, paths, rarity, reachedDropLimit, _base, _base1, _base2, _ref1;
|
||||
if (streak == null) {
|
||||
streak = 0;
|
||||
}
|
||||
|
|
@ -7514,7 +7507,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
options = {};
|
||||
}
|
||||
paths = options.paths || {};
|
||||
if ((_ref1 = (_base = user.items).lastDrop) == null) {
|
||||
if ((_base = user.items).lastDrop == null) {
|
||||
_base.lastDrop = {
|
||||
date: +moment().subtract('d', 1),
|
||||
count: 0
|
||||
|
|
@ -7528,11 +7521,11 @@ if(typeof module != 'undefined' && module.exports){
|
|||
chanceMultiplier = Math.abs(delta);
|
||||
chanceMultiplier *= obj.priorityValue(priority);
|
||||
chanceMultiplier += streak;
|
||||
if (((_ref2 = user.flags) != null ? _ref2.dropsEnabled : void 0) && Math.random() < (.05 * chanceMultiplier)) {
|
||||
if (((_ref1 = user.flags) != null ? _ref1.dropsEnabled : void 0) && Math.random() < (.05 * chanceMultiplier)) {
|
||||
rarity = Math.random();
|
||||
if (rarity > .5) {
|
||||
drop = helpers.randomVal(pets);
|
||||
((_ref3 = (_base1 = user.items).eggs) != null ? _ref3 : _base1.eggs = []).push(drop);
|
||||
((_base1 = user.items).eggs != null ? (_base1 = user.items).eggs : _base1.eggs = []).push(drop);
|
||||
paths['items.eggs'] = true;
|
||||
drop.type = 'Egg';
|
||||
drop.dialog = "You've found a " + drop.text + " Egg! " + drop.notes;
|
||||
|
|
@ -7548,12 +7541,11 @@ if(typeof module != 'undefined' && module.exports){
|
|||
acceptableDrops = ['Base', 'White', 'Desert'];
|
||||
}
|
||||
acceptableDrops = hatchingPotions.filter(function(hatchingPotion) {
|
||||
var _ref4;
|
||||
|
||||
return _ref4 = hatchingPotion.name, __indexOf.call(acceptableDrops, _ref4) >= 0;
|
||||
var _ref2;
|
||||
return _ref2 = hatchingPotion.name, __indexOf.call(acceptableDrops, _ref2) >= 0;
|
||||
});
|
||||
drop = helpers.randomVal(acceptableDrops);
|
||||
((_ref4 = (_base2 = user.items).hatchingPotions) != null ? _ref4 : _base2.hatchingPotions = []).push(drop.name);
|
||||
((_base2 = user.items).hatchingPotions != null ? (_base2 = user.items).hatchingPotions : _base2.hatchingPotions = []).push(drop.name);
|
||||
paths['items.hatchingPotions'] = true;
|
||||
drop.type = 'HatchingPotion';
|
||||
drop.dialog = "You've found a " + drop.text + " Hatching Potion! " + drop.notes;
|
||||
|
|
@ -7566,8 +7558,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
};
|
||||
|
||||
obj.score = function(user, task, direction, options) {
|
||||
var addPoints, calculateDelta, cron, delta, exp, gp, hp, lvl, num, paths, priority, streak, subtractPoints, times, type, value, _ref1, _ref2, _ref3, _ref4;
|
||||
|
||||
var addPoints, calculateDelta, cron, delta, exp, gp, hp, lvl, num, paths, priority, streak, subtractPoints, times, type, value, _ref1, _ref2, _ref3;
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7598,7 +7589,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
}
|
||||
return _.times(times, function() {
|
||||
var nextDelta;
|
||||
|
||||
nextDelta = obj.taskDeltaFormula(value, direction);
|
||||
if (adjustvalue) {
|
||||
value += nextDelta;
|
||||
|
|
@ -7608,7 +7598,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
};
|
||||
addPoints = function() {
|
||||
var weaponStr;
|
||||
|
||||
weaponStr = items.getItem('weapon', user.items.weapon).strength;
|
||||
exp += obj.expModifier(delta, weaponStr, user.stats.lvl, priority) / 2;
|
||||
if (streak) {
|
||||
|
|
@ -7619,7 +7608,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
};
|
||||
subtractPoints = function() {
|
||||
var armorDef, headDef, shieldDef;
|
||||
|
||||
armorDef = items.getItem('armor', user.items.armor).defense;
|
||||
headDef = items.getItem('head', user.items.head).defense;
|
||||
shieldDef = items.getItem('shield', user.items.shield).defense;
|
||||
|
|
@ -7634,7 +7622,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
subtractPoints();
|
||||
}
|
||||
if (task.value !== value) {
|
||||
((_ref4 = task.history) != null ? _ref4 : task.history = []).push({
|
||||
(task.history != null ? task.history : task.history = []).push({
|
||||
date: +(new Date),
|
||||
value: value
|
||||
});
|
||||
|
|
@ -7710,8 +7698,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
|
||||
updateStats = function(user, newStats, options) {
|
||||
var gp, paths, tnl, _ref1;
|
||||
|
||||
var gp, paths, tnl;
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7754,7 +7741,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
paths['stats.lvl'] = true;
|
||||
paths['stats.gp'] = true;
|
||||
paths['stats.hp'] = true;
|
||||
if ((_ref1 = user.flags) == null) {
|
||||
if (user.flags == null) {
|
||||
user.flags = {};
|
||||
}
|
||||
if (!user.flags.customizationsNotification && (user.stats.exp > 10 || user.stats.lvl > 1)) {
|
||||
|
|
@ -7792,8 +7779,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
|
||||
|
||||
obj.cron = function(user, options) {
|
||||
var daysMissed, expTally, lvl, now, paths, todoTally, _base, _base1, _ref1, _ref2, _ref3, _ref4;
|
||||
|
||||
var daysMissed, expTally, lvl, now, paths, todoTally, _base, _base1, _ref1;
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7816,8 +7802,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
}
|
||||
todoTally = 0;
|
||||
user.todos.concat(user.dailys).forEach(function(task) {
|
||||
var absVal, completed, id, repeat, scheduleMisses, type, _ref2;
|
||||
|
||||
var absVal, completed, id, repeat, scheduleMisses, type;
|
||||
if (!task) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -7828,7 +7813,6 @@ if(typeof module != 'undefined' && module.exports){
|
|||
scheduleMisses = 0;
|
||||
_.times(daysMissed, function(n) {
|
||||
var thatDay;
|
||||
|
||||
thatDay = moment(now).subtract('days', n + 1);
|
||||
if (helpers.shouldDo(thatDay, repeat, user.preferences)) {
|
||||
return scheduleMisses++;
|
||||
|
|
@ -7845,7 +7829,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
}
|
||||
switch (type) {
|
||||
case 'daily':
|
||||
((_ref2 = task.history) != null ? _ref2 : task.history = []).push({
|
||||
(task.history != null ? task.history : task.history = []).push({
|
||||
date: +(new Date),
|
||||
value: task.value
|
||||
});
|
||||
|
|
@ -7867,7 +7851,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
return paths["tasks." + task.id + ".value"] = true;
|
||||
}
|
||||
});
|
||||
((_ref2 = (_base = ((_ref3 = user.history) != null ? _ref3 : user.history = {})).todos) != null ? _ref2 : _base.todos = []).push({
|
||||
((_base = (user.history != null ? user.history : user.history = {})).todos != null ? (_base = (user.history != null ? user.history : user.history = {})).todos : _base.todos = []).push({
|
||||
date: now,
|
||||
value: todoTally
|
||||
});
|
||||
|
|
@ -7877,7 +7861,7 @@ if(typeof module != 'undefined' && module.exports){
|
|||
lvl++;
|
||||
expTally += obj.tnl(lvl);
|
||||
}
|
||||
((_ref4 = (_base1 = user.history).exp) != null ? _ref4 : _base1.exp = []).push({
|
||||
((_base1 = user.history).exp != null ? (_base1 = user.history).exp : _base1.exp = []).push({
|
||||
date: now,
|
||||
value: expTally
|
||||
});
|
||||
|
|
@ -7907,7 +7891,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
sanitizeOptions = function(o) {
|
||||
var dayStart, now, timezoneOffset, _ref;
|
||||
|
||||
dayStart = o.dayStart && (0 <= (_ref = +o.dayStart) && _ref <= 24) ? +o.dayStart : 0;
|
||||
timezoneOffset = o.timezoneOffset ? +o.timezoneOffset : +moment().zone();
|
||||
now = o.now ? moment(o.now).zone(timezoneOffset) : moment(+(new Date)).zone(timezoneOffset);
|
||||
|
|
@ -7920,7 +7903,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
startOfWeek = function(options) {
|
||||
var o;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7930,7 +7912,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
startOfDay = function(options) {
|
||||
var o;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7955,7 +7936,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
daysSince = function(yesterday, options) {
|
||||
var o;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7972,7 +7952,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
shouldDo = function(day, repeat, options) {
|
||||
var o, selected, yesterday;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -7997,7 +7976,6 @@ var process=require("__browserify_process");(function() {
|
|||
uuid = function() {
|
||||
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
|
||||
var r, v;
|
||||
|
||||
r = Math.random() * 16 | 0;
|
||||
v = (c === "x" ? r : r & 0x3 | 0x8);
|
||||
return v.toString(16);
|
||||
|
|
@ -8007,8 +7985,7 @@ var process=require("__browserify_process");(function() {
|
|||
module.exports = {
|
||||
uuid: uuid,
|
||||
taskDefaults: function(task, filters) {
|
||||
var defaults, self, _ref;
|
||||
|
||||
var defaults, self;
|
||||
if (filters == null) {
|
||||
filters = {};
|
||||
}
|
||||
|
|
@ -8037,14 +8014,13 @@ var process=require("__browserify_process");(function() {
|
|||
})
|
||||
};
|
||||
_.defaults(task, defaults);
|
||||
if ((_ref = task.value) == null) {
|
||||
if (task.value == null) {
|
||||
task.value = task.type === 'reward' ? 10 : 0;
|
||||
}
|
||||
return task;
|
||||
},
|
||||
newUser: function(isDerby) {
|
||||
var defaultTags, defaultTasks, guid, newUser, repeat, tag, task, userSchema, _i, _j, _len, _len1;
|
||||
|
||||
if (isDerby == null) {
|
||||
isDerby = false;
|
||||
}
|
||||
|
|
@ -8207,19 +8183,16 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
dotSet: function(path, val, obj) {
|
||||
var arr, err;
|
||||
|
||||
if (~path.indexOf('undefined')) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
arr = path.split('.');
|
||||
return _.reduce(arr, function(curr, next, index) {
|
||||
var _ref;
|
||||
|
||||
if ((arr.length - 1) === index) {
|
||||
curr[next] = val;
|
||||
}
|
||||
return (_ref = curr[next]) != null ? _ref : curr[next] = {};
|
||||
return curr[next] != null ? curr[next] : curr[next] = {};
|
||||
}, obj);
|
||||
} catch (_error) {
|
||||
err = _error;
|
||||
|
|
@ -8233,7 +8206,6 @@ var process=require("__browserify_process");(function() {
|
|||
},
|
||||
dotGet: function(path, obj) {
|
||||
var err;
|
||||
|
||||
if (~path.indexOf('undefined')) {
|
||||
return void 0;
|
||||
}
|
||||
|
|
@ -8263,7 +8235,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
randomVal: function(obj) {
|
||||
var count, key, result, val;
|
||||
|
||||
result = void 0;
|
||||
count = 0;
|
||||
for (key in obj) {
|
||||
|
|
@ -8290,7 +8261,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
username: function(auth, override) {
|
||||
var fb, _ref;
|
||||
|
||||
if (override) {
|
||||
return override;
|
||||
}
|
||||
|
|
@ -8315,7 +8285,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
encodeiCalLink: function(uid, apiToken) {
|
||||
var loc, _ref;
|
||||
|
||||
loc = (typeof window !== "undefined" && window !== null ? window.location.host : void 0) || (typeof process !== "undefined" && process !== null ? (_ref = process.env) != null ? _ref.BASE_URL : void 0 : void 0) || '';
|
||||
return encodeURIComponent("http://" + loc + "/v1/users/" + uid + "/calendar.ics?apiToken=" + apiToken);
|
||||
},
|
||||
|
|
@ -8325,7 +8294,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
equipped: function(type, item, preferences, backerTier) {
|
||||
var armorSet, gender;
|
||||
|
||||
if (item == null) {
|
||||
item = 0;
|
||||
}
|
||||
|
|
@ -8422,7 +8390,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
taskClasses: function(task, filters, dayStart, lastCron, showCompleted, main) {
|
||||
var classes, completed, enabled, filter, repeat, type, value, _ref;
|
||||
|
||||
if (showCompleted == null) {
|
||||
showCompleted = false;
|
||||
}
|
||||
|
|
@ -8516,7 +8483,6 @@ var process=require("__browserify_process");(function() {
|
|||
|
||||
appliedTags: function(userTags, taskTags) {
|
||||
var arr;
|
||||
|
||||
arr = [];
|
||||
_.each(userTags, function(t) {
|
||||
if (t == null) {
|
||||
|
|
@ -8537,7 +8503,6 @@ var process=require("__browserify_process");(function() {
|
|||
},
|
||||
totalStr: function(level, weapon) {
|
||||
var str;
|
||||
|
||||
if (weapon == null) {
|
||||
weapon = 0;
|
||||
}
|
||||
|
|
@ -8549,7 +8514,6 @@ var process=require("__browserify_process");(function() {
|
|||
},
|
||||
totalDef: function(level, armor, head, shield) {
|
||||
var totalDef;
|
||||
|
||||
if (armor == null) {
|
||||
armor = 0;
|
||||
}
|
||||
|
|
@ -8570,7 +8534,6 @@ var process=require("__browserify_process");(function() {
|
|||
},
|
||||
itemStat: function(type, item) {
|
||||
var i;
|
||||
|
||||
if (item == null) {
|
||||
item = 0;
|
||||
}
|
||||
|
|
@ -8594,7 +8557,6 @@ var process=require("__browserify_process");(function() {
|
|||
hydrate: function(spec) {
|
||||
var hydrated, keys,
|
||||
_this = this;
|
||||
|
||||
if (_.isObject(spec) && !_.isArray(spec)) {
|
||||
hydrated = {};
|
||||
keys = _.keys(spec).concat(_.keys(spec.__proto__));
|
||||
|
|
@ -8971,7 +8933,6 @@ try {
|
|||
|
||||
module.exports.buyItem = function(user, type, options) {
|
||||
var nextItem;
|
||||
|
||||
if (options == null) {
|
||||
options = {};
|
||||
}
|
||||
|
|
@ -9004,11 +8965,9 @@ try {
|
|||
|
||||
module.exports.updateStore = function(user) {
|
||||
var changes;
|
||||
|
||||
changes = {};
|
||||
_.each(['weapon', 'armor', 'shield', 'head'], function(type) {
|
||||
var i, showNext, _ref, _ref1, _ref2;
|
||||
|
||||
i = ~~(((_ref = user.items) != null ? _ref[type] : void 0) || 0) + 1;
|
||||
showNext = true;
|
||||
if (i === items[type].length - 1) {
|
||||
|
|
@ -9036,7 +8995,6 @@ try {
|
|||
|
||||
module.exports.getItem = function(type, index) {
|
||||
var i;
|
||||
|
||||
if (index == null) {
|
||||
index = 0;
|
||||
}
|
||||
|
|
|
|||
2
dist/spritesheets.css
vendored
2
dist/spritesheets.css
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue