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

fix weather bug

Browse Source
This commit is contained in:
exane 2015-06-26 08:29:01 +02:00
parent c93b5985d9
commit 83c44a18d2
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/client.js
View File

@ -308,7 +308,7 @@ let BattleView = Backbone.View.extend({
if(this.user.get("waiting")) return; if(this.user.get("waiting")) return;
this.user.set("passing", true); this.user.set("passing", true);
this.user.get("app").send("set:passing"); this.user.get("app").send("set:passing");
}, },
onClick: function(e){ onClick: function(e){
if(!!this.user.get("waiting")) return; if(!!this.user.get("waiting")) return;
if(!!this.user.get("passing")) return; if(!!this.user.get("passing")) return;

27
server/Battle.js
View File

@ -64,24 +64,15 @@ var Battle = (function(){
this.p1.draw(10); this.p1.draw(10);
this.p2.draw(10); this.p2.draw(10);
/*this.p1.hand.add(Card("poor_fucking_infantry")); /* this.p1.hand.add(Card("impenetrable_fog"));
this.p2.hand.add(Card("poor_fucking_infantry")); this.p2.hand.add(Card("impenetrable_fog"));
this.p1.hand.add(Card("poor_fucking_infantry")); this.p1.hand.add(Card("biting_frost"));
this.p2.hand.add(Card("poor_fucking_infantry")); this.p2.hand.add(Card("biting_frost"));
this.p1.hand.add(Card("poor_fucking_infantry")); this.p1.hand.add(Card("torrential_rain"));
this.p2.hand.add(Card("poor_fucking_infantry")); this.p2.hand.add(Card("torrential_rain"));
this.p1.hand.add(Card("poor_fucking_infantry")); this.p1.hand.add(Card("clear_weather"));
this.p2.hand.add(Card("poor_fucking_infantry")); this.p2.hand.add(Card("clear_weather"));*/
this.p1.hand.add(Card("poor_fucking_infantry"));
this.p2.hand.add(Card("poor_fucking_infantry"));
this.p1.hand.add(Card("poor_fucking_infantry"));
this.p2.hand.add(Card("poor_fucking_infantry"));
this.p1.hand.add(Card("poor_fucking_infantry"));
this.p2.hand.add(Card("poor_fucking_infantry"));
this.p1.hand.add(Card("poor_fucking_infantry"));
this.p2.hand.add(Card("poor_fucking_infantry"));
this.p1.hand.add(Card("poor_fucking_infantry"));
this.p2.hand.add(Card("poor_fucking_infantry"));*/
this.update(); this.update();

1
server/Battleside.js
View File

@ -567,6 +567,7 @@ Battleside = (function(){
r.resetNewRound = function(){ r.resetNewRound = function(){
this.clearMainFields(); this.clearMainFields();
this.setWeather(5); //clear weather
this.setPassing(false); this.setPassing(false);
} }