mirrors/not-gwent-online
1
0
Fork 0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-23 19:36:53 +00:00
Code Releases Activity

minor bugfixes

Browse Source
This commit is contained in:
exane 2015-06-22 17:42:48 +02:00
parent a48d36b5ba
commit e139077ee5
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/client.js
View File

@ -4,7 +4,6 @@ var Backbone = require("backbone");
require("./backbone.modal-min"); require("./backbone.modal-min");
var Handlebars = require("handlebars"); var Handlebars = require("handlebars");
var $ = require("jquery"); var $ = require("jquery");
//var Lobby = require("./client-lobby");
window.$ = $; window.$ = $;
@ -307,6 +306,7 @@ var BattleView = Backbone.View.extend({
onClickFieldCard: function(e){ onClickFieldCard: function(e){
if(this.user.get("waitForDecoy")){ if(this.user.get("waitForDecoy")){
var $card = $(e.target).closest(".card"); var $card = $(e.target).closest(".card");
if(!$card.length) return;
var _id = $card.data("id"); var _id = $card.data("id");
if($card.parent().hasClass("field-horn")) return; if($card.parent().hasClass("field-horn")) return;

2
client/templates/battle.handlebars
View File

@ -89,7 +89,7 @@
</div> </div>
<div class="col-xs-2 field-horn field-horn-siege"> <div class="col-xs-2 field-horn field-horn-siege">
</div> </div>
<div class="col-xs-10 field{{#if active.range}} active{{/if}}"> <div class="col-xs-10 field{{#if active.siege}} active{{/if}}">
<div class="col-xs-1 large-field-counter">0</div> <div class="col-xs-1 large-field-counter">0</div>
<div class="col-xs-11 field-siege"></div> <div class="col-xs-11 field-siege"></div>
</div> </div>

1
gulpfile.js
View File

@ -59,6 +59,7 @@ gulp.task("unit tests", function(){
gulp.task("watch", function(){ gulp.task("watch", function(){
gulp.watch("./client/js/*", ["browserify"]); gulp.watch("./client/js/*", ["browserify"]);
gulp.watch("./client/templates/*", ["browserify"]);
gulp.watch("./client/scss/*", ["sass"]); gulp.watch("./client/scss/*", ["sass"]);
gulp.watch("./client/*.html", ["index"]); gulp.watch("./client/*.html", ["index"]);
gulp.watch("./test/src/*", ["unit tests"]); gulp.watch("./test/src/*", ["unit tests"]);

11
server/Battle.js
View File

@ -61,9 +61,13 @@ var Battle = (function(){
this.p2.setLeadercard(); this.p2.setLeadercard();
this.p1.draw(10); this.p1.draw(10);
this.p2.draw(10); this.p2.draw(10);
/*this.p1.hand.add(Card("commanders_horn")); this.p1.hand.add(Card("commanders_horn"));
this.p2.hand.add(Card("commanders_horn")); this.p2.hand.add(Card("commanders_horn"));
this.p1.hand.add(Card("milva")); this.p1.hand.add(Card("ciaran_aep_easnillien"));
this.p2.hand.add(Card("ciaran_aep_easnillien"));
/*this.p1.hand.add(Card("decoy"));
this.p2.hand.add(Card("decoy"));*/
/*this.p1.hand.add(Card("milva"));
this.p2.hand.add(Card("milva")); this.p2.hand.add(Card("milva"));
this.p1.hand.add(Card("havekar_healer")); this.p1.hand.add(Card("havekar_healer"));
this.p2.hand.add(Card("havekar_healer")); this.p2.hand.add(Card("havekar_healer"));
@ -96,8 +100,7 @@ var Battle = (function(){
this.p2.hand.add(Card("ballista")); this.p2.hand.add(Card("ballista"));
this.p1.hand.add(Card("ballista")); this.p1.hand.add(Card("ballista"));
this.p2.hand.add(Card("ballista"));*/ this.p2.hand.add(Card("ballista"));*/
/*this.p1.hand.add(Card("decoy"));
this.p2.hand.add(Card("decoy"));*/
/* /*
this.p1.hand.add(Card("dun_banner_medic")); this.p1.hand.add(Card("dun_banner_medic"));
this.p2.hand.add(Card("dun_banner_medic")); this.p2.hand.add(Card("dun_banner_medic"));