Fairy set

.gitignore

@@ -3,3 +3,4 @@ dist/
 update-gh-pages.sh
 tmp/
 npm-debug.log
+private/

README.md

@@ -6,20 +6,20 @@ artificial intelligence to play against.
 Demos
 -----
 
-[Controlled interface](https://mi-g.github.io/jocly/examples/browser/control.html) for playing Chess.
+[Controlled interface](https://aclap-dev.github.io/jocly/examples/browser/control.html) for playing Chess.
 Click _**Other Jocly games**_ to switch to other games.
 
-Simple human vs computer: [Classic chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=classic-chess),
-[Circular chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=circular-chess),
-[Multi layers chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=raumschach),
-[Hexagonal chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=glinski-chess),
-[Chinese chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=xiangqi),
-[Middle-age chess](https://mi-g.github.io/jocly/examples/browser/simple.html?game=courier-chess),
-[Scrum](https://mi-g.github.io/jocly/examples/browser/simple.html?game=scrum)
+Simple human vs computer: [Classic chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=classic-chess),
+[Circular chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=circular-chess),
+[Multi layers chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=raumschach),
+[Hexagonal chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=glinski-chess),
+[Chinese chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=xiangqi),
+[Middle-age chess](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=courier-chess),
+[Scrum](https://aclap-dev.github.io/jocly/examples/browser/simple.html?game=scrum)
 
-Or see and try [all available games](https://mi-g.github.io/jocly/examples/browser/multiple.html)
+Or see and try [all available games](https://aclap-dev.github.io/jocly/examples/browser/multiple.html)
 
-[JoclyBoard](https://github.com/mi-g/joclyboard) is a multi-platform desktop application based on Jocly 
+[JoclyBoard](https://github.com/aclap-dev/joclyboard) is a multi-platform desktop application based on Jocly 
 and [Electron](https://electron.atom.io/).
 
 Install
@@ -53,7 +53,7 @@ Building
 - install the *node.js* environment (using [nvm](https://github.com/creationix/nvm) is probably a good idea)
 - install *gulp*: `npm install -g gulp`
 - install [git](https://git-scm.com/downloads)
-- clone Jocly from *github*: `git clone https://github.com/mi-g/jocly.git`
+- clone Jocly from *github*: `git clone https://github.com/aclap-dev/jocly.git`
 - enter the `jocly` directory
 - download required modules: `npm install`
 - build: `gulp build`
@@ -69,5 +69,5 @@ API Documentation
 -----------------
 
 Jocly offers two distinct APIs:
-- the [Application API](https://github.com/mi-g/jocly/wiki/Application-API) to make Web applications
-- the [Game API](https://github.com/mi-g/jocly/wiki/Game-API) to create games to run with Jocly features
+- the [Application API](https://github.com/aclap-dev/jocly/wiki/Application-API) to make Web applications
+- the [Game API](https://github.com/aclap-dev/jocly/wiki/Game-API) to create games to run with Jocly features

examples/browser/js/control.js

@@ -128,7 +128,6 @@ $(document).ready(function () {
     var gameName = m && m[1] || "classic-chess";
     var elementId = "applet";
     var area = document.getElementById(elementId);
-
     Jocly.createMatch(gameName).then((match) => {
         // get game configuration to setup control UI
         match.getConfig()
@@ -138,16 +137,15 @@ $(document).ready(function () {
                 $("#game-status").show();
 
                 var viewOptions = config.view;
+
                 // fills Skins dropdown with available skins
                 viewOptions.skins.forEach(function(skin) {
                     $("<option/>").attr("value",skin.name).text(skin.title).appendTo($("#options-skin"));
                 });
                 $("#options").show();
-
                 // get saved view options if any
                 var viewOptions = window.localStorage && window.localStorage[gameName+".options"] && 
                     JSON.parse(window.localStorage[gameName+".options"]) || undefined;
-
                 // the match need to be attached to a DOM element for displaying the board
                 match.attachElement(area, { viewOptions: viewOptions })
                     .then( () => {
@@ -213,7 +211,6 @@ $(document).ready(function () {
                             });
                             var mode = window.localStorage && window.localStorage[gameName+".mode"] || "self-comp";
                             $("#mode").val(mode).trigger("change");
-
                             if(config.view.switchable) {
                                 $("#view-as").show().on("change",()=>{
                                     var playerMode = $("#view-as").val();
@@ -224,17 +221,28 @@ $(document).ready(function () {
                                         player = Jocly.PLAYER_A;
                                     else if(playerMode=="player-b")
                                         player = Jocly.PLAYER_B;
-                                    if(player)
+                                    if(player){
                                         match.setViewOptions({
 												viewAs: player
 											})
                                             .then( () => {
                                                 RunMatch(match,progressBar);                                
                                             });
+                                    }
                                 });
+
                                 var viewAs = window.localStorage && window.localStorage[gameName+".view-as"];
-                                if(viewAs)
+
+                                if(viewAs===undefined || Object.is(viewAs, null) /*|| viewAs==="null"*/)
+                                    viewAs="player-a";
+
+                                if(viewAs){
                                     $("#view-as").val(viewAs).trigger("change");
+                                    var playerMode = $("#view-as").val();
+                                }else{
+                                    console.log("viewAs",viewAs );
+                                    console.log("window.localStorage",window.localStorage );
+                                }    
                             }
 
                         })

src/core/jocly.game.js

@@ -946,18 +946,18 @@ JocGame.prototype.AddBest = function(aMove, aBoard) {
 	this.mBestMoves.push(move);
 }
 
-JocGame.prototype.GetRepeatOccurence = function(board) {
+JocGame.prototype.GetRepeatOccurence = function(board, len) {
 	if(!this.mOptions.preventRepeat)
 		return -1;
 	var repOcc=this.mVisitedBoards[board.GetSignature()];
-	return repOcc;
+	return (len ? this.mPlayedMoves.length - (repOcc >>> 4) : repOcc&15);
 }
 
 JocGame.prototype.HandleRepeat = function(board) {
 	if(this.mOptions.preventRepeat) {
 		var sign=board.GetSignature(true);
 		if(this.mVisitedBoards[sign]===undefined)
-			this.mVisitedBoards[sign]=1;
+			this.mVisitedBoards[sign]=1 + 16*this.mPlayedMoves.length;
 		else
 			this.mVisitedBoards[sign]++;
 	}
@@ -966,9 +966,10 @@ JocGame.prototype.HandleRepeat = function(board) {
 JocGame.prototype.UnhandleRepeat = function(board) {
 	if(this.mOptions.preventRepeat) {
 		var sign=board.GetSignature(true);
-		if(this.mVisitedBoards[sign]==1)
+		var n=this.mVisitedBoards[sign]&15;
+		if(n==1)
 			delete this.mVisitedBoards[sign];
-		else if(this.mVisitedBoards[sign]>1)
+		else if(n>1)
 			this.mVisitedBoards[sign]--;
 	}
 }
@@ -1307,8 +1308,16 @@ JocBoard.prototype.CompactMoveString = function(aGame,aMove) {
 
 /*-- Zobrist implementation --*/
 
+JocGame.Twister = 0;
+
+JocGame.LetsTwist=function(seed) {
+	if(!JocGame.Twister) JocGame.Twister=new MersenneTwister(seed);
+	return JocGame.Twister;
+}
+
 JocGame.Zobrist=function(params) {
 	var mt=new MersenneTwister(12345);
+
 	var paramNames=[];
 	for(var f in params)
 		paramNames.push(f);