From 4aeb7c563598c9d5a10f1b3b8590ffefad5a09a9 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 15 May 2013 11:42:35 +0100 Subject: [PATCH 1/2] better "level: 1" positioning, add stats to party members --- styles/app/index.styl | 13 +++++++++++++ views/app/avatar.html | 39 ++++++++++++++++++++++----------------- views/app/game-pane.html | 2 +- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/styles/app/index.styl b/styles/app/index.styl index 27f1bd7c4f..27cad07595 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -150,3 +150,16 @@ hr .modal-body margin: 10px + + +// TODO this is supposed to go in avatar.styl, but fuck stylus +.profile-modal-header + width:560px + margin: 0px auto + +.avatar-level + position absolute + bottom 0px + right 0px + background-color #dfe9ea + padding 1px 3px 1px 3px diff --git a/views/app/avatar.html b/views/app/avatar.html index af005c1615..40af8fa699 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -10,7 +10,7 @@
{/} +
Lvl: {@profile.stats.lvl}
-

Items

-

{itemText('weapon',_user.items.weapon)}: {itemStat('weapon',_user.items.weapon)}% Exp gain

-

{itemText('armor',_user.items.armor)}: {itemStat('armor',_user.items.armor)}% Defense

-

{itemText('head',_user.items.head)}: {itemStat('head',_user.items.head)}% Defense

-

{itemText('shield',_user.items.shield)}: {itemStat('shield',_user.items.shield)}% Defense

+

Items

+

{itemText('weapon',@profile.items.weapon)}: {itemStat('weapon',@profile.items.weapon)}% Exp gain

+

{itemText('armor',@profile.items.armor)}: {itemStat('armor',@profile.items.armor)}% Defense

+

{itemText('head',@profile.items.head)}: {itemStat('head',@profile.items.head)}% Defense

+

{itemText('shield',@profile.items.shield)}: {itemStat('shield',@profile.items.shield)}% Defense

-

Stats

-

HP: {floor(_user.stats.hp)} / 50

-

GP: {floor(_user.stats.gp)}

-

Lvl: {_user.stats.lvl}

-

Exp: {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}

-

Strength: {userStr(_user.stats.lvl)}

-

Defense: {userDef(_user.stats.lvl)}

-

Pets Found: {count(_user.items.pets)}

+

Stats

+

HP: {floor(@profile.stats.hp)} / 50

+

GP: {floor(@profile.stats.gp)}

+

Lvl: {@profile.stats.lvl}

+

Exp: {floor(@profile.stats.exp)} / {tnl(@profile.stats.lvl)}

+

Strength: {userStr(@profile.stats.lvl)}

+

Defense: {userDef(@profile.stats.lvl)}

+

Pets Found: {count(@profile.items.pets)}

-

Total Strength: {totalStr(_user.stats.lvl, _user.items.weapon)} %

-

Total Defense: {totalDef(_user.stats.lvl, _user.items.armor, _user.items.head, _user.items.shield)} %

+

Total Strength: {totalStr(@profile.stats.lvl, @profile.items.weapon)} %

+

Total Defense: {totalDef(@profile.stats.lvl, @profile.items.armor, @profile.items.head, @profile.items.shield)} %

@@ -161,9 +162,10 @@ +

{{username(@profile.auth, @profile.profile.name)}}

+
-

{{username(@profile.auth, @profile.profile.name)}}

{{#if @profile.profile.imageUrl}} {{/}} @@ -177,10 +179,13 @@ {{/}} {{/}} +

Stats

+

Achievements

+
diff --git a/views/app/game-pane.html b/views/app/game-pane.html index 6d26651479..aba28f13e2 100644 --- a/views/app/game-pane.html +++ b/views/app/game-pane.html @@ -27,7 +27,7 @@
- +
From 149961c07d626e3cc4b0fb56f32206b4ac35e946 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 15 May 2013 12:23:18 +0100 Subject: [PATCH 2/2] z-index fix on NPC popover dialogs --- styles/app/index.styl | 8 +++++++- views/app/avatar.html | 2 +- views/app/game-pane.html | 4 ++-- views/app/pets.html | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/styles/app/index.styl b/styles/app/index.styl index 27cad07595..25a7493ff0 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -151,8 +151,12 @@ hr .modal-body margin: 10px +.static-popover + z-index 0 + display block -// TODO this is supposed to go in avatar.styl, but fuck stylus + +// TODO this is supposed to go in avatar.styl, but stylus is breaking if I even touch that file .profile-modal-header width:560px margin: 0px auto @@ -163,3 +167,5 @@ hr right 0px background-color #dfe9ea padding 1px 3px 1px 3px + + diff --git a/views/app/avatar.html b/views/app/avatar.html index 40af8fa699..543b5053dc 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -46,7 +46,7 @@ {/}
-
Lvl: {@profile.stats.lvl}
+
Lvl {@profile.stats.lvl}
diff --git a/views/app/game-pane.html b/views/app/game-pane.html index aba28f13e2..117f7896c7 100644 --- a/views/app/game-pane.html +++ b/views/app/game-pane.html @@ -78,7 +78,7 @@
-
+

Daniel Johansson

@@ -122,7 +122,7 @@
-
+

Alexander Augustin

Welcome to the Market! I'm the merchant, Alexander. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!
diff --git a/views/app/pets.html b/views/app/pets.html index a46c6d87b0..8d934855a2 100644 --- a/views/app/pets.html +++ b/views/app/pets.html @@ -98,7 +98,7 @@ -
+

Matt Boch