Merge pull request #77 from Chessweeper/develop

Update master

Author: Xwilarg

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/gen"]
 	path = src/gen
 	url = https://github.com/Chessweeper/Puzzle-Gen
+[submodule "src/assets"]
+	path = src/assets
+	url = https://github.com/Chessweeper/Assets

README.md

@@ -29,8 +29,5 @@ To build a release version of the game, run `npm run build`. The output is place
 
 ## Credits
 
-- Chess icons and favicon from https://github.com/oakmac/chessboardjs
-- Shovel icon from Vectors Market, Flaticon, https://www.flaticon.com/free-icons/shovel
-- Shogi icons from Wikimedia Commons by Hari Seldon under Creative Commons Attribution-Share Alike 3.0 Unported
-- Digital font from The FontStruction, https://fontstruct.com/fontstructions/show/583495, by jon889 under a Creative Commons Attribution Share Alike
+- For icons, see [the assets repository](https://github.com/Chessweeper/Assets)
 - Idea taken from https://www.reddit.com/r/AnarchyChess/comments/ytw69b/new_chess_2_update_just_dropped_numbers_are_based/

src/Game.ts

@@ -31,7 +31,7 @@ function isReverseWinCondition(G: GameState, id: number) {
       if (G.cells[i].value !== G.cells[i].known && G.cells[i].value !== id) {
         return false;
       }
-    } else if (G.cells[i].known === false) {
+    } else if (G.cells[i].known === false && G.cells[i].value !== 0) {
       return false;
     }
   }

src/Pieces.ts

@@ -1,22 +1,22 @@
-import shovel from "./assets/shovel.png";
-import rook from "./assets/wR.png";
-import knight from "./assets/wN.png";
-import bishop from "./assets/wB.png";
-import queen from "./assets/wQ.png";
-import king from "./assets/wK.png";
-import pawn from "./assets/wP.png";
-import blackPawn from "./assets/bP.png";
-import knook from "./assets/knook.png";
-import shogiRook from "./assets/shogiRook.svg";
-import shogiBishop from "./assets/shogiBishop.svg";
-import shogiKnight from "./assets/shogiKnight.svg";
-import shogiPawn from "./assets/shogiPawn.svg";
-import shogiKing from "./assets/shogiKing.svg";
-import shogiLance from "./assets/shogiLance.svg";
-import shogiSilverGeneral from "./assets/shogiSilverGeneral.svg";
-import shogiGoldGeneral from "./assets/shogiGoldGeneral.svg";
-import plus from "./assets/plus.svg";
-import minus from "./assets/minus.svg";
+import shovel from "./assets/img/shovel.png";
+import rook from "./assets/img/wR.png";
+import knight from "./assets/img/wN.png";
+import bishop from "./assets/img/wB.png";
+import queen from "./assets/img/wQ.png";
+import king from "./assets/img/wK.png";
+import pawn from "./assets/img/wP.png";
+import blackPawn from "./assets/img/bP.png";
+import knook from "./assets/img/knook.png";
+import shogiRook from "./assets/img/shogiRook.svg";
+import shogiBishop from "./assets/img/shogiBishop.svg";
+import shogiKnight from "./assets/img/shogiKnight.svg";
+import shogiPawn from "./assets/img/shogiPawn.svg";
+import shogiKing from "./assets/img/shogiKing.svg";
+import shogiLance from "./assets/img/shogiLance.svg";
+import shogiSilverGeneral from "./assets/img/shogiSilverGeneral.svg";
+import shogiGoldGeneral from "./assets/img/shogiGoldGeneral.svg";
+import plus from "./assets/img/plus.svg";
+import minus from "./assets/img/minus.svg";
 
 // todo: union type for pieces?
 export const piecesImages: Record<string, string> = {

src/assets

@@ -1,6 +1,6 @@
-import rook from "../assets/wR.png";
-import knook from "../assets/knook.png";
-import pawn from "../assets/wP.png";
+import rook from "../assets/img/wR.png";
+import knook from "../assets/img/knook.png";
+import pawn from "../assets/img/wP.png";
 import { useBoardContext } from "./BoardWrapper";
 import { useEffect } from "react";
 import "./BoardHeaderButton.css";

src/assets/bP.png

@@ -17,8 +17,8 @@ describe("BoardHeaderButton tests", () => {
   });
 
   it.each([
-    [true, "/src/assets/knook.png"],
-    [false, "/src/assets/wP.png"],
+    [true, "/src/assets/img/knook.png"],
+    [false, "/src/assets/img/wP.png"],
   ])(
     "should render and display isWin message if gameover is normal result",
     (isWin, expectedSrc) => {