diff --git a/client/scss/main.scss b/client/scss/main.scss index f178798..0e5a19e 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -221,3 +221,20 @@ i { } } + +.playcard-banner { + position: fixed; + border: 1px solid red; + background: orangered; + width: 100%; + height: 250px; + left: 0; + text-align: center; + top: 200px; + z-index: 200; + .card { + position: relative; + left: 50%; + top: 30%; + } +} diff --git a/client/templates/PlayCard.handlebars b/client/templates/PlayCard.handlebars new file mode 100644 index 0000000..d7a18c1 --- /dev/null +++ b/client/templates/PlayCard.handlebars @@ -0,0 +1,3 @@ +
+ {{>card card}} +
\ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 5f195b5..4455f97 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,7 +14,9 @@ livereload({start: true}); gulp.task('browserify', function(){ browserify('./client/js/main.js', {standalone: "app", debug: true}) - .transform(handlebars) + .transform(handlebars).on("error", function(err){ + console.log(err); + }) .transform(babelify) .bundle().on("error", function(err){ console.log(err); diff --git a/server/Field.js b/server/Field.js index eb3c4b9..d94c440 100644 --- a/server/Field.js +++ b/server/Field.js @@ -138,11 +138,13 @@ var Field = (function(){ this._hornCard = card; } - r.getHighestCards = function() { + r.getHighestCards = function(noHeroes) { + noHeroes = noHeroes || false; var res = []; var highest = 0; this.get().forEach(function(card) { + if(noHeroes && card.getAbility("hero")) return; highest = card.getPower() > highest ? card.getPower() : highest; })