mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-04-14 19:56:23 +00:00
Rebased to resolve merge conflicts
This commit is contained in:
hairlessbear
parent
844c1ed178
commit
958068c2b0
4 changed files with 59 additions and 12 deletions
|
|
@ -31,7 +31,7 @@ module.exports = function(grunt) {
|
|||
// For hair, skins, beards, etc. we want to output a '.customize-options.WHATEVER' class, which works as a
|
||||
// 60x60 image pointing at the proper part of the 90x90 sprite.
|
||||
// We set up the custom info here, and the template makes use of it.
|
||||
if (sprite.name.match(/hair|skin|beard|mustach|shirt|flower/) || sprite.name=='head_0') {
|
||||
if (sprite.name.match(/hair|skin|beard|mustach|shirt|flower|\bheadAccessory_special_\w+Ears\b/) || sprite.name=='head_0') {
|
||||
sprite.custom = {
|
||||
px: {
|
||||
offset_x: "-" + (sprite.x + 25) + "px",
|
||||
|
|
|
|||
2
common/dist/sprites/habitrpg-shared.css
vendored
2
common/dist/sprites/habitrpg-shared.css
vendored
File diff suppressed because one or more lines are too long
48
common/dist/sprites/spritesmith4.css
vendored
48
common/dist/sprites/spritesmith4.css
vendored
|
|
@ -28,48 +28,96 @@
|
|||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_bearEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -15px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_cactusEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -455px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_cactusEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -470px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_foxEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -546px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_foxEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -561px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_lionEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -637px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_lionEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -652px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_pandaEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -728px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_pandaEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -743px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_pigEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -819px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_pigEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -834px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_tigerEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -910px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_tigerEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -925px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.headAccessory_special_wolfEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1625px -1001px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.headAccessory_special_wolfEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1650px -1016px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.shop_headAccessory_special_bearEars {
|
||||
background-image: url(spritesmith4.png);
|
||||
background-position: -1056px -811px;
|
||||
|
|
|
|||
|
|
@ -49,19 +49,26 @@ mixin customizeProfile(mobile)
|
|||
h3(class=mobile?'item item-divider':'')=env.t('accessories')
|
||||
|
||||
menu(type='list')
|
||||
// Flower
|
||||
li.customize-menu
|
||||
menu(label=env.t('flower'))
|
||||
button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.flower":0})', ng-class='{selectableInventory: user.preferences.hair.flower == 0}')
|
||||
each num in [1,2,3,4,5,6]
|
||||
button(class='hair_flower_#{num} customize-option', type='button', ng-click='set({"preferences.hair.flower":#{num}})', ng-class='{selectableInventory: user.preferences.hair.flower == "#{num}"}')
|
||||
|
||||
// Animal Ears
|
||||
li.customize-menu
|
||||
menu(label=env.t('animalEars'))
|
||||
span(ng-hide='#{showPath("user.items.gear.owned", gearGroup("animal"), "&&")}')
|
||||
+gemCost(2)
|
||||
button.btn.btn-xs(ng-click='#{unlockPath("items.gear.owned", gearGroup("animal"))}')!= env.t('unlockSet', {cost: 5}) + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
|
||||
button.customize-option(ng-repeat='item in ::getGearArray("animal")' ng-class="{locked: user.items.gear.owned[item.key] == undefined, selectableInventory: user.preferences.costume ? user.items.gear.costume.headAccessory == item.key : user.items.gear.equipped.headAccessory == item.key}", popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}')
|
||||
button.customize-option(ng-repeat='item in ::getGearArray("animal")' ng-class="{locked: user.items.gear.owned[item.key] == undefined, selectableInventory: user.preferences.costume ? user.items.gear.costume.headAccessory == item.key : user.items.gear.equipped.headAccessory == item.key}", popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='{{::item.key}}')
|
||||
|
||||
.col-md-4
|
||||
h3(class=mobile?'item item-divider':'')=env.t('bodyHead')
|
||||
menu(type='list')
|
||||
// For special events code, see commit dfa27b3
|
||||
|
||||
|
||||
// Color
|
||||
li.customize-menu
|
||||
menu(label=env.t('color'))
|
||||
|
|
@ -107,14 +114,6 @@ mixin customizeProfile(mobile)
|
|||
each num in styles
|
||||
button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"], selectableInventory: user.preferences.hair.base == "#{num}"}', ng-click='unlock("hair.base.#{num}")')
|
||||
|
||||
|
||||
// Flower
|
||||
li.customize-menu
|
||||
menu(label=env.t('flower'))
|
||||
button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.flower":0})', ng-class='{selectableInventory: user.preferences.hair.flower == 0}')
|
||||
each num in [1,2,3,4,5,6]
|
||||
button(class='hair_flower_#{num} customize-option', type='button', ng-click='set({"preferences.hair.flower":#{num}})', ng-class='{selectableInventory: user.preferences.hair.flower == "#{num}"}')
|
||||
|
||||
li.customize-menu
|
||||
menu(label=env.t('bodyFacialHair'))
|
||||
span(ng-hide='user.purchased.hair.mustache["1"] && user.purchased.hair.mustache["2"] && user.purchased.hair.beard["1"] && user.purchased.hair.beard["2"] && user.purchased.hair.beard["3"]')
|
||||
|
|
|
|||
Loading…
Reference in a new issue