span.variantName {{ curChallToAccept.vname }}
span {{ curChallToAccept.cadence }}
span {{ st.tr["with"] + " " + curChallToAccept.from.name }}
+ p.text-center(v-if="!!curChallToAccept.color")
+ | {{ st.tr["Your color:"] + " " + invColor(curChallToAccept.color) }}
.diagram(
v-if="!!curChallToAccept.fen"
v-html="tchallDiag"
:value="v.id"
:selected="newchallenge.vid==v.id"
)
- | {{ v.name }}
+ | {{ v.display }}
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
type="text"
v-model="newchallenge.to"
)
- fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+ fieldset(v-show="st.user.id > 0 && newchallenge.to.length > 0")
+ label(for="selectColor") {{ st.tr["Color"] }}
+ select#selectColor(v-model="newchallenge.color")
+ option(value='')
+ option(value='w') {{ st.tr["White"] }}
+ option(value='b') {{ st.tr["Black"] }}
+ br
input#inputFen(
placeholder="FEN"
@input="trySetNewchallDiag()"
)
| {{ st.tr["Observe"] }}
button.player-action(
- v-else-if="isFocusedOnHall(sid)"
+ v-else-if="st.user.sid != sid"
+ :class="{focused: isFocusedOnHall(sid)}"
@click="challenge(sid)"
)
| {{ st.tr["Challenge"] }}
fen: "",
vid: parseInt(localStorage.getItem("vid"), 10) || 0,
to: "", //name of challenged player (if any)
+ color: '',
cadence: localStorage.getItem("cadence") || "",
randomness:
// Warning: randomness can be 0, then !!randomness is false
},
focus: true,
tchallDiag: "",
- curChallToAccept: {from: {}},
+ curChallToAccept: { from: {} },
presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
conn: null,
connexionString: "",
"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();
const connectAndPoll = () => {
this.send("connect");
this.send("pollclientsandgamers");
+ if (!!this.$route.query["challenge"]) {
+ // Automatic challenge sending, for tournaments
+ this.loadNewchallVariant(
+ () => {
+ 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"]
+ );
+ }
};
// Initialize connection
this.connexionString =
const type = this.classifyObject(c);
const vname = this.getVname(c.vid);
return Object.assign(
- {},
{
type: type,
vname: vname,
}
}
);
- } else addChallenges();
+ }
+ else addChallenges();
}
}
);
this.focus = false;
this.send("losefocus");
},
+ invColor: function(c) {
+ if (c == 'w') return this.st.tr["Black"];
+ return this.tr.tr["White"];
+ },
partialResetNewchallenge: function() {
// Reset potential target and custom FEN:
this.newchallenge.to = "";
+ this.newchallenge.color = '';
this.newchallenge.fen = "";
this.newchallenge.diag = "";
this.newchallenge.memorize = false;
if (!this.newchallenge.to) {
// Reset potential FEN + diagram
this.newchallenge.fen = "";
+ this.newchallenge.color = '';
this.newchallenge.diag = "";
}
},
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) {
- // Consider imports as live games (TODO)
- if (!!o.id && !!o.id.toString().match(/^i/)) return "live";
- return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+ // No imported games here
+ 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:
) {
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) {
- const vname = this.getVname(this.newchallenge.vid);
+ loadNewchallVariant: async function(cb, vname) {
+ 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();
});
},
) {
const parsedFen = V.ParseFen(this.newchallenge.fen);
this.newchallenge.diag = getDiagram({
- position: parsedFen.position,
- orientation: parsedFen.turn
+ position: parsedFen.position
+ //,orientation: parsedFen.turn
});
- } else this.newchallenge.diag = "";
+ }
+ else this.newchallenge.diag = "";
},
newChallFromPreset(pchall) {
this.partialResetNewchallenge();
error = this.st.tr["Please select a variant"];
else if (ctype == "corr" && this.st.user.id <= 0)
error = this.st.tr["Please log in to play correspondence games"];
+ else if (!this.newchallenge.to && !!this.newchallenge.color)
+ error = this.st.tr["Color option only for targeted challenge"];
else if (!!this.newchallenge.to) {
if (this.newchallenge.to == this.st.user.name)
error = this.st.tr["Self-challenge is forbidden"];
) {
error = this.newchallenge.to + " " + this.st.tr["is not online"];
}
+ if (
+ !!this.newchallenge.color &&
+ !['w', 'b'].includes(this.newchallenge.color)
+ ) {
+ error = this.st.tr["Wrong color"];
+ }
}
- if (error) {
+ if (!!error) {
alert(error);
return;
}
}
// NOTE: "from" information is not required here
let chall = Object.assign({}, this.newchallenge);
- // Add only if not already issued (not counting target or FEN):
+ // Add only if not already issued (not counting FEN):
if (this.challenges.some(c =>
(
c.from.sid == this.st.user.sid ||
(c.from.id > 0 && c.from.id == this.st.user.id)
)
&&
+ (
+ (!c.to && !chall.to) ||
+ c.to == chall.to
+ )
+ &&
c.vid == chall.vid &&
c.cadence == chall.cadence &&
c.randomness == chall.randomness
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;
}
- c.accepted = true;
- await import("@/variants/" + c.vname + ".js")
- .then((vModule) => {
- window.V = vModule[c.vname + "Rules"];
- if (!!c.to) {
- // c.to == this.st.user.name (connected)
- if (!!c.fen) {
- const parsedFen = V.ParseFen(c.fen);
- c.mycolor = V.GetOppCol(parsedFen.turn);
- this.tchallDiag = getDiagram({
- position: parsedFen.position,
- orientation: c.mycolor
- });
+ else {
+ c.accepted = true;
+ await import("@/variants/" + c.vname + ".js")
+ .then((vModule) => {
+ window.V = vModule[c.vname + "Rules"];
+ if (!!c.to) {
+ // c.to == this.st.user.name (connected)
+ if (!!c.fen) {
+ const parsedFen = V.ParseFen(c.fen);
+ this.tchallDiag = getDiagram({
+ position: parsedFen.position,
+ orientation: parsedFen.turn
+ });
+ }
+ this.curChallToAccept = c;
+ document.getElementById("modalAccept").checked = true;
}
- this.curChallToAccept = c;
- document.getElementById("modalAccept").checked = true;
- }
- else this.finishProcessingChallenge(c);
- });
+ else this.finishProcessingChallenge(c);
+ });
+ }
}
else {
// My challenge
launchGame: function(c) {
// White player index 0, black player index 1:
let players =
- !!c.mycolor
- ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
+ !!c.color
+ ? (c.color == "w" ? [c.from, c.seat] : [c.seat, c.from])
: shuffle([c.from, c.seat]);
players.forEach(p => {
if (!!p["tmpIds"]) delete p["tmpIds"];
// 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);
button.player-action
margin-left: 32px
+ &.focused
+ background-color: #E6D271
.somethingnew
background-color: #90C4EC !important