From 49c5a1fcb1ac34f1d1fcbfe5e89b412980112edf Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 18 Jun 2018 00:51:20 +0200 Subject: [PATCH 1/3] Added adv class to skills in stat cards Added arrows to initiative, for example --- app/client/views/character/stats/statCard/statCard.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/client/views/character/stats/statCard/statCard.html b/app/client/views/character/stats/statCard/statCard.html index 5ff0a1cf..3a38f704 100644 --- a/app/client/views/character/stats/statCard/statCard.html +++ b/app/client/views/character/stats/statCard/statCard.html @@ -3,7 +3,9 @@
{{#if isSkill}} - {{prefix}}{{skillMod}} +
+ {{prefix}}{{skillMod}} +
{{else}} {{prefix}}{{characterCalculate "attributeValue" ../_id stat}} {{/if}} From 3f3caf63e4de99c9955f99ff18b819695f9cd722 Mon Sep 17 00:00:00 2001 From: Frogvall Date: Wed, 20 Jun 2018 14:25:18 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Add=20css=20and=20js=20implementation=20of?= =?UTF-8?q?=20previously=20na=C3=AFve=20approach=20Bonus:=20Learned=20some?= =?UTF-8?q?=20meteor=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/character/stats/statCard/statCard.css | 14 ++++++++++++++ .../views/character/stats/statCard/statCard.js | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/app/client/views/character/stats/statCard/statCard.css b/app/client/views/character/stats/statCard/statCard.css index 04a9250e..c8e3c8eb 100644 --- a/app/client/views/character/stats/statCard/statCard.css +++ b/app/client/views/character/stats/statCard/statCard.css @@ -14,3 +14,17 @@ min-width: 72px; padding: 16px; } + +.stat-card .skill-mod.advantage{ + background-image: url(/png/advantage/greenUp.png); + background-size: contain; + background-repeat: no-repeat; + background-position: center; +} + +.stat-card .skill-mod.disadvantage{ + background-image: url(/png/advantage/redDown.png); + background-size: contain; + background-repeat: no-repeat; + background-position: center; +} diff --git a/app/client/views/character/stats/statCard/statCard.js b/app/client/views/character/stats/statCard/statCard.js index 32a89cad..017145fd 100644 --- a/app/client/views/character/stats/statCard/statCard.js +++ b/app/client/views/character/stats/statCard/statCard.js @@ -6,4 +6,10 @@ Template.statCard.helpers({ ) ); }, + advantage: function(){ + var charId = Template.parentData()._id; + var advantage = Characters.calculate.advantage(charId, this.stat); + if (advantage > 0) return "advantage"; + if (advantage < 0) return "disadvantage"; + }, }); From c417c45db182be24cda694e247122df854fb3881 Mon Sep 17 00:00:00 2001 From: Frogvall Date: Wed, 20 Jun 2018 14:33:34 +0200 Subject: [PATCH 3/3] Cleaned up a bit --- app/client/views/character/stats/statCard/statCard.css | 4 ++-- app/client/views/character/stats/statCard/statCard.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/client/views/character/stats/statCard/statCard.css b/app/client/views/character/stats/statCard/statCard.css index c8e3c8eb..77cbb57b 100644 --- a/app/client/views/character/stats/statCard/statCard.css +++ b/app/client/views/character/stats/statCard/statCard.css @@ -15,14 +15,14 @@ padding: 16px; } -.stat-card .skill-mod.advantage{ +.stat-card .advantage{ background-image: url(/png/advantage/greenUp.png); background-size: contain; background-repeat: no-repeat; background-position: center; } -.stat-card .skill-mod.disadvantage{ +.stat-card .disadvantage{ background-image: url(/png/advantage/redDown.png); background-size: contain; background-repeat: no-repeat; diff --git a/app/client/views/character/stats/statCard/statCard.html b/app/client/views/character/stats/statCard/statCard.html index 3a38f704..b68e0188 100644 --- a/app/client/views/character/stats/statCard/statCard.html +++ b/app/client/views/character/stats/statCard/statCard.html @@ -3,7 +3,7 @@
{{#if isSkill}} -
+
{{prefix}}{{skillMod}}
{{else}}