tilera/jocly
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed reading FEN, move format

Browse source
This commit is contained in:
mig 2017-04-26 15:38:32 +02:00
parent 4568e8fd82
commit 5d63dc8ac5
1 changed files with 62 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/games/chessbase/base-model.js
View file

@ -327,8 +327,10 @@
this.zSign=aGame.zobrist.update(0,"who",-1);
this.noCaptCount = 0;
this.mWho = 1;
if(aGame.mInitial) {
this.mWho = aGame.mInitial.turn || 1;
aGame.mInitial.pieces.forEach(function(piece) {
var piece1={}
for(var f in piece)
@ -343,6 +345,17 @@
}
if(aGame.mInitial.noCaptCount!==undefined)
this.noCaptCount=aGame.mInitial.noCaptCount;
if(aGame.cbVar.castle && aGame.mInitial.castle)
this.castled = {
'1': {
k: !!aGame.mInitial.castle[1] && !!aGame.mInitial.castle[1].k,
q: !!aGame.mInitial.castle[1] && !!aGame.mInitial.castle[1].q
},
'-1': {
k: !!aGame.mInitial.castle[-1] && !!aGame.mInitial.castle[-1].k,
q: !!aGame.mInitial.castle[-1] && !!aGame.mInitial.castle[-1].q
}
}
} else {
for(var typeIndex in aGame.cbVar.pieceTypes) {
var pType = aGame.cbVar.pieceTypes[typeIndex];
@ -1038,33 +1051,57 @@
this.Init(move);
}
Model.Move.ToString = function() {
if(this.compact)
return this.compact;
var str;
if(this.cg!==undefined) {
str=cbVar.castle[this.f+"/"+this.cg].n;
} else {
str=this.a || '';
str+=cbVar.geometry.PosName(this.f);
if(this.c==null)
str+="-";
else
str+="x";
str+=cbVar.geometry.PosName(this.t);
Model.Move.ToString = function(format) {
var self = this;
format = format || "natural";
// not sure was that was for...
//if(this.compact)
// return this.compact;
function NaturalFormat() {
var str;
if(self.cg!==undefined) {
str=cbVar.castle[self.f+"/"+self.cg].n;
} else {
str=self.a || '';
str+=cbVar.geometry.PosName(self.f);
if(self.c==null)
str+="-";
else
str+="x";
str+=cbVar.geometry.PosName(self.t);
}
if(self.pr!==undefined) {
var pType=cbVar.pieceTypes[self.pr];
if(pType && pType.abbrev && pType.abbrev.length>0 && !pType.silentPromo)
str+="="+pType.abbrev;
}
if(self.ck)
str+="+";
return str;
}
/*
if(this.ep)
str+="e.p.";
*/
if(this.pr!==undefined) {
var pType=cbVar.pieceTypes[this.pr];
if(pType && pType.abbrev && pType.abbrev.length>0 && !pType.silentPromo)
str+="="+pType.abbrev;
function EngineFormat() {
var str = cbVar.geometry.PosName(self.f) + cbVar.geometry.PosName(self.t);
if(self.pr!=undefined) {
var pType=cbVar.pieceTypes[self.pr];
if(pType && pType.abbrev && pType.abbrev.length>0 && !pType.silentPromo)
str+=pType.abbrev;
}
return str;
}
if(this.ck)
str+="+";
return str;
switch(format) {
case "natural":
return NaturalFormat();
case "engine":
return EngineFormat();
default:
return "??";
}
}
/* compact the move notation while preventing ambiguities */