customizations: rename skins for more political correctness (see https://trello.com/c/YKXmHNjY/306-customization-redo)
36
dist/customizer.css
vendored
|
|
@ -2800,25 +2800,25 @@
|
|||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_800ed0 {
|
||||
.customize-option.skin_6bd049 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -745px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_98461a {
|
||||
.customize-option.skin_800ed0 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -655px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_asian {
|
||||
.customize-option.skin_915533 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -565px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_black {
|
||||
.customize-option.skin_98461a {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -475px -1245px;
|
||||
width: 60px;
|
||||
|
|
@ -2830,85 +2830,85 @@
|
|||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_d7a9f7 {
|
||||
.customize-option.skin_c3e1dc {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -295px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_dead {
|
||||
.customize-option.skin_d7a9f7 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -205px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_ea8349 {
|
||||
.customize-option.skin_ddc994 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -115px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_eb052b {
|
||||
.customize-option.skin_ea8349 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -25px -1245px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_f5d70f {
|
||||
.customize-option.skin_eb052b {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -1095px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_f69922 {
|
||||
.customize-option.skin_f5a76e {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -1005px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_ghost {
|
||||
.customize-option.skin_f5d70f {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -915px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_monster {
|
||||
.customize-option.skin_f69922 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -825px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_orc {
|
||||
.customize-option.skin_ghost {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -735px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_pumpkin {
|
||||
.customize-option.skin_monster {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -645px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_rainbow {
|
||||
.customize-option.skin_pumpkin {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -555px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_shadow {
|
||||
.customize-option.skin_rainbow {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -465px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_skeleton {
|
||||
.customize-option.skin_shadow {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -375px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.customize-option.skin_white {
|
||||
.customize-option.skin_skeleton {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1303px -285px;
|
||||
width: 60px;
|
||||
|
|
|
|||
2
dist/habitrpg-shared.css
vendored
9
dist/habitrpg-shared.js
vendored
|
|
@ -10925,12 +10925,11 @@ var process=require("__browserify_process");(function() {
|
|||
sure to call user.ops.OP_NAME at some point within the overridden function.
|
||||
|
||||
TODO
|
||||
* Allow different error handling - like "200 - not enough gold" (which shouldn't be treated as 500)
|
||||
* Migrate the remaining parts: Tags, party invitiations
|
||||
* Is this the best way to wrap the user object? I thought of using user.prototype, but user is an object not a Function.
|
||||
user on the server is a Mongoose model, so we can use prototype - but to do it on the client, we'd probably have to
|
||||
move to $resource for user
|
||||
* Move to $resource!
|
||||
* Migrate the remaining parts: Tags, party invitiations
|
||||
|
||||
BUGS
|
||||
* Daily repeats don't have the days showing up (translations issue?)
|
||||
|
|
@ -11063,10 +11062,8 @@ var process=require("__browserify_process");(function() {
|
|||
} else {
|
||||
user.items.gear.equipped[item.type] = item.key;
|
||||
user.items.gear.owned[item.key] = true;
|
||||
if ((_ref = item.klass) === 'warrior' || _ref === 'wizard' || _ref === 'healer' || _ref === 'rogue') {
|
||||
if (user.fns.getItem('weapon').last && user.fns.getItem('armor').last && user.fns.getItem('head').last && user.fns.getItem('shield').last) {
|
||||
user.achievements.ultimateGear = true;
|
||||
}
|
||||
if (((_ref = item.klass) === 'warrior' || _ref === 'wizard' || _ref === 'healer' || _ref === 'rogue') && user.fns.getItem('weapon').last && user.fns.getItem('armor').last && user.fns.getItem('head').last && user.fns.getItem('shield').last) {
|
||||
user.achievements.ultimateGear = true;
|
||||
}
|
||||
}
|
||||
user.stats.gp -= item.value;
|
||||
|
|
|
|||
36
dist/spritesmith.css
vendored
|
|
@ -2800,25 +2800,25 @@
|
|||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_800ed0 {
|
||||
.skin_6bd049 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -720px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_98461a {
|
||||
.skin_800ed0 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -630px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_asian {
|
||||
.skin_915533 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -540px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_black {
|
||||
.skin_98461a {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -450px -1230px;
|
||||
width: 90px;
|
||||
|
|
@ -2830,85 +2830,85 @@
|
|||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_d7a9f7 {
|
||||
.skin_c3e1dc {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -270px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_dead {
|
||||
.skin_d7a9f7 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -180px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_ea8349 {
|
||||
.skin_ddc994 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -90px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_eb052b {
|
||||
.skin_ea8349 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: 0px -1230px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_f5d70f {
|
||||
.skin_eb052b {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -1080px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_f69922 {
|
||||
.skin_f5a76e {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -990px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_ghost {
|
||||
.skin_f5d70f {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -900px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_monster {
|
||||
.skin_f69922 {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -810px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_orc {
|
||||
.skin_ghost {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -720px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_pumpkin {
|
||||
.skin_monster {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -630px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_rainbow {
|
||||
.skin_pumpkin {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -540px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_shadow {
|
||||
.skin_rainbow {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -450px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_skeleton {
|
||||
.skin_shadow {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -360px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.skin_white {
|
||||
.skin_skeleton {
|
||||
background-image: url(spritesmith.png);
|
||||
background-position: -1278px -270px;
|
||||
width: 90px;
|
||||
|
|
|
|||
BIN
dist/spritesmith.png
vendored
|
Before Width: | Height: | Size: 287 KiB After Width: | Height: | Size: 287 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
|
@ -292,12 +292,11 @@ everything that doesn't need any code different from what's in user.ops.OP_NAME
|
|||
sure to call user.ops.OP_NAME at some point within the overridden function.
|
||||
|
||||
TODO
|
||||
* Allow different error handling - like "200 - not enough gold" (which shouldn't be treated as 500)
|
||||
* Migrate the remaining parts: Tags, party invitiations
|
||||
* Is this the best way to wrap the user object? I thought of using user.prototype, but user is an object not a Function.
|
||||
user on the server is a Mongoose model, so we can use prototype - but to do it on the client, we'd probably have to
|
||||
move to $resource for user
|
||||
* Move to $resource!
|
||||
* Migrate the remaining parts: Tags, party invitiations
|
||||
|
||||
BUGS
|
||||
* Daily repeats don't have the days showing up (translations issue?)
|
||||
|
|
@ -388,10 +387,9 @@ api.wrap = (user) ->
|
|||
user.stats.hp = 50 if user.stats.hp > 50
|
||||
else
|
||||
user.items.gear.equipped[item.type] = item.key
|
||||
user.items.gear.owned[item.key] = true;
|
||||
if item.klass in ['warrior','wizard','healer','rogue']
|
||||
if user.fns.getItem('weapon').last and user.fns.getItem('armor').last and user.fns.getItem('head').last and user.fns.getItem('shield').last
|
||||
user.achievements.ultimateGear = true
|
||||
user.items.gear.owned[item.key] = true
|
||||
if item.klass in ['warrior','wizard','healer','rogue'] and user.fns.getItem('weapon').last and user.fns.getItem('armor').last and user.fns.getItem('head').last and user.fns.getItem('shield').last
|
||||
user.achievements.ultimateGear = true
|
||||
user.stats.gp -= item.value
|
||||
cb? null, req
|
||||
|
||||
|
|
|
|||