sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:lefnire/habitrpg into develop

Browse source
This commit is contained in:
Tyler Renelle 2013-05-20 10:28:49 +01:00
commit 5776bec545
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/items.coffee
View file

@ -38,7 +38,7 @@ items = module.exports.items =
{index: 5, text: "Golden Shield", classes: 'shield_5', notes:'Decreases HP loss by 8%.', defense: 8, value:90}
{index: 6, text: "Tormented Skull", classes: 'shield_6', notes:'Decreases HP loss by 9%.', defense: 9, value:120}
]
potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 25, classes: 'potion'}
potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP, instant use.", value: 25, classes: 'potion'}
reroll: {type: 'reroll', text: "Re-Roll", classes: 'reroll', notes: "Resets your task values back to 0 (yellow). Useful when everything's red and it's hard to stay alive.", value:0 }
pets: [

3
styles/app/game-pane.styl
View file

@ -34,3 +34,6 @@
background-position: -1200px 0px
width: 40px
height: 40px
.buttonList li
margin: 5px;

2
views/app/game-pane.html
View file

@ -111,7 +111,7 @@
<h3>Tavern Talk & LFG</h3>
<div class='row-fluid'>
<div class='span3'>
<ul class=unstyled>
<ul class='unstyled buttonList'>
<li><a class='btn btn-info' style='width:100%' target="_blank" href="http://community.habitrpg.com/faq-page">FAQ</a></li>
<li><a class='btn btn-info' style='width:100%' target="_blank" href="https://github.com/lefnire/habitrpg/issues?state=open">Report a Problem</a></li>
<li><a class='btn btn-info' style='width:100%' target="_blank" href="https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6">Request a Feature</a></li>