From db5befb570e291ad0379e3501b0aa67453687b37 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 26 Nov 2013 17:40:05 -0700 Subject: [PATCH] thanksgiving turkey & npcs --- migrations/20131126_turkey_pet.js | 1 + public/css/npcs.styl | 6 ++--- src/models/user.js | 3 ++- views/options/inventory/stable.jade | 3 ++- views/shared/modals/new-stuff.jade | 39 +++++++++++++++++++---------- 5 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 migrations/20131126_turkey_pet.js diff --git a/migrations/20131126_turkey_pet.js b/migrations/20131126_turkey_pet.js new file mode 100644 index 0000000000..67ddb5093e --- /dev/null +++ b/migrations/20131126_turkey_pet.js @@ -0,0 +1 @@ +db.users.update({},{$set:{'items.pets.Turkey-Base':5}}, {multi:true}); \ No newline at end of file diff --git a/public/css/npcs.styl b/public/css/npcs.styl index 084a5c19d4..75409726a7 100644 --- a/public/css/npcs.styl +++ b/public/css/npcs.styl @@ -1,4 +1,4 @@ -.NPC-Alex, .NPC-Bailey, .NPC-Bailey-Head, .NPC-Daniel, .NPC-Justin, .NPC-Justin-Head, .NPC-Matt {background: url("/bower_components/habitrpg-shared/img/npcs/NPC-SpriteSheet.png") no-repeat} +.NPC-Alex, .NPC-Bailey, .NPC-Bailey-Head, .NPC-Daniel, .NPC-Justin, .NPC-Justin-Head, .NPC-Matt {background: url("/bower_components/habitrpg-shared/img/npcs/thanksgiving/NPC-SpriteSheet.png") no-repeat} .NPC-Alex {background-position: 0 0; width: 162px; height: 138px;} .NPC-Alex-container{margin-bottom: 20px;} @@ -14,8 +14,8 @@ height: 72px float:left .NPC-Bailey-Head - background-position: -168px -42px - width: 54px + background-position: -162px -42px + width: 60px height: 30px position: absolute top: 117px // 147 (header-height) - 30 (bailey height) diff --git a/src/models/user.js b/src/models/user.js index 43e91a746f..4dec67f8a4 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -125,7 +125,8 @@ var UserSchema = new Schema({ { 'Wolf-Veteran': Number, 'Wolf-Cerberus': Number, - 'Dragon-Hydra': Number + 'Dragon-Hydra': Number, + 'Turkey-Base': Number } ), currentPet: String, // Cactus-Desert diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 33304e9d59..82f719e6d5 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -67,7 +67,8 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' div button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran"}', ng-click='choosePet("Wolf", "Veteran")', popover='Veteran Wolf', popover-trigger='mouseenter', popover-placement='bottom') button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus"}', ng-click='choosePet("Wolf", "Cerberus")', popover='Cerberus Pup', popover-trigger='mouseenter', popover-placement='bottom') - button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', popover='Hydra Pet', popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', popover='Hydra', popover-trigger='mouseenter', popover-placement='bottom') + 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') diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index 2afeabee87..a24c8049c8 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -12,25 +12,38 @@ div(modal='modals.newStuff') h3.popover-title a(target='_blank', href='https://twitter.com/Mihakuu') Bailey .popover-content - table + table.table.table-striped tr td - //ul.modal-indented-list - h4 Contrib Gear - p. - You can now unlock new a top-tier gear set and pet by contributing (code, art, docs, etc) to HabitRPG. Read more - small.muted 11/08/2013 + h4 Turkey Event (by @lemoness) + p Say hi to our NPCs, dressed to impressed for Turkey day! Also - check your stable, you'll find a fun new pet. + tr td - .herobox(style='background-color:transparent;') - .character-sprites - span.armor_7 - span.head_7 - span.shield_7 - span.weapon_8 - span.current-pet.Pet-Dragon-Hydra + h4 Chat Enhancements (by @Nick Gordon) + p. + Chat can now use markdown, Emoji, and @-tagging. Some pointers on using markdown & Emoji at here. To use @-tagging, simply type '@' in chat. + tr + td + h4 Party Sorting (by @Fandekasp) + p. + You can now adjust the way you view your party members in the top bar. They can be sorted by level, number of pets, the date they joined the party, or just randomly. Also, level colors now reflect your contributor status. + tr + td + h4 Wiki Updates (by @bobbyroberts99) + p. + The HabitRPG wiki is being speedily updated. If you’re confused about anything, go check it out - it’s a treasure trove. + + + small.muted 11/27/2013 hr + h5 11/08/2013 + table.table.table-striped + tr + td. + Contrib Gear. You can now unlock new a top-tier gear set and pet by contributing (code, art, docs, etc) to HabitRPG. Read more + h5 11/01/2013 table.table.table-striped tr