Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1824 from HabitRPG/sabe_tweak

Browse Source 
One does not simply *pull request* into Heroism.
This commit is contained in:
Tyler Renelle
2013-11-14 18:01:02 -08:00
parent 4ca516b7bc ee1768b7e2
commit 94459e429c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
views/options/social/tavern.jade
+9 -9
View File
@@ -11,11 +11,11 @@
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/2014640723') Daniel
.popover-content
| Welcome to the Tavern! If you want to rest a while (going on vacation? sudden illness?), I'll set you up at the inn - dailies won't hurt you while you're resting. Stay a while & meet the locals.
| Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (going on vacation? sudden illness?), I'll set you up at the inn - Dailies won't hurt you while you're resting.
div
button.btn.btn-large.btn-success(ng-class='{active: user.flags.rest}', ng-click='rest()')
span(ng-show='user.flags.rest') Check Out of Inn
span(ng-hide='user.flags.rest') Rest In The Inn
span(ng-hide='user.flags.rest') Rest in the Inn
.alert.alert-info(ng-show='user.flags.rest')
| Whilst resting, your dailies are saved and aren't affected by day turn-over. Whether you check out tomorrow or in a week's time, you'll continue in the same state as when you checked in.
@@ -57,19 +57,19 @@
a.label.label-contributor-1(ng-click='toggleUserTier($event)') Friend (1-2)
div(style='display:none;')
p.
<span class='achievement achievement-firefox'></span> When your <strong>first</strong> submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in tavern chat will proudly display that you are a contributor.
<span class='achievement achievement-firefox'></span> When your <strong>first</strong> submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor.
hr
p.
<span class='shop_armor_7 shop-sprite item-img'></span> When your <strong>second</strong> submission is deployed, you will receive the <strong>Crystal Armor</strong>. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
<span class='shop_armor_7 shop-sprite item-img'></span> When your <strong>second</strong> submission is deployed, the <strong>Crystal Armor</strong> will be available for purchase in the Rewards shop after Golden Armor. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
tr
td
a.label.label-contributor-3(ng-click='toggleUserTier($event)') Elite (3-4)
div(style='display:none;')
p.
<span class='shop_head_7 shop-sprite item-img'></span> When your <strong>third</strong> submission is deployed, you will receive the <strong>Crystal Helmet</strong>. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
<span class='shop_head_7 shop-sprite item-img'></span> When your <strong>third</strong> submission is deployed, the <strong>Crystal Helmet</strong> will be available for purchase in the Rewards shop after the Golden Helmet. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
hr
p.
<span class='shop_weapon_8 shop-sprite item-img'></span> When your <strong>fourth</strong> submission is deployed, you will receive the <strong>Crystal Sword</strong>. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
<span class='shop_weapon_8 shop-sprite item-img'></span> When your <strong>fourth</strong> submission is deployed, the <strong>Crystal Sword</strong> will be available for purchase in the Rewards shop after the Golden Sword. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
tr
td
@@ -88,14 +88,14 @@
When your <em>seventh</em> submission is deployed, you will receive <strong>2 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG!
tr
td
a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic (8)
a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic
div(style='display:none;')
p This is HabitRPG staff or Staff-level Contributors
p The Heroic level contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).
tr
td
a.label.label-npc(ng-click='toggleUserTier($event)') NPC
div(style='display:none;')
p Was a backer at the highest Kickstarter tier.
p NPCs backed HabitRPG's Kickstarter at the highest tier. You can find their avatars watching over site features!
include ./challenge-box