div#acceptDiv(role="dialog")
.card
p.text-center
- span.variantName {{ curChallToAccept.vname }}
+ span.variantName
+ | {{ curChallToAccept.vname }}
+ | {{ curChallToAccept.options.abridged || '' }}
span {{ curChallToAccept.cadence }}
span {{ st.tr["with"] + " " + curChallToAccept.from.name }}
p.text-center(v-if="!!curChallToAccept.color")
:value="v.id"
:selected="newchallenge.vid==v.id"
)
- | {{ v.name }}
+ | {{ v.display }}
+ // Variant-specific options (often at least randomness)
+ fieldset(v-if="!!newchallenge.V && newchallenge.V.Options")
+ div(v-for="select of newchallenge.V.Options.select || []")
+ label(:for="select.variable + '_opt'") {{ st.tr[select.label] }} *
+ select(:id="select.variable + '_opt'")
+ option(
+ v-for="o of select.options"
+ :value="o.value"
+ :selected="o.value == select.defaut"
+ )
+ | {{ st.tr[o.label] }}
+ div(v-for="check of newchallenge.V.Options.check || []")
+ label(:for="check.variable + '_opt'") {{ st.tr[check.label] }} *
+ input(
+ :id="check.variable + '_opt'"
+ type="checkbox"
+ :checked="check.defaut")
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
v-model="newchallenge.cadence"
placeholder="5+0, 1h+30s, 5d ..."
)
- fieldset
- label(for="selectRandomLevel") {{ st.tr["Randomness"] }} *
- select#selectRandomLevel(v-model="newchallenge.randomness")
- option(value="0") {{ st.tr["Deterministic"] }}
- option(value="1") {{ st.tr["Symmetric random"] }}
- option(value="2") {{ st.tr["Asymmetric random"] }}
fieldset
label(for="memorizeChall") {{ st.tr["Memorize"] }}
input#memorizeChall(
tr
th {{ st.tr["Variant"] }}
th {{ st.tr["Cadence"] }}
- th {{ st.tr["Random?"] }}
+ th {{ st.tr["Options"] }}
th
tbody
+ // TODO: remove the check !!pc.options
tr(
v-for="pc in presetChalls"
@click="newChallFromPreset(pc)"
+ v-if="!!pc.options"
)
td {{ pc.vname }}
td {{ pc.cadence }}
- td(:class="getRandomnessClass(pc)")
+ td(:class="getRandomnessClass(pc)") {{ pc.options.abridged || '' }}
td.remove-preset(@click="removePresetChall($event, pc)")
img(src="/images/icons/delete.svg")
.row
to: "", //name of challenged player (if any)
color: '',
cadence: localStorage.getItem("cadence") || "",
- randomness:
- // Warning: randomness can be 0, then !!randomness is false
- (parseInt(localStorage.getItem("challRandomness"),10)+1 || 3) - 1,
+ options: {},
// VariantRules object, stored to not interfere with
- // diagrams of targetted challenges:
+ // diagrams of targeted challenges:
V: null,
vname: "",
diag: "", //visualizing FEN
},
focus: true,
tchallDiag: "",
- curChallToAccept: { from: {} },
+ curChallToAccept: { from: {}, options: {} },
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();
id: my.id,
name: my.name,
tmpIds: {
- tmpId: { page: "/", focus: true }
+ [tmpId]: { page: "/", focus: true }
}
}
);
// Automatic challenge sending, for tournaments
this.loadNewchallVariant(
() => {
- this.newchallenge = Object.assign(
+ Object.assign(
this.newchallenge,
{
fen: "",
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,
+ options: {},
memorize: false
}
);
window.doClick("modalNewgame");
- //this.issueNewChallenge(); //NOTE: doesn't work yet.
},
this.$route.query["variant"]
);
response.challenges.map(c => {
const from = { name: names[c.uid], id: c.uid }; //or just name
const type = this.classifyObject(c);
- const vname = this.getVname(c.vid);
+ this.setVname(c);
return Object.assign(
{},
+ c,
{
type: type,
- vname: vname,
from: from,
- to: c.target ? names[c.target] : ""
- },
- c
+ to: c.target ? names[c.target] : "",
+ options: JSON.parse(c.options)
+ }
);
})
);
this.conn = null;
},
getRandomnessClass: function(pc) {
- return {
- ["random-" + pc.randomness]: true
- };
+ const opts = pc.options;
+ if (opts.randomness === undefined && opts.random === undefined)
+ return {};
+ if (opts.randomness !== undefined)
+ return { ["random-" + opts.randomness]: true };
+ return { ["random-" + (opts.random ? 2 : 0)]: true };
},
anonymousCount: function() {
let count = 0;
},
invColor: function(c) {
if (c == 'w') return this.st.tr["Black"];
- return this.tr.tr["White"];
+ return this.st.tr["White"];
},
partialResetNewchallenge: function() {
// Reset potential target and custom FEN:
this.partialResetNewchallenge();
window.doClick("modalNewgame");
},
+ sameOptions: function(opt1, opt2) {
+ const keys1 = Object.keys(opt1),
+ keys2 = Object.keys(opt2);
+ if (keys1.length != keys2.length) return false;
+ for (const key1 of keys1) {
+ if (!keys2.includes(key1)) return false;
+ if (opt1[key1] != opt2[key1]) return false;
+ }
+ return true;
+ },
addPresetChall: function(chall) {
// Add only if not already existing:
if (this.presetChalls.some(c =>
c.vid == chall.vid &&
c.cadence == chall.cadence &&
- c.randomness == chall.randomness
+ this.sameOptions(c.options, chall.options)
)) {
return;
}
vid: chall.vid,
vname: chall.vname, //redundant, but easier
cadence: chall.cadence,
- randomness: chall.randomness
+ options: chall.options
});
localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
},
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);
id: c.id,
from: this.st.user.sid,
to: c.to,
- randomness: c.randomness,
+ options: JSON.stringify(c.options),
fen: c.fen,
vid: c.vid,
cadence: c.cadence,
) {
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 = "*";
+ // TODO: remove patch on next line (options || "{}")
+ newGame.options = JSON.parse(newGame.options || "{}");
this.games.push(newGame);
if (
newGame.score == '*' &&
}
case "startgame": {
// New game just started, I'm involved
- const gameInfo = data.data;
- if (this.classifyObject(gameInfo) == "live")
+ let gameInfo = data.data;
+ if (this.classifyObject(gameInfo) == "live") {
+ // TODO: remove patch on next line (+ const gameInfo)
+ if (!gameInfo.options) gameInfo.options = "{}";
this.startNewGame(gameInfo);
+ }
else {
this.infoMessage =
this.st.tr["New correspondence game:"] + " " +
}
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";
+ g.options = JSON.parse(g.options);
+ return g;
});
this.games = this.games.concat(moreGames);
}
) {
let newChall = Object.assign({}, chall);
newChall.type = this.classifyObject(chall);
- newChall.randomness = chall.randomness;
+ // TODO: remove patch on next line (options || "{}")
+ newChall.options = JSON.parse(chall.options || "{}");
newChall.added = Date.now();
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") ||
}
},
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();
});
},
this.partialResetNewchallenge();
this.newchallenge.vid = pchall.vid;
this.newchallenge.cadence = pchall.cadence;
- this.newchallenge.randomness = pchall.randomness;
+ this.newchallenge.options = pchall.options;
+ this.newchallenge.fromPreset = true;
this.loadNewchallVariant(this.issueNewChallenge);
},
issueNewChallenge: async function() {
error = this.st.tr["Wrong color"];
}
}
- if (!!error) {
+ if (error) {
alert(error);
return;
}
window.V = this.newchallenge.V;
- error = checkChallenge(this.newchallenge);
+ let chall = Object.assign({}, this.newchallenge);
+ if (!this.newchallenge.fromPreset) chall.options = { options: {} };
+ if (V.Options && !this.newchallenge.fromPreset) {
+ // Get/set options variables (if any) / TODO: v-model?!
+ for (const check of this.newchallenge.V.Options.check || []) {
+ const elt = document.getElementById(check.variable + "_opt");
+ chall.options[check.variable] = elt.checked;
+ }
+ for (const select of this.newchallenge.V.Options.select || []) {
+ const elt = document.getElementById(select.variable + "_opt");
+ const tryIntVal = parseInt(elt.value, 10);
+ chall.options[select.variable] =
+ (isNaN(tryIntVal) ? elt.value : tryIntVal);
+ }
+ }
+ error = checkChallenge(chall);
if (error) {
- alert(error);
+ alert(this.st.tr[error]);
return;
}
- // NOTE: "from" information is not required here
- let chall = Object.assign({}, this.newchallenge);
+ chall.options.abridged = V.AbbreviateOptions(chall.options);
// Add only if not already issued (not counting FEN):
+ // NOTE: "from" information is not required here
if (this.challenges.some(c =>
(
c.from.sid == this.st.user.sid ||
&&
c.vid == chall.vid &&
c.cadence == chall.cadence &&
- c.randomness == chall.randomness
+ this.sameOptions(c.options, chall.options)
)) {
alert(this.st.tr["Challenge already exists"]);
return;
}
- if (this.newchallenge.memorize) this.addPresetChall(this.newchallenge);
+ if (this.newchallenge.memorize) this.addPresetChall(chall);
delete chall["V"];
delete chall["diag"];
const finishAddChallenge = cid => {
this.send("newchallenge", {
data: Object.assign(
// Temporarily add sender infos to display challenge on Discord.
- { from: this.st.user.sid, sender: this.st.user.name }, chall)
+ { from: this.st.user.sid, sender: this.st.user.name },
+ chall,
+ { options: JSON.stringify(chall.options) }
+ )
});
// Add new challenge:
chall.from = {
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
- // Remember cadence + vid for quicker further challenges:
+ // Remember cadence + vid for quicker further challenges:
localStorage.setItem("cadence", chall.cadence);
localStorage.setItem("vid", chall.vid);
- localStorage.setItem("challRandomness", chall.randomness);
document.getElementById("modalNewgame").checked = false;
// Show the challenge if not on current display
if (
"/challenges",
"POST",
{
- data: { chall: chall },
+ data: {
+ chall: Object.assign(
+ {},
+ chall,
+ { options: JSON.stringify(chall.options) }
+ )
+ },
success: (response) => {
finishAddChallenge(response.id);
}
// These game informations will be shared
let gameInfo = {
id: getRandString(),
- fen: c.fen || V.GenRandInitFen(c.randomness),
- randomness: c.randomness, //for rematch
+ fen: c.fen || V.GenRandInitFen(c.options),
+ options: JSON.stringify(c.options), //for rematch
players: players,
vid: c.vid,
cadence: c.cadence
},
// 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: [],
#chat > .card
max-width: 100%
- margin: 0;
- border: none;
+ margin: 0
+ border: none
#players > p
margin-left: 5px
tr > td
&.random-0
- background-color: #FF5733
+ background-color: #FEAF9E
&.random-1
- background-color: #2B63B4
+ background-color: #9EB2FE
&.random-2
- background-color: #33B42B
+ background-color: #A5FE9E
@media screen and (max-width: 767px)
h4
projects / vchess.git / blobdiff