mirrors/not-gwent-online
1
0
Fork 0
mirror of https://github.com/exane/not-gwent-online synced 2025-11-08 09:08:40 +00:00
Code Releases Activity

lobby changes

Browse Source
This commit is contained in:
exane
2015-07-01 18:55:50 +02:00
parent f9a2278b64
commit cdbb5443af
8 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/Battleside.js
View File

@@ -34,7 +34,7 @@ Battleside = (function(){
this._name = user.getName();
this.battle = battle;
this.hand = Hand();
this.deck = Deck(DeckData[deck], this);
this.deck = Deck(deck, this);
this._discard = [];
this.runEvent = this.battle.runEvent.bind(this.battle);

23
server/Deck.js
View File

@@ -1,6 +1,7 @@
var Card = require("./Card");
/*var CardManager = require("./CardManager");*/
var DeckData = require("../assets/data/deck");
var _ = require("underscore");
var Deck = (function(){
var Deck = function(deck, side){
@@ -14,11 +15,10 @@ var Deck = (function(){
this.side = side;
this._deck = [];
if(typeof deck !== "object") throw new Error("Deck is not an object!");
//if(typeof deck !== "object") throw new Error("Deck is not an object!");
this._originalDeck = [];
this._faction = deck.faction;
this.setDeck(deck.data);
this.setDeck(deck);
};
var r = Deck.prototype;
/**
@@ -40,18 +40,23 @@ var Deck = (function(){
MONSTERS: "monster"
}
r.setDeck = function(deckData){
if(!Array.isArray(deckData)) {
deckData = DeckData["northern"];
r.setDeck = function(deckKey){
var deck = DeckData[deckKey] ? DeckData[deckKey] : DeckData["northern"];
if(deckKey === "random"){
var decks = _.allKeys(DeckData);
deck = DeckData[decks[(Math.random() * decks.length) | 0]];
}
this._originalDeck = deckData.slice();
this._deck = deckData.slice();
this._originalDeck = deck.data.slice();
this._deck = deck.data.slice();
this._faction = deck.faction;
this._loadCards();
this.shuffle();
}
r.getFaction = function() {
r.getFaction = function(){
return this._faction;
}

5
server/User.js
View File

@@ -45,8 +45,7 @@ var User = (function(){
}
r.generateName = function(){
var name = "Player" + (((Math.random() * 8999) + 1000) | 0);
//if(lobby.hasUser(name)) return generateName();
var name = "Guest" + (((Math.random() * 8999) + 1000) | 0);
this._name = name;
return name;
}
@@ -70,7 +69,7 @@ var User = (function(){
}
r.getDeck = function() {
return this._deck || "northern";
return this._deck;
}
r.addRoom = function(room) {