sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'thanksgiving' into develop

Browse source
This commit is contained in:
Tyler Renelle 2013-11-27 11:53:18 -07:00
commit 7c20988c41
5 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
migrations/20131126_turkey_pet.js Normal file
View file

@ -0,0 +1 @@
db.users.update({},{$set:{'items.pets.Turkey-Base':5}}, {multi:true});

6
public/css/npcs.styl
View file

@ -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)

3
src/models/user.js
View file

@ -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

3
views/options/inventory/stable.jade
View file

@ -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')

39
views/shared/modals/new-stuff.jade
View file

@ -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. <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>Read more</a>
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 <a href="http://habitrpg.wikia.com/wiki/Markdown_Cheat_Sheet" target="_blank">here</a>. 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 <a href='http://habitrpg.wikia.com/wiki/HabitRPG_Wiki' target='_blank'>HabitRPG wiki</a> 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. <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>Read more</a>
h5 11/01/2013
table.table.table-striped
tr