mirror of
https://github.com/exane/not-gwent-online
synced 2024-12-23 21:03:14 +00:00
small changes
This commit is contained in:
parent
70432e3530
commit
c62ac4c91b
@ -470,6 +470,7 @@ module.exports = {
|
||||
name: "Havekar Smuggler",
|
||||
power: 5,
|
||||
ability: "muster",
|
||||
musterType: "smuggler",
|
||||
img: "smuggler1",
|
||||
faction: "scoiatael",
|
||||
type: 0
|
||||
|
@ -20,7 +20,7 @@
|
||||
{{#if inMatchmakerQueue}}<img src="../site/public/assets/img/content-load.gif" width=20 style="margin: 5px;"> {{/if}}
|
||||
</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>
|
||||
|
@ -34,22 +34,16 @@ var Battle = (function(){
|
||||
r.turn = 0;
|
||||
|
||||
r.socket = null;
|
||||
r.channel = null;
|
||||
|
||||
r._id = null;
|
||||
|
||||
r.events = null;
|
||||
|
||||
r.init = function(){
|
||||
/*PubSub.subscribe("update", this.update.bind(this));*/
|
||||
this.on("Update", this.update);
|
||||
/*
|
||||
this.on("AfterPlace", this.checkAbilityOnAfterPlace)*/
|
||||
|
||||
|
||||
//this.channel = this.socket.subscribe(this._id);
|
||||
this.p1 = Battleside(this._user1.getName(), 0, this, this._user1);
|
||||
this.p2 = Battleside(this._user2.getName(), 1, this, this._user2);
|
||||
this.p1 = Battleside(this._user1, 0, this);
|
||||
this.p2 = Battleside(this._user2, 1, this);
|
||||
this.p1.foe = this.p2;
|
||||
this.p2.foe = this.p1;
|
||||
this.p1.setUpWeatherFieldWith(this.p2);
|
||||
|
@ -9,9 +9,9 @@ var Promise = require("jquery-deferred");
|
||||
|
||||
var Battleside;
|
||||
Battleside = (function(){
|
||||
var Battleside = function(name, n, battle, user){
|
||||
var Battleside = function(user, n, battle){
|
||||
if(!(this instanceof Battleside)){
|
||||
return (new Battleside(name, n, battle, user));
|
||||
return (new Battleside(user, n, battle));
|
||||
}
|
||||
/**
|
||||
* constructor here
|
||||
@ -21,18 +21,15 @@ Battleside = (function(){
|
||||
var self = this;
|
||||
this._isWaiting = true;
|
||||
this.socket = user.socket;
|
||||
|
||||
this.field = {};
|
||||
this.field[Card.TYPE.LEADER] = Field(this);
|
||||
this.field[Card.TYPE.CLOSE_COMBAT] = Field(this, true);
|
||||
this.field[Card.TYPE.RANGED] = 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._name = name;
|
||||
this._name = user.getName();
|
||||
this.battle = battle;
|
||||
this.hand = Hand();
|
||||
this.deck = Deck(DeckData[deck]);
|
||||
|
Loading…
Reference in New Issue
Block a user