Use Cobra from team-mate everywhere

Author: fhoudebert

src/games/chessbase/base-model.js

@@ -404,6 +404,7 @@
 			this.board[pos]=-1;
 		this.pieces.forEach(function(piece,index) {
 			piece.i=index;
+			if(piece.p<0) return;
 			$this.board[piece.p]=index;
 			var pType=aGame.g.pTypes[piece.t];
 			if(pType.isKing)

src/games/chessbase/fairy-piece-model.js

@@ -23,14 +23,14 @@
 			var path = [], f = iflags, corner = geometry.Graph(start, vec), brouhaha=0;
 			while(f < -1 && corner) corner = geometry.Graph(corner, vec), f++; // negative iflags jump to corner
 			if(corner != null) {
-				f=(iflags<0 ? flags : iflags);
+				f=(iflags<-1 ? flags : iflags);
 				if(confine) {
 					if(!(corner in confine)) return;
 					if(confine[corner]=='b') f &= ~(brouhaha=c.FLAG_MOVE|c.FLAG_SPECIAL); // not to empty brouhaha squares
 				}
 				var vec2 = Rotate(vec, bend);
-				if(f && iflags != c.FLAG_STOP) // defer adding stop until something follows it
-					path.push(corner | f); // use iflags on 1st square if it did not indikate skipping
+				if(f>=0 && iflags != c.FLAG_STOP) // defer adding stop until something follows it
+					path.push(corner | f);    // use iflags on 1st square if it did not indicate skipping
 				if(brouhaha) return; // never past occupied brouhaha square
 				for(var n=1; n<range; n++) {
 					var delta = [n*vec2[0], n*vec2[1]], pos = geometry.Graph(corner, delta);

src/games/chessbase/fairy-set-view.js

@@ -463,6 +463,11 @@
 					clipx: 7400,
 					},
 			},
+			"fr-spider": {
+				"2d": {
+					clipx: 7500,
+					},
+			},
 		},modifier);
 	}
 
@@ -2412,5 +2417,26 @@
 				}
 			},
 		},
+		"fr-spider": {
+			mesh: {
+				jsFile:"/res/fairy/critters/spider.js"
+			},
+			materials: {
+				mat0: {
+					channels: {
+						diffuse: {
+							texturesImg: {
+								diffImg : "/res/fairy/critters/spider-diffusemap.jpg",
+							}
+						},
+						normal: {
+							texturesImg: {
+								normalImg: "/res/fairy/critters/spider-normalmap.jpg",
+							}
+						}
+					}
+				}
+			},
+		},
 	});
 })();

src/games/chessbase/index.js

@@ -2331,7 +2331,7 @@ exports.games = (function () {
 						"en": "res/rules/shako/shako-credits.html",
 						"fr": "res/rules/shako/shako-credits-fr.html"
 					},
-					"gameOptions": config_model_gameOptions_2,
+					"gameOptions": config_model_gameOptions,
 					"js": modelScripts_13,
 					"description": {
 						"en": "res/rules/shako/shako-description.html",
@@ -6288,7 +6288,7 @@ exports.games = (function () {
 					"credits": {
 						"en": "res/rules/team-mate/team-mate-credits.html"
 					},
-					"gameOptions": config_model_gameOptions_2,
+					"gameOptions": config_model_gameOptions,
 					"js": modelScripts_100,
 					"description": {
 						"en": "res/rules/team-mate/team-mate-description.html"

src/games/chessbase/minjiku-shogi-model.js

@@ -302,7 +302,7 @@
 		    23: {
 			name : 'ninja',
 			abbrev : '+L',
-			aspect : 'fr-ship',
+			aspect : 'fr-gate',
 			graph : this.cbMergeGraphs(geometry,
 			            this.cbSkiGraph(geometry,[[1,0],[-1,0]],0,-1),
 			            this.cbShortRangeGraph(geometry,[[1,0],[0,-1],[-1,0],[0,1]],area,rifle),