:value="v.id"
:selected="newchallenge.vid==v.id"
)
- | {{ v.name }}
+ | {{ v.display }}
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
"st.variants": function() {
// Set potential challenges and games variant names:
this.challenges.concat(this.games).forEach(o => {
- if (!o.vname) o.vname = this.getVname(o.vid);
+ if (!o.vname) this.setVname(o);
});
if (!this.newchallenge.V && this.newchallenge.vid > 0)
this.loadNewchallVariant();
// Automatic challenge sending, for tournaments
this.loadNewchallVariant(
() => {
- this.newchallenge = {
- fen: "",
- vid:
- this.st.variants
- .find(v => v.name == this.$route.query["variant"])
- .id,
- to: this.$route.query["challenge"],
- color: this.$route.query["color"] || '',
- cadence: this.$route.query["cadence"],
- // Tournament: no randomness (TODO: for now at least)
- randomness: 0,
- memorize: false
- };
- this.issueNewChallenge();
+ Object.assign(
+ this.newchallenge,
+ {
+ fen: "",
+ vid:
+ this.st.variants
+ .find(v => v.name == this.$route.query["variant"])
+ .id,
+ to: this.$route.query["challenge"],
+ color: this.$route.query["color"] || '',
+ cadence: this.$route.query["cadence"],
+ // Tournament: no randomness (TODO: for now at least)
+ randomness: 0,
+ memorize: false
+ }
+ );
+ window.doClick("modalNewgame");
+ //this.issueNewChallenge(); //NOTE: doesn't work yet.
},
this.$route.query["variant"]
);
const type = this.classifyObject(c);
const vname = this.getVname(c.vid);
return Object.assign(
- {},
{
type: type,
vname: vname,
}
}
);
- } else addChallenges();
+ }
+ else addChallenges();
}
}
);
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
- getVname: function(vid) {
- const variant = this.st.variants.find(v => v.id == vid);
+ setVname: function(obj) {
+ const variant = this.st.variants.find(v => v.id == obj.vid);
// this.st.variants might be uninitialized (variant == null)
- return variant ? variant.name : "";
+ if (!!variant) {
+ obj.vname = variant.name;
+ obj.vdisp = variant.display;
+ }
+ // NOTE: Next line is used in loadNewchallVariant
+ return (!variant ? "" : variant.name);
},
filterChallenges: function(type) {
return this.challenges.filter(c => c.type == type);
// o: challenge or game
classifyObject: function(o) {
// No imported games here
- return (
- o.cadence.indexOf("d") >= 0
- ? "corr"
- : (o.cadence.indexOf("/") >= 0 ? "simul" : "live")
- );
+ return (o.cadence.indexOf("d") >= 0 ? "corr" : "live");
},
setDisplay: function(letter, type, e) {
this[letter + "display"] = type;
// For self multi-connects tests:
this.newConnect[data.from[0]] = true;
this.send("askidentity", { target: data.from[0], page: page });
- } else {
+ }
+ else {
this.people[data.from[0]].tmpIds[data.from[1]] =
{ page: page, focus: true };
this.$forceUpdate(); //TODO: shouldn't be required
"all"
);
}
- } else {
+ }
+ else {
// Remove the matching live game if now unreachable
const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
// Corr games are always reachable:
}
break;
}
- case "entersimul":
- // TODO: confirm box accept/refuse.
- // If accept, update seat (array in this case)
- break;
case "game": // Individual request
case "newgame": {
const game = data.data;
) {
let newGame = game;
newGame.type = this.classifyObject(game);
- newGame.vname = this.getVname(game.vid);
+ this.setVname(game);
if (!game.score)
// New game from Hall
newGame.score = "*";
}
this.cursor = res.games[L - 1].created;
let moreGames = res.games.map(g => {
- const vname = this.getVname(g.vid);
- return Object.assign(
- {},
- g,
- {
- type: "corr",
- vname: vname
- }
- );
+ this.setVname(g);
+ g.type = "corr";
+ return g;
});
this.games = this.games.concat(moreGames);
- } else this.hasMore = false;
+ }
+ else this.hasMore = false;
}
}
);
let fromValues = Object.assign({}, this.people[chall.from]);
delete fromValues["pages"]; //irrelevant in this context
newChall.from = Object.assign({ sid: chall.from }, fromValues);
- newChall.vname = this.getVname(newChall.vid);
+ this.setVname(newChall);
this.challenges.push(newChall);
if (
(newChall.type == "live" && this.cdisplay == "corr") ||
.getElementById("btnC" + newChall.type)
.classList.add("somethingnew");
}
- if (!!chall.to) {
+ if (!!chall.to && chall.to == this.st.user.name) {
notify(
"New challenge",
// fromValues.name should exist since the player is online, but
// let's consider there is some chance that the challenge arrives
// right after we connected and before receiving the poll result:
- { body: "from " + (fromValues.name || "unknown yet...") }
+ { body: "from " + (fromValues.name || "@nonymous") }
);
}
}
},
loadNewchallVariant: async function(cb, vname) {
- vname = vname || this.getVname(this.newchallenge.vid);
+ vname = vname || this.setVname(this.newchallenge);
await import("@/variants/" + vname + ".js")
.then((vModule) => {
window.V = vModule[vname + "Rules"];
this.newchallenge.V = window.V;
- this.newchallenge.vname = vname;
if (!!cb) cb();
});
},
position: parsedFen.position
//,orientation: parsedFen.turn
});
- } else this.newchallenge.diag = "";
+ }
+ else this.newchallenge.diag = "";
},
newChallFromPreset(pchall) {
this.partialResetNewchallenge();
this.challenges.splice(challToDelIdx, 1);
}
this.send("newchallenge", {
- data: Object.assign({ from: this.st.user.sid }, chall)
+ data: Object.assign(
+ // Temporarily add sender infos to display challenge on Discord.
+ { from: this.st.user.sid, sender: this.st.user.name }, chall)
});
// Add new challenge:
chall.from = {
if (ctype == "live") {
// Live challenges have a random ID
finishAddChallenge(null);
- } else {
+ }
+ else {
// Correspondence game: send challenge to server
ajax(
"/challenges",
else
// Corr challenge: just remove the challenge
this.send("deletechallenge_s", { data: { cid: c.id } });
- } else {
+ }
+ else {
const oppsid = this.getOppsid(c);
if (!!oppsid)
this.send("refusechallenge", { data: c.id, target: oppsid });
alert(this.st.tr["Please log in to accept corr challenges"]);
return;
}
- if (c.type == "simul") {
- // Just notify that I wanna enter the simultaneous game(s)
- // TODO: dans défi, indiquer si positions aleatoires, si tjours blancs ou noirs
- // --> /w30 ou b1h ou juste 30 (random, sans préfixe).
- // => message "entersimul" to c.from
- return;
- }
else {
c.accepted = true;
await import("@/variants/" + c.vname + ".js")
{ data: { id: c.id } }
);
}
- else if (c.type == "simul" && !!c.seat && Array.isArray(c.seat))
- // TODO: if some players entered, start game
- this.launchSimultaneous(c);
this.send("deletechallenge_s", { data: { cid: c.id } });
}
// In all cases, the challenge is consumed:
ArrayFun.remove(this.challenges, ch => ch.id == c.id);
},
// NOTE: when launching game, the challenge is already being deleted
- // TODO: adapt for simultaneous games, or just write a new function (better)
- launchSimultaneous: function(c) {
- // TODO
- },
launchGame: function(c) {
// White player index 0, black player index 1:
let players =
// on game just after, the main Hall will be notified.
};
if (c.type == "live") {
+ // TODO: ask my IP + opp IP, to add to game infos? (potential bans)
notifyNewgame();
this.startNewGame(gameInfo);
- } else {
+ // Increment game stats counter in DB
+ ajax(
+ "/gamestat",
+ "POST",
+ { data: { vid: gameInfo.vid } }
+ );
+ }
+ else {
// corr: game only on server
ajax(
"/games",
},
// NOTE: for live games only (corr games start on the server)
startNewGame: function(gameInfo) {
+ this.setVname(gameInfo);
const game = Object.assign(
{},
gameInfo,
{
// (other) Game infos: constant
fenStart: gameInfo.fen,
- vname: this.getVname(gameInfo.vid),
created: Date.now(),
// Game state (including FEN): will be updated
moves: [],
new Audio("/sounds/newgame.flac").play().catch(() => {});
notify(
"New live game",
- { body: "vs " + game.players[1-myIdx].name || "@nonymous" }
+ { body: "vs " + (game.players[1-myIdx].name || "@nonymous") }
);
}
this.$router.push("/game/" + gameInfo.id);