From 8803df46c03f9d04f1ef3dd577eeba27a3b196c0 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 4 Dec 2013 16:02:08 -0700 Subject: [PATCH] classes & grunt-spritesmith: death, paws, gems-cleanup --- views/options/inventory/stable.jade | 6 +++--- views/options/profile.jade | 4 ++-- views/options/social/group.jade | 2 +- views/shared/gems.jade | 2 +- views/shared/header/avatar.jade | 10 ---------- views/shared/modals/death.jade | 2 +- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 82f719e6d5..4df4017525 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -30,7 +30,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.mounts.htm button(class="pet-button Mount_Head_{{mount}}", ng-show='user.items.mounts[mount]', ng-class='{active: user.items.currentMount == mount}', ng-click='chooseMount(egg.name, potion.name)') //div(class='Mount_Head_{{mount}}') button(class="pet-button pet-not-owned", ng-hide='user.items.mounts[mount]') - img(src='/bower_components/habitrpg-shared/img/PixelPaw.png') + .PixelPaw h4 Rare Mounts menu @@ -60,7 +60,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' //-.progress(ng-class='{"progress-success": user.items.pets[pet]<50}') .bar(style="width: {{user.items.pets[pet]/.5}}%;") button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]') - img(src='/bower_components/habitrpg-shared/img/PixelPaw.png') + .PixelPaw h4 Rare Pets menu @@ -71,7 +71,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' button(ng-if='user.items.pets["Turkey-Base"]', class="pet-button Pet-Turkey-Base", ng-class='{active: user.items.currentPet == "Turkey-Base"}', ng-click='choosePet("Turkey", "Base")', popover='Turkey', popover-trigger='mouseenter', popover-placement='bottom') a(target='_blank', href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG') button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover="Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!", popover-title='How to Get this Pet!') - img(src='/bower_components/habitrpg-shared/img/PixelPaw-Gold.png') + .PixelPaw-Gold //-.well.food-tray p(ng-show='foodCount < 1') You don't have any food yet. diff --git a/views/options/profile.jade b/views/options/profile.jade index 1dea74ff85..b9c8749c37 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -45,7 +45,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') // Bangs li.customize-menu menu(label='Bangs') - button(class='hair_bangs_0_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",0)') + button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.bangs",0)') button(class='hair_bangs_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",1)') button(class='hair_bangs_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",2)') button(class='hair_bangs_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",3)') @@ -53,7 +53,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') // Base li.customize-menu menu(label='Base') - button(class='hair_base_0_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",0)') + button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.base",0)') button(class='hair_base_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",1)') button(class='hair_base_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",2)') button(class='hair_base_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",3)') diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 9371e3567d..17ef4cbde3 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -1,7 +1,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank', popover='Gems which your guild leader can use for challenge prizes.', popover-placement='left', popover-html='true') // ＋ span.task-action-btn.tile.flush.neutral - .Gems + .Pet_Currency_Gem2x.Gems | {{group.balance * 4 | number:0 }} Guild Gems .row-fluid .span4 diff --git a/views/shared/gems.jade b/views/shared/gems.jade index 09c9c50dbf..7dc26b0463 100644 --- a/views/shared/gems.jade +++ b/views/shared/gems.jade @@ -1,5 +1,5 @@ a.pull-right.gem-wallet(ng-click='modals.buyGems = true', popover-trigger='mouseenter', popover-title='Gems', popover="Used for buying special items (reroll, eggs, hatching potions, etc). You'll need to unlock those features before being able to use Gems.", popover-placement='bottom') span.task-action-btn.tile.flush.bright.add-gems-btn ＋ span.task-action-btn.tile.flush.neutral - .Gems + .Pet_Currency_Gem2x.Gems | {{user.balance * 4 | number:0}} Gems \ No newline at end of file diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index e050431114..e7cc90271b 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -8,16 +8,6 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember( // Mount Body span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}') - //- Avatar - //-span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}') - //-span(class='{{profile.preferences.gender}}_head_0') - //-span(class='{{profile.preferences.gender}}_hair_base_{{profile.preferences.hair.base}}_{{profile.preferences.hair.color}}') - //-span(class='{{profile.preferences.gender}}_hair_bangs_{{profile.preferences.hair.bangs}}_{{profile.preferences.hair.color}}') - //-span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}-{{profile.stats.class}}') - //-span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer, profile.contributor)}}-{{profile.stats.class}}', ng-show='profile.preferences.showHelm') - //-span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}-{{profile.stats.class}}') - //-span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}-{{profile.stats.class}}') - span(class='skin_{{profile.preferences.skin}}') span(class='{{profile.preferences.size}}_{{profile.items.gear.current.armor}}', ng-show='profile.preferences.showArmor') span(class='head_warrior_0') diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade index 3384ccbfe9..7069de2135 100644 --- a/views/shared/modals/death.jade +++ b/views/shared/modals/death.jade @@ -3,7 +3,7 @@ div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdro .row-fluid .span4 figure.notification-character - img(src='/bower_components/habitrpg-shared/img/sprites/dead.png') + .GrimReaper .span8 h2 You Died! .row-fluid