diff --git a/assets/data/abilities.js b/assets/data/abilities.js index f6e6a30..5bbe04d 100644 --- a/assets/data/abilities.js +++ b/assets/data/abilities.js @@ -231,30 +231,25 @@ module.exports = { }, "foltest_leader3": { onActivate: function(){ - var field = this.field[2]; - - //todo: unless there is commanders horn active - /*siegeCards.forEach(function(card){ - card.setBoost("foltest_leader3", card.getPower()); - })*/ - /*field.add(Card("commanders_horn", true));*/ - /*this.placeCard("commanders_horn", { - forceField: field - });*/ this.setHorn("commanders_horn", 2); } }, "foltest_leader4": { onActivate: function(){ - + //scorch siege } }, "francesca_leader1": { onActivate: function(){ + var cards = this.deck.find("key", "biting_frost") + if(!cards.length) return; + var card = this.deck.removeFromDeck(cards[0]); + this.placeCard(card); } }, "francesca_leader2": { onActivate: function(){ + this.setHorn("commanders_horn", 1); } }, "francesca_leader3": { @@ -275,10 +270,12 @@ module.exports = { }, "eredin_leader3": { onActivate: function(){ + } }, "eredin_leader4": { onActivate: function(){ + this.setHorn("commanders_horn", 0); } }, "hero": {} diff --git a/assets/data/deck.js b/assets/data/deck.js index 4958180..97e4e44 100644 --- a/assets/data/deck.js +++ b/assets/data/deck.js @@ -35,7 +35,7 @@ module.exports = { ], "scoiatael": [ - "francesca_daisy_of_the_valley", + "francesca_the_beautiful", "commanders_horn", "commanders_horn", "saesenthessis", @@ -44,6 +44,9 @@ module.exports = { "eithne", "havekar_healer", "riordain", + "havekar_smuggler", + "havekar_smuggler", + "havekar_smuggler", "toruviel", "decoy", "decoy", @@ -93,10 +96,7 @@ module.exports = { "impenetrable_fog", "endrega", "vampire_bruxa", - "vampire_bruxa", "vampire_fleder", - "vampire_fleder", - "vampire_garkain", "vampire_garkain", "vampire_ekimmara", "commanders_horn", @@ -114,9 +114,6 @@ module.exports = { //"vampire_katakan", "crone_whispess", "crone_brewess", - "crone_brewess", - "crone_whispess", - "crone_weavess", "crone_weavess", "arachas_behemoth", "fire_elemental", diff --git a/client/js/client.js b/client/js/client.js index f5f5a96..613d568 100644 --- a/client/js/client.js +++ b/client/js/client.js @@ -77,7 +77,7 @@ var App = Backbone.Router.extend({ var SideView = Backbone.View.extend({ el: ".container", template: require("../templates/cards.handlebars"), - templateCards: require("../templates/multipleCards.handlebars"), + templateCards: require("../templates/fieldCards.handlebars"), initialize: function(options){ var self = this; this.side = options.side; diff --git a/client/scss/main.scss b/client/scss/main.scss index a5bcdd0..3f28f10 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -109,12 +109,27 @@ $game-height: 800px; img { height: 120px; } - span { + + /*.card-attr-power { + margin-top: 0px; + margin-left: 0px; + height: 25px; + width: 25px; + text-align: center; + line-height: 25px; + font-size: 20px; + color: black; + }*/ + .card-attr-positive { color: #00b000; + } + + span { + color: #ff2d00; font-weight: bold; font-size: 20px; position: absolute; - text-shadow: 1px 1px #101010; + text-shadow: 1px 1px 0px #101010; margin-top: 62px; margin-left: 0px; cursor: default; diff --git a/client/templates/multipleCards.handlebars b/client/templates/fieldCards.handlebars similarity index 51% rename from client/templates/multipleCards.handlebars rename to client/templates/fieldCards.handlebars index 3fd3bd6..df7807a 100644 --- a/client/templates/multipleCards.handlebars +++ b/client/templates/fieldCards.handlebars @@ -1,6 +1,7 @@ {{#each this}}