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

small changes

Browse Source
This commit is contained in:
exane 2015-06-30 10:46:31 +02:00
parent 70432e3530
commit c62ac4c91b
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/data/cards.js
View File

@ -470,6 +470,7 @@ module.exports = {
name: "Havekar Smuggler", name: "Havekar Smuggler",
power: 5, power: 5,
ability: "muster", ability: "muster",
musterType: "smuggler",
img: "smuggler1", img: "smuggler1",
faction: "scoiatael", faction: "scoiatael",
type: 0 type: 0

2
client/templates/lobby.handlebars
View File

@ -20,7 +20,7 @@
{{#if inMatchmakerQueue}}<img src="../site/public/assets/img/content-load.gif" width=20 style="margin: 5px;"> {{/if}} {{#if inMatchmakerQueue}}<img src="../site/public/assets/img/content-load.gif" width=20 style="margin: 5px;"> {{/if}}
</button> </button>
<!--<button type="button" class="btn btn-primary join-room">Join Room</button>--> <!--<button type="button" class="btn btn-primary join-room">Join Room</button>-->
<button type="button" class="btn btn-success note">debug note</button> <!--<button type="button" class="btn btn-success note">debug note</button>-->
</div> </div>
</div> </div>

10
server/Battle.js
View File

@ -34,22 +34,16 @@ var Battle = (function(){
r.turn = 0; r.turn = 0;
r.socket = null; r.socket = null;
r.channel = null;
r._id = null; r._id = null;
r.events = null; r.events = null;
r.init = function(){ r.init = function(){
/*PubSub.subscribe("update", this.update.bind(this));*/
this.on("Update", this.update); this.on("Update", this.update);
/*
this.on("AfterPlace", this.checkAbilityOnAfterPlace)*/
this.p1 = Battleside(this._user1, 0, this);
//this.channel = this.socket.subscribe(this._id); this.p2 = Battleside(this._user2, 1, this);
this.p1 = Battleside(this._user1.getName(), 0, this, this._user1);
this.p2 = Battleside(this._user2.getName(), 1, this, this._user2);
this.p1.foe = this.p2; this.p1.foe = this.p2;
this.p2.foe = this.p1; this.p2.foe = this.p1;
this.p1.setUpWeatherFieldWith(this.p2); this.p1.setUpWeatherFieldWith(this.p2);

13
server/Battleside.js
View File

@ -9,9 +9,9 @@ var Promise = require("jquery-deferred");
var Battleside; var Battleside;
Battleside = (function(){ Battleside = (function(){
var Battleside = function(name, n, battle, user){ var Battleside = function(user, n, battle){
if(!(this instanceof Battleside)){ if(!(this instanceof Battleside)){
return (new Battleside(name, n, battle, user)); return (new Battleside(user, n, battle));
} }
/** /**
* constructor here * constructor here
@ -21,18 +21,15 @@ Battleside = (function(){
var self = this; var self = this;
this._isWaiting = true; this._isWaiting = true;
this.socket = user.socket; this.socket = user.socket;
this.field = {}; this.field = {};
this.field[Card.TYPE.LEADER] = Field(this); this.field[Card.TYPE.LEADER] = Field(this);
this.field[Card.TYPE.CLOSE_COMBAT] = Field(this, true); this.field[Card.TYPE.CLOSE_COMBAT] = Field(this, true);
this.field[Card.TYPE.RANGED] = Field(this, true); this.field[Card.TYPE.RANGED] = Field(this, true);
this.field[Card.TYPE.SIEGE] = Field(this, true); this.field[Card.TYPE.SIEGE] = Field(this, true);
/*this.field[Card.TYPE.HORN] = {
close: Field(this),
range: Field(this),
siege: Field(this)
};*/
this.n = n ? "p2" : "p1"; this.n = n ? "p2" : "p1";
this._name = name; this._name = user.getName();
this.battle = battle; this.battle = battle;
this.hand = Hand(); this.hand = Hand();
this.deck = Deck(DeckData[deck]); this.deck = Deck(DeckData[deck]);