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

add in alexander the merchant

Browse source
This commit is contained in:
Tyler Renelle 2013-05-02 15:12:00 +01:00
parent e22634658a
commit a40a41fa9c
5 changed files with 65 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/img/npcs/alex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

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

@ -13,4 +13,8 @@
.tavern-pane
position:relative
height:500px
height:500px
#market-tab
position: relative
height: 500px

51
views/app/avatar.html
View file

@ -177,54 +177,3 @@
<!-- we'll have other inventory here later too, like enchantments, quest scrolls, etc -->
<app:pets:inventory/>
<market:>
<!-- pets pane -->
<div class="tab-pane pet-grid" id="market-tab">
<h4>Welcome to the market!</h4>
<small>Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!</small>
<h4>Eggs</h4>
{#with _items.pets as :egg}
<table>
<tr>
{#with :egg[0]}<app:pets:egg />{/}
{#with :egg[1]}<app:pets:egg />{/}
{#with :egg[2]}<app:pets:egg />{/}
{#with :egg[3]}<app:pets:egg />{/}
</tr>
<tr>
{#with :egg[4]}<app:pets:egg />{/}
{#with :egg[5]}<app:pets:egg />{/}
{#with :egg[6]}<app:pets:egg />{/}
{#with :egg[7]}<app:pets:egg />{/}
</tr>
<tr>
{#with :egg[8]}<app:pets:egg />{/}
</tr>
</table>
{/}
<h4>Hatching Potions</h4>
{#with _items.hatchingPotions as :hatchingPotion}
<table>
<tr>
{#with :hatchingPotion[0]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[1]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[2]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[3]}<app:pets:hatchingPotion />{/}
</tr>
<tr>
{#with :hatchingPotion[4]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[5]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[6]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[7]}<app:pets:hatchingPotion />{/}
</tr>
<tr>
{#with :hatchingPotion[8]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[9]}<app:pets:hatchingPotion />{/}
</tr>
</table>
{/}
</div>

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

@ -43,10 +43,12 @@
<div class="tab-pane" id="profileInventory">
<div class='row-fluid'>
<div class='span6 border-right'>
<h2>Inventory</h2>
<app:avatar:inventory />
</div>
<div class='span6'>
<app:avatar:market />
<h2>Market</h2>
<app:game-pane:market />
</div>
</div>
</div>
@ -88,4 +90,58 @@
</form>
</div>
</div>
</div>
<market:>
<!-- pets pane -->
<div class="tab-pane pet-grid" id="market-tab">
<img src='/img/npcs/alex.png' />
<div class="popover fade right in" style="top: 0px; left: 170px; display: block;">
<div class="arrow"></div>
<h3 class="popover-title">Alexander Augustin</h3>
<div class="popover-content">Welcome to the Market! I'm the merchant, <a target="_blank" href="http://www.kickstarter.com/profile/523661924">Alexander</a>. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!</div>
</div>
<h4>Eggs</h4>
{#with _items.pets as :egg}
<table>
<tr>
{#with :egg[0]}<app:pets:egg />{/}
{#with :egg[1]}<app:pets:egg />{/}
{#with :egg[2]}<app:pets:egg />{/}
{#with :egg[3]}<app:pets:egg />{/}
</tr>
<tr>
{#with :egg[4]}<app:pets:egg />{/}
{#with :egg[5]}<app:pets:egg />{/}
{#with :egg[6]}<app:pets:egg />{/}
{#with :egg[7]}<app:pets:egg />{/}
</tr>
<tr>
{#with :egg[8]}<app:pets:egg />{/}
</tr>
</table>
{/}
<h4>Hatching Potions</h4>
{#with _items.hatchingPotions as :hatchingPotion}
<table>
<tr>
{#with :hatchingPotion[0]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[1]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[2]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[3]}<app:pets:hatchingPotion />{/}
</tr>
<tr>
{#with :hatchingPotion[4]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[5]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[6]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[7]}<app:pets:hatchingPotion />{/}
</tr>
<tr>
{#with :hatchingPotion[8]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[9]}<app:pets:hatchingPotion />{/}
</tr>
</table>
{/}
</div>

4
views/app/pets.html
View file

@ -35,7 +35,7 @@
<inventory:>
<div class='row-fluid'>
<div class='{#if _hatchEgg}span6{/} well'>
<div class='{#if _hatchEgg}span6{/}'>
<menu type="list" class="inventory-list">
<li class="customize-menu">
<menu label="Eggs" class='pets-menu'>
@ -66,7 +66,7 @@
</menu>
</div>
{#if _hatchEgg}
<div class='span6 well'>
<div class='span6'>
<h3>Hatch Your Egg</h3>
{#if not(_user.items.hatchingPotions)}
<p>You don't have any hatching potions yet.</p>