diff --git a/assets/gfx/borders-1.6.jpg b/assets/gfx/borders-1.6.jpg new file mode 100644 index 0000000..b57e043 Binary files /dev/null and b/assets/gfx/borders-1.6.jpg differ diff --git a/assets/gfx/borders-1.6.png b/assets/gfx/borders-1.6.png new file mode 100644 index 0000000..bdd2c19 Binary files /dev/null and b/assets/gfx/borders-1.6.png differ diff --git a/assets/gfx/borders-2.1.jpg b/assets/gfx/borders-2.1.jpg new file mode 100644 index 0000000..5611bff Binary files /dev/null and b/assets/gfx/borders-2.1.jpg differ diff --git a/assets/gfx/borders-2.1.png b/assets/gfx/borders-2.1.png new file mode 100644 index 0000000..082ebf2 Binary files /dev/null and b/assets/gfx/borders-2.1.png differ diff --git a/assets/gfx/borders-3.2.jpg b/assets/gfx/borders-3.2.jpg new file mode 100644 index 0000000..35bdba3 Binary files /dev/null and b/assets/gfx/borders-3.2.jpg differ diff --git a/assets/gfx/borders-3.2.png b/assets/gfx/borders-3.2.png new file mode 100644 index 0000000..8964319 Binary files /dev/null and b/assets/gfx/borders-3.2.png differ diff --git a/assets/gfx/borders-4.3.jpg b/assets/gfx/borders-4.3.jpg new file mode 100644 index 0000000..c58bde3 Binary files /dev/null and b/assets/gfx/borders-4.3.jpg differ diff --git a/assets/gfx/borders-4.3.png b/assets/gfx/borders-4.3.png new file mode 100644 index 0000000..eb173ea Binary files /dev/null and b/assets/gfx/borders-4.3.png differ diff --git a/assets/gfx/borders-5.4.jpg b/assets/gfx/borders-5.4.jpg new file mode 100644 index 0000000..96d9b58 Binary files /dev/null and b/assets/gfx/borders-5.4.jpg differ diff --git a/assets/gfx/borders-5.4.png b/assets/gfx/borders-5.4.png new file mode 100644 index 0000000..473ebd8 Binary files /dev/null and b/assets/gfx/borders-5.4.png differ diff --git a/assets/gfx/borders-6.5.jpg b/assets/gfx/borders-6.5.jpg new file mode 100644 index 0000000..8691f4e Binary files /dev/null and b/assets/gfx/borders-6.5.jpg differ diff --git a/assets/gfx/borders-6.5.png b/assets/gfx/borders-6.5.png new file mode 100644 index 0000000..0ccc95d Binary files /dev/null and b/assets/gfx/borders-6.5.png differ diff --git a/assets/gfx/card-army-1.png b/assets/gfx/card-army-1.png new file mode 100644 index 0000000..dd0b238 Binary files /dev/null and b/assets/gfx/card-army-1.png differ diff --git a/assets/gfx/card-army-10.png b/assets/gfx/card-army-10.png new file mode 100644 index 0000000..aaaa93f Binary files /dev/null and b/assets/gfx/card-army-10.png differ diff --git a/assets/gfx/card-army-11.png b/assets/gfx/card-army-11.png new file mode 100644 index 0000000..b398be1 Binary files /dev/null and b/assets/gfx/card-army-11.png differ diff --git a/assets/gfx/card-army-12.png b/assets/gfx/card-army-12.png new file mode 100644 index 0000000..badc54b Binary files /dev/null and b/assets/gfx/card-army-12.png differ diff --git a/assets/gfx/card-army-13.png b/assets/gfx/card-army-13.png new file mode 100644 index 0000000..5606b37 Binary files /dev/null and b/assets/gfx/card-army-13.png differ diff --git a/assets/gfx/card-army-14.png b/assets/gfx/card-army-14.png new file mode 100644 index 0000000..a998d09 Binary files /dev/null and b/assets/gfx/card-army-14.png differ diff --git a/assets/gfx/card-army-2.png b/assets/gfx/card-army-2.png new file mode 100644 index 0000000..b8ec43c Binary files /dev/null and b/assets/gfx/card-army-2.png differ diff --git a/assets/gfx/card-army-3.png b/assets/gfx/card-army-3.png new file mode 100644 index 0000000..b203cb8 Binary files /dev/null and b/assets/gfx/card-army-3.png differ diff --git a/assets/gfx/card-army-4.png b/assets/gfx/card-army-4.png new file mode 100644 index 0000000..75394ea Binary files /dev/null and b/assets/gfx/card-army-4.png differ diff --git a/assets/gfx/card-army-5.png b/assets/gfx/card-army-5.png new file mode 100644 index 0000000..61bbfc2 Binary files /dev/null and b/assets/gfx/card-army-5.png differ diff --git a/assets/gfx/card-army-6.png b/assets/gfx/card-army-6.png new file mode 100644 index 0000000..8ef1525 Binary files /dev/null and b/assets/gfx/card-army-6.png differ diff --git a/assets/gfx/card-army-7.png b/assets/gfx/card-army-7.png new file mode 100644 index 0000000..1456318 Binary files /dev/null and b/assets/gfx/card-army-7.png differ diff --git a/assets/gfx/card-army-8.png b/assets/gfx/card-army-8.png new file mode 100644 index 0000000..f3e8c5d Binary files /dev/null and b/assets/gfx/card-army-8.png differ diff --git a/assets/gfx/card-army-9.png b/assets/gfx/card-army-9.png new file mode 100644 index 0000000..3cad2a6 Binary files /dev/null and b/assets/gfx/card-army-9.png differ diff --git a/assets/gfx/card-brick.png b/assets/gfx/card-brick.png new file mode 100644 index 0000000..5c9d9b6 Binary files /dev/null and b/assets/gfx/card-brick.png differ diff --git a/assets/gfx/card-monopoly.png b/assets/gfx/card-monopoly.png new file mode 100644 index 0000000..dd21708 Binary files /dev/null and b/assets/gfx/card-monopoly.png differ diff --git a/assets/gfx/card-road-1.png b/assets/gfx/card-road-1.png new file mode 100644 index 0000000..f3c87a3 Binary files /dev/null and b/assets/gfx/card-road-1.png differ diff --git a/assets/gfx/card-road-2.png b/assets/gfx/card-road-2.png new file mode 100644 index 0000000..792334d Binary files /dev/null and b/assets/gfx/card-road-2.png differ diff --git a/assets/gfx/card-sheep.png b/assets/gfx/card-sheep.png new file mode 100644 index 0000000..51d545c Binary files /dev/null and b/assets/gfx/card-sheep.png differ diff --git a/assets/gfx/card-stone.png b/assets/gfx/card-stone.png new file mode 100644 index 0000000..c5a2ad3 Binary files /dev/null and b/assets/gfx/card-stone.png differ diff --git a/assets/gfx/card-vp-library.png b/assets/gfx/card-vp-library.png new file mode 100644 index 0000000..90f1413 Binary files /dev/null and b/assets/gfx/card-vp-library.png differ diff --git a/assets/gfx/card-vp-market.png b/assets/gfx/card-vp-market.png new file mode 100644 index 0000000..a549d31 Binary files /dev/null and b/assets/gfx/card-vp-market.png differ diff --git a/assets/gfx/card-vp-palace.png b/assets/gfx/card-vp-palace.png new file mode 100644 index 0000000..3d04cf8 Binary files /dev/null and b/assets/gfx/card-vp-palace.png differ diff --git a/assets/gfx/card-vp-university.png b/assets/gfx/card-vp-university.png new file mode 100644 index 0000000..a5dafae Binary files /dev/null and b/assets/gfx/card-vp-university.png differ diff --git a/assets/gfx/card-wheat.png b/assets/gfx/card-wheat.png new file mode 100644 index 0000000..ebcc63c Binary files /dev/null and b/assets/gfx/card-wheat.png differ diff --git a/assets/gfx/card-wood.png b/assets/gfx/card-wood.png new file mode 100644 index 0000000..d6129ba Binary files /dev/null and b/assets/gfx/card-wood.png differ diff --git a/assets/gfx/pieces-blue.jpg b/assets/gfx/pieces-blue.jpg new file mode 100644 index 0000000..ff27d85 Binary files /dev/null and b/assets/gfx/pieces-blue.jpg differ diff --git a/assets/gfx/pieces-orange.jpg b/assets/gfx/pieces-orange.jpg new file mode 100644 index 0000000..50447c8 Binary files /dev/null and b/assets/gfx/pieces-orange.jpg differ diff --git a/assets/gfx/pieces-red.jpg b/assets/gfx/pieces-red.jpg new file mode 100644 index 0000000..34082ad Binary files /dev/null and b/assets/gfx/pieces-red.jpg differ diff --git a/assets/gfx/pieces-white.jpg b/assets/gfx/pieces-white.jpg new file mode 100644 index 0000000..0a836ad Binary files /dev/null and b/assets/gfx/pieces-white.jpg differ diff --git a/assets/gfx/pieces.jpg b/assets/gfx/pieces.jpg new file mode 100644 index 0000000..bdef886 Binary files /dev/null and b/assets/gfx/pieces.jpg differ diff --git a/assets/gfx/pip-numbers.png b/assets/gfx/pip-numbers.png new file mode 100644 index 0000000..4109bde Binary files /dev/null and b/assets/gfx/pip-numbers.png differ diff --git a/assets/gfx/pip-ships.png b/assets/gfx/pip-ships.png new file mode 100644 index 0000000..44ec8e2 Binary files /dev/null and b/assets/gfx/pip-ships.png differ diff --git a/assets/gfx/placard-blue.png b/assets/gfx/placard-blue.png new file mode 100644 index 0000000..4143a83 Binary files /dev/null and b/assets/gfx/placard-blue.png differ diff --git a/assets/gfx/placard-largest-army.png b/assets/gfx/placard-largest-army.png new file mode 100644 index 0000000..2f3be5f Binary files /dev/null and b/assets/gfx/placard-largest-army.png differ diff --git a/assets/gfx/placard-longest-road.png b/assets/gfx/placard-longest-road.png new file mode 100644 index 0000000..2c3f783 Binary files /dev/null and b/assets/gfx/placard-longest-road.png differ diff --git a/assets/gfx/placard-orange.png b/assets/gfx/placard-orange.png new file mode 100644 index 0000000..47427c2 Binary files /dev/null and b/assets/gfx/placard-orange.png differ diff --git a/assets/gfx/placard-red.png b/assets/gfx/placard-red.png new file mode 100644 index 0000000..256832a Binary files /dev/null and b/assets/gfx/placard-red.png differ diff --git a/assets/gfx/placard-white.png b/assets/gfx/placard-white.png new file mode 100644 index 0000000..dd051ec Binary files /dev/null and b/assets/gfx/placard-white.png differ diff --git a/assets/gfx/table.png b/assets/gfx/table.png new file mode 100644 index 0000000..bdf89eb Binary files /dev/null and b/assets/gfx/table.png differ diff --git a/assets/gfx/tiles-brick.png b/assets/gfx/tiles-brick.png new file mode 100644 index 0000000..0e6c1dd Binary files /dev/null and b/assets/gfx/tiles-brick.png differ diff --git a/assets/gfx/tiles-robber.png b/assets/gfx/tiles-robber.png new file mode 100644 index 0000000..f0f3204 Binary files /dev/null and b/assets/gfx/tiles-robber.png differ diff --git a/assets/gfx/tiles-sheep.png b/assets/gfx/tiles-sheep.png new file mode 100644 index 0000000..62864df Binary files /dev/null and b/assets/gfx/tiles-sheep.png differ diff --git a/assets/gfx/tiles-stone.png b/assets/gfx/tiles-stone.png new file mode 100644 index 0000000..d951b2a Binary files /dev/null and b/assets/gfx/tiles-stone.png differ diff --git a/assets/gfx/tiles-wheat.png b/assets/gfx/tiles-wheat.png new file mode 100644 index 0000000..1568797 Binary files /dev/null and b/assets/gfx/tiles-wheat.png differ diff --git a/assets/gfx/tiles-wood.png b/assets/gfx/tiles-wood.png new file mode 100644 index 0000000..2956be9 Binary files /dev/null and b/assets/gfx/tiles-wood.png differ diff --git a/src/App.css b/src/App.css index d027a56..4c865e7 100755 --- a/src/App.css +++ b/src/App.css @@ -36,6 +36,10 @@ body { margin-left: -4.5em; } +.Hand { + min-height: calc(7.2em + 0.5em); +} + .Hand:hover .Stack:hover > *:not(:first-child) { margin-left: -2em; } diff --git a/src/Board.js b/src/Board.js index f01b313..dce664c 100755 --- a/src/Board.js +++ b/src/Board.js @@ -4,7 +4,18 @@ const hexagonRatio = 1.1547005, tileHeight = 0.16, tileWidth = tileHeight * hexagonRatio, roadSize = tileHeight * 0.5 * (5. / 8.), - settlementSize = tileHeight * 0.5 - roadSize; + settlementSize = tileHeight * 0.5 - roadSize, + diceSize = 0.05, + diceMargin = diceSize * 0.5 * Math.sqrt(2), + dice = [ { + pips: 0, + jitter: 0, + angle: 0 + }, { + pips: 0, + jitter: 0, + angle: 0 + } ]; const Tiles = (board) => { const tiles = [ { @@ -65,7 +76,7 @@ const Tiles = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/original/${file}`; + image.src = `assets/gfx/${file}`; }); return tiles; @@ -104,7 +115,7 @@ const Pips = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/original/${file}`; + image.src = `assets/gfx/${file}`; return { image: image, @@ -122,7 +133,7 @@ const Border = (board, border) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/original/${file}`; + image.src = `assets/gfx/${file}`; return border; }; @@ -135,7 +146,7 @@ const Table = (board) => { image.addEventListener("error", (event) => { alert(`Error loading ${file}`); }); - image.src = `assets/original/${file}`; + image.src = `assets/gfx/${file}`; return image; }; @@ -165,7 +176,7 @@ class Placard extends React.Component { render() { return (