From ded43c88fad60fd8f9bb46aabd67f3f2092f65f3 Mon Sep 17 00:00:00 2001 From: Benjamin Auder <benjamin.auder@somewhere> Date: Fri, 22 Jan 2021 04:45:15 +0100 Subject: [PATCH] Some fixes. Screen variant computer play is still broken, seemingly --- client/public/images/pieces/Musketeer/bs.svg | 5 +- client/public/images/pieces/Musketeer/bu.svg | 5 +- client/public/images/pieces/Musketeer/wa.svg | 31 ++++++++- client/public/images/pieces/Musketeer/wj.svg | 29 ++++++++- client/public/images/pieces/Musketeer/wm.svg | 11 +++- client/public/images/pieces/Musketeer/ws.svg | 63 ++++++++++++++++++- client/public/images/pieces/Musketeer/wu.svg | 31 ++++++++- .../images/pieces/Shogun/{bM.svg => bm.svg} | 0 .../translations/rules/Progressive2/en.pug | 2 +- .../translations/rules/Progressive2/es.pug | 2 +- .../translations/rules/Progressive2/fr.pug | 2 +- client/src/variants/Alapo.js | 11 ++++ client/src/variants/Atomic1.js | 11 ++++ client/src/variants/Crazyhouse.js | 4 +- client/src/variants/Fanorona.js | 7 ++- client/src/variants/Hypnotic.js | 15 +++++ client/src/variants/Madhouse.js | 13 +++- client/src/variants/Makruk.js | 4 ++ client/src/variants/Minixiangqi.js | 6 +- client/src/variants/Pawnmassacre.js | 4 ++ client/src/variants/Recycle.js | 8 +++ client/src/variants/Screen.js | 2 +- client/src/variants/Selfabsorb.js | 4 ++ client/src/variants/Shogi.js | 4 ++ client/src/variants/Synochess.js | 2 +- client/src/variants/Wormhole1.js | 2 +- 26 files changed, 245 insertions(+), 33 deletions(-) rename client/public/images/pieces/Shogun/{bM.svg => bm.svg} (100%) diff --git a/client/public/images/pieces/Musketeer/bs.svg b/client/public/images/pieces/Musketeer/bs.svg index bba410cc..97dc32d8 100644 --- a/client/public/images/pieces/Musketeer/bs.svg +++ b/client/public/images/pieces/Musketeer/bs.svg @@ -42,11 +42,12 @@ showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg12" /> + inkscape:current-layer="svg12" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1588 793q-83 30-233 49t-333 20q-178 0-326-18t-233-49l50-91q84 25 218 36t293 11q159 0 294-11t219-37l51 90zm226 668q-57 0-97 39t-40 97q0 56 40 96t97 41q56 0 96-40t40-97q0-57-40-96t-96-40zm-1578 0q-57 0-96 39t-40 97q0 56 39 96t97 41q57 0 97-40t40-97q0-57-40-96t-97-40zm1208 110q-57 0-96 39t-40 97q0 56 39 96t97 40q57 0 97-40t40-96q0-57-40-96t-97-40zm-840 0q-57 0-97 39t-40 97q0 56 40 96t97 40q56 0 96-40t40-96q0-57-40-96t-96-40zm1036-1288q-49-43-220-72t-394-29q-227 0-399 30t-217 75l63 240-28 157-88 153-85 622 49 19 274-462 6 550 68 12 209-553 112 595h69l112-593 207 551 69-12 6-550 275 463 47-22-83-619-89-153-28-159 65-243zm-96 32l-30 118q-195 45-490 45-292 0-488-45l-32-119q190 58 521 58 159 0 295-16t224-41zm-26 299q-184 51-490 51-308 0-496-52l15-101q189 49 481 49 291 0 474-48l16 101zm-494 1007q-57 0-96 40t-40 97q0 56 39 96t97 40q56 0 96-40t41-96q0-57-40-97t-97-40z" diff --git a/client/public/images/pieces/Musketeer/bu.svg b/client/public/images/pieces/Musketeer/bu.svg index c1205e41..96635de2 100644 --- a/client/public/images/pieces/Musketeer/bu.svg +++ b/client/public/images/pieces/Musketeer/bu.svg @@ -42,11 +42,12 @@ showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg16" /> + inkscape:current-layer="svg16" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1161 1706h170v137h274v-375l-222-171v-478l170-170v-205h153v-239h-1365v239h153v205l171 170v478l-222 171v375h273v-137h171v137h274v-137zm-597-1246v-102h920v102h-920zm460 1092h-512v-46l73-55h879l71 55v46h-511zm0-169h-350l60-47v-57h580v57l60 47h-350zm0-546h-290v-46l-60-58h700l-60 58v46h-290zm0-172h-414l-46-43v-58h920v58l-46 43h-414z" diff --git a/client/public/images/pieces/Musketeer/wa.svg b/client/public/images/pieces/Musketeer/wa.svg index 38f87a2e..217967cb 100644 --- a/client/public/images/pieces/Musketeer/wa.svg +++ b/client/public/images/pieces/Musketeer/wa.svg @@ -36,17 +36,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="960" + inkscape:window-width="1920" inkscape:window-height="1060" id="namedview20" showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg18" /> + inkscape:current-layer="svg18" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1024 1166q97 0 186 15 98-35 142-109 38-64 38-141 0-46-23-101t-75-101q-59-49-129-107t-139-137q-70 78-140 136t-128 108q-53 45-75 100t-23 102q0 77 37 141 43 74 143 109 88-15 186-15z" @@ -116,4 +117,28 @@ style="fill:#ffdead;stroke:#000000;stroke-width:2.31937" d="m 995.40254,394.00644 c -26.12366,-8.02606 -40.8928,-35.66102 -37.93213,-70.97588 1.91867,-22.88591 10.64017,-39.89904 25.00694,-48.78133 14.44433,-8.93024 36.53765,-12.26115 57.67655,-8.69561 34.1236,5.75568 49.8149,25.43702 49.9018,62.59114 0.025,10.86806 -1.4575,24.94429 -3.2954,31.28051 -4.5665,15.74354 -18.8811,29.88667 -35.1343,34.71333 -15.1468,4.49813 -41.353,4.43654 -56.22346,-0.13216 z" id="path48" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 830.33295,1173.8349 c -14.50155,-4.517 -50.74836,-23.9825 -67.91383,-36.4715 -64.99184,-47.2858 -98.8542,-115.5356 -98.82383,-199.17997 0.017,-46.69806 8.10386,-81.66526 28.16112,-121.7667 20.17936,-40.34558 39.64304,-61.43727 116.54257,-126.29069 91.17009,-76.88854 108.88597,-92.75085 161.71808,-144.79797 l 53.86864,-53.06828 33.1081,34.32349 c 40.6262,42.11758 80.3414,78.12294 167.4693,151.82609 36.9047,31.21841 74.5756,64.08223 83.713,73.03072 33.3252,32.63628 60.6255,82.66841 72.1562,132.23824 6.5114,27.99185 5.8614,80.72145 -1.3581,110.16988 -11.2277,45.79839 -32.5968,85.33349 -62.7341,116.06489 -23.095,23.5502 -47.1818,40.2927 -80.7436,56.1237 l -24.1857,11.4083 -35.0914,-5.2012 c -31.1579,-4.6182 -46.5729,-5.3097 -137.5176,-6.1689 -93.10868,-0.8796 -106.50654,-0.5166 -147.27977,3.9907 -24.66944,2.727 -46.41909,5.3409 -48.33256,5.8086 -1.91348,0.4677 -7.65391,-0.45 -12.75652,-2.0394 z m 217.05135,-149.23 c 3.294,-1.9056 7.2831,-5.5367 8.8646,-8.0692 3.9508,-6.3261 7.0897,-38.88685 7.1391,-74.05525 l 0.041,-29.33378 46.9672,-1.03099 c 50.9811,-1.11909 60.1866,-2.95689 65.2826,-13.03309 8.9819,-17.75976 7.0138,-38.4161 -4.9185,-51.62377 l -8.1383,-9.00812 h -49.5965 -49.5965 l -0.063,-30.7316 c -0.096,-47.05422 -3.1577,-72.99097 -9.3999,-79.63545 -7.2903,-7.76019 -18.837,-10.8983 -36.0641,-9.80135 -13.0141,0.82867 -15.8517,1.88532 -22.25257,8.28616 -9.12556,9.12554 -10.61107,19.06632 -10.88334,72.83017 l -0.19571,38.64671 -48.23476,0.78251 c -54.26329,0.88034 -58.1016,1.93442 -64.7196,17.77353 -4.11157,9.84038 -3.12725,33.6817 1.71042,41.42803 7.4349,11.90517 14.0533,13.38031 64.04253,14.27403 l 46.7329,0.83548 0.95695,46.7329 c 0.6695,32.69596 1.8922,48.63898 4.07076,53.07868 3.37229,6.8724 11.24842,12.883 20.75332,15.8378 8.1344,2.5287 30.1421,0.074 37.501,-4.1834 z" + id="path283" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1003.1257,393.42714 c -28.12784,-6.18417 -42.89401,-27.90138 -42.89718,-63.09063 -0.002,-17.54925 0.81999,-21.49455 6.98719,-33.55355 8.61691,-16.84902 21.4716,-25.62997 42.47129,-29.01188 30.197,-4.86308 60.5209,6.58204 70.9759,26.78834 5.652,10.92355 7.9452,47.81901 3.9019,62.77696 -3.3429,12.36653 -14.3103,25.04633 -26.9611,31.17046 -11.4354,5.53582 -39.9605,8.11211 -54.478,4.9203 z" + id="path285" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 805.97961,1362.6646 c 0,-1.2551 9.51914,-26.7708 21.15364,-56.7015 19.32163,-49.7065 21.68182,-54.5281 27.25255,-55.6747 41.34874,-8.5107 136.49593,-12.9459 222.1883,-10.3571 48.9594,1.4791 106.5579,7.0545 118.0611,11.428 3.7243,1.416 9.7787,14.5773 26.1692,56.8878 11.7281,30.275 20.8418,55.5276 20.2526,56.1167 -0.5892,0.5892 -13.9208,-1.076 -29.6258,-3.7004 -120.5678,-20.1478 -263.68969,-19.8817 -379.93856,0.7063 -23.48323,4.159 -25.51303,4.262 -25.51303,1.2949 z" + id="path287" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 981.09173,1483.0896 c -15.30781,-1.1733 -40.05979,-3.7143 -55.0044,-5.6466 -54.50823,-7.0479 -143.19522,-25.4985 -139.46083,-29.0137 2.57842,-2.4271 70.46533,-15.3371 97.05187,-18.4563 66.56373,-7.8094 190.86163,-9.6453 247.01243,-3.6484 48.0151,5.1279 112.7201,15.716 131.0442,21.4434 6.131,1.9163 -14.4238,7.2047 -74.2197,19.0957 -74.4638,14.8078 -148.747,20.6468 -206.42357,16.2259 z" + id="path289" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1251.9907,1760.2669 c -27.4161,-3.9983 -60.1176,-14.9456 -80.711,-27.0193 -20.7982,-12.1937 -59.373,-50.4554 -74.8348,-74.2275 -6.3968,-9.8347 -14.8456,-25.6044 -18.7752,-35.0438 -7.4128,-17.8064 -14.2405,-50.4024 -14.2405,-67.9857 v -10.1333 h 12.6399 12.6399 l 16.1983,23.7735 c 31.1688,45.7448 59.6983,71.9604 100.7214,92.5522 63.9811,32.1156 92.0228,34.0406 211.5038,14.5194 26.7887,-4.3768 65.8875,-12.236 86.8863,-17.4648 l 38.1797,-9.5068 58.074,1.1487 c 47.1944,0.9335 62.2019,2.0552 80.108,5.9872 24.4792,5.3753 56.9663,15.8622 70.2479,22.6761 l 8.6725,4.4493 -21.1184,34.7242 c -11.6151,19.0983 -21.4843,35.099 -21.9314,35.5571 -0.4472,0.4581 -3.7843,-1.2829 -7.4158,-3.8687 -13.5839,-9.6726 -66.6447,-19.4985 -106.1535,-19.6577 -22.202,-0.089 -47.7735,2.7548 -126.4055,14.0598 -140.0816,20.1396 -175.4714,22.579 -224.2856,15.4601 z" + id="path291" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 699.28879,1762.3964 c -5.74044,-0.5516 -46.44531,-6.1728 -90.45527,-12.4916 -126.00894,-18.0919 -156.11567,-21.4082 -178.59117,-19.6721 -25.82425,1.9948 -71.16763,11.3288 -85.97205,17.6974 -10.02715,4.3136 -12.18275,4.5759 -14.79734,1.8007 -1.68323,-1.7866 -11.54152,-17.3151 -21.90732,-34.5078 l -18.84691,-31.2594 11.01583,-5.5984 c 15.56446,-7.9101 39.89599,-15.8778 65.56555,-21.4704 17.76655,-3.8708 33.26403,-5.0294 80.01812,-5.982 l 57.98414,-1.1813 34.79049,8.2811 c 39.90882,9.4995 80.08425,17.0468 138.00227,25.9248 71.91627,11.0237 108.34221,6.1923 165.83465,-21.9957 42.56456,-20.869 68.24305,-44.7576 101.63464,-94.5501 l 14.33365,-21.3739 13.57175,-0.08 13.57175,-0.08 -1.65408,16.8154 c -2.32721,23.6582 -11.02175,56.4834 -19.24598,72.661 -11.23889,22.1075 -29.9815,46.9929 -52.50312,69.7108 -16.61232,16.7571 -24.88009,23.1119 -39.55685,30.4042 -21.8796,10.8712 -42.2896,17.8675 -66.16817,22.6814 -17.16152,3.4598 -86.24833,6.2241 -106.62458,4.2663 z" + id="path293" /> </svg> diff --git a/client/public/images/pieces/Musketeer/wj.svg b/client/public/images/pieces/Musketeer/wj.svg index 97e92bbf..a4e13ee1 100644 --- a/client/public/images/pieces/Musketeer/wj.svg +++ b/client/public/images/pieces/Musketeer/wj.svg @@ -42,11 +42,12 @@ showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg18" /> + inkscape:current-layer="svg18" + inkscape:document-rotation="0" /> <path style="color:black;" d="m524 583q190 48 504 48 308 0 497-46l25 147q-201 53-526 53-327 0-525-54l25-148zm-61-61l-33 187q-1 0-3 4-5 7-28 18t-55 40q-44 37-68 60t-45 50q-61 84-68 203-10 115 93 229 104 114 281 107 66-4 155-32 29-12 59-23t61-24q16-8 28-16-5 21-5 42 0 78 55 133t134 56q78 0 133-55t55-133q0-16-4-42 14 9 27 15 46 20 121 47 86 29 155 33 177 8 280-107 101-114 94-229-8-119-69-203-20-27-45-50t-67-60q-33-28-56-39t-27-19q-1-2-2-3t-1-2l-32-188 66-247q-50-45-224-74t-402-29q-232 0-408 30t-221 77l66 244zm1081-117l-30 115q-198 44-490 44-291 0-489-44l-32-116q191 56 522 56 329 0 519-55zm26-94q-193 78-542 78-362 0-548-80 176-70 545-70 176 0 321 19t224 53zm-581 542q-1 39-3 77t-15 86q-41 134-124 216-43 42-132 78-102 40-193 40-158 0-234-113-43-60-43-150 0-98 48-161 29-37 74-74t84-67q175 63 538 68zm35 186q7 28 12 39 10 39 23 66 6 17 17 39t25 52q8 17 17 41t18 49q8 20 8 43 0 49-35 83t-85 35q-119 0-119-119 0-23 8-43 22-65 34-90 13-29 24-51t19-40q13-33 22-66 2-6 12-38zm34-186q172-2 315-20t224-47q38 30 83 66t75 75q48 61 48 161 0 90-43 150-77 112-234 112-94 0-193-39-87-35-132-78-84-84-124-216-14-47-16-85t-3-79zm1 706h-71v131h-83q-34 0-34 33v1q0 33 34 33h83v85q0 35 36 35 35 0 35-35v-85h86q33 0 33-33v-1q0-33-33-33l-85-1-1-130z" @@ -114,4 +115,28 @@ style="fill:#ffdead;stroke:#000000;stroke-width:2.31937" d="m 890.63647,1805.4384 c -133.02127,-5.7267 -258.59254,-21.7784 -335.14836,-42.8418 -29.63803,-8.1546 -71.91532,-22.8141 -70.23645,-24.3543 3.75298,-3.443 55.60995,-21.0938 88.33121,-30.0656 107.23293,-29.4022 232.09683,-44.0616 406.34918,-47.7064 198.70915,-4.1564 383.26585,14.3027 511.03615,51.1133 32.7897,9.4467 75.7634,23.9794 75.7634,25.6214 0,2.1977 -45.8972,16.8522 -80.0181,25.5489 -86.5519,22.0603 -202.3468,36.5496 -342.1065,42.8074 -58.9587,2.6399 -191.28255,2.5758 -253.97053,-0.1229 z" id="path36" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 417.13792,1231.296 c -105.11415,-82.7829 -140.79134,-125.2272 -158.24287,-188.2578 -9.95248,-35.9459 -12.15925,-99.93767 -4.85568,-140.80494 8.38473,-46.91692 33.69285,-93.01263 70.29629,-128.03628 42.33873,-40.51141 91.21543,-62.39637 156.8719,-70.24072 73.90096,-8.82936 168.02908,8.85439 256.8786,48.25952 51.68034,22.92045 82.86422,43.67171 114.49037,76.18744 69.47343,71.42757 119.62234,183.46878 129.59215,289.53108 2.79178,29.6999 3.18477,73.0491 0.66258,73.0842 -0.95674,0.014 -39.31325,1.581 -85.2367,3.4837 -199.83707,8.2797 -312.0282,24.2093 -442.1871,62.7849 -2.44112,0.7234 -16.29962,-8.6887 -38.26954,-25.9911 z" + id="path271" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1015.1376,970.05847 c -9.9635,-33.73002 -27.93345,-79.03619 -50.36031,-126.96904 -19.34572,-41.34752 -38.70677,-89.44064 -48.36806,-120.14691 -4.96973,-15.79517 -6.052,-23.71256 -6.02387,-44.06795 0.0753,-54.52732 14.24945,-81.67848 52.54665,-100.65549 19.67192,-9.74782 20.03263,-9.82602 49.57519,-10.74648 25.38,-0.79076 32.125,-0.20857 45.8375,3.95648 51.7927,15.73156 85.0036,63.94023 80.892,117.42253 -1.975,25.69187 -20.9246,77.66931 -55.176,151.34427 -24.0972,51.83331 -39.5732,90.42257 -51.6218,128.71915 -4.7158,14.9889 -8.8046,27.24524 -9.0863,27.23631 -0.2818,-0.009 -3.9785,-11.75072 -8.215,-26.09287 z" + id="path273" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1572.53,1251.0333 c -42.7708,-13.833 -115.9529,-28.2636 -192.5073,-37.96 -78.5861,-9.9537 -147.023,-15.2411 -257.4302,-19.8889 -33.1563,-1.3958 -60.7361,-2.9898 -61.2886,-3.5423 -0.5525,-0.5525 0.7611,-25.2625 2.9191,-54.9111 4.0177,-55.2003 8.3515,-79.6154 20.8906,-117.6891 27.267,-82.79395 76.6527,-162.22952 129.0744,-207.61244 20.2389,-17.52136 40.4283,-30.5767 70.8839,-45.83654 85.4876,-42.83372 156.3388,-60.57815 242.2305,-60.66584 58.999,-0.0602 94.8796,7.53399 137.7649,29.15833 24.5797,12.39396 35.9033,20.40937 56.6083,40.07023 29.0557,27.5904 49.0291,57.017 61.1179,90.04417 9.8097,26.80058 13.3482,46.57766 15.0475,84.1014 4.4889,99.12339 -21.9256,159.28929 -100.1967,228.22429 -32.1667,28.3297 -100.6145,83.8841 -102.8729,83.4947 -0.7519,-0.1297 -10.7605,-3.2738 -22.2414,-6.9869 z" + id="path275" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 526.54804,1457.3015 c -1.01913,-2.8739 -17.69496,-104.0354 -21.01245,-127.469 l -1.52342,-10.7609 25.15813,-5.9898 c 145.32543,-34.6002 298.77844,-47.3921 537.738,-44.8258 190.73,2.0483 298.375,11.6124 424.4439,37.7112 49.5635,10.2606 50.9344,10.752 51.6803,18.5284 0.646,6.7338 -19.0498,130.3605 -21.0943,132.405 -0.5806,0.5806 -20.2245,-2.5777 -43.6532,-7.0185 -137.7499,-26.1098 -250.1398,-34.6722 -456.6044,-34.7866 -152.8063,-0.085 -254.3307,5.7607 -359.50167,20.6985 -35.87517,5.0955 -119.46395,20.0537 -130.47575,23.3487 -2.23867,0.6698 -4.55849,-0.1587 -5.15514,-1.8412 z" + id="path277" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 509.10079,1637.0711 c 0,-1.0303 6.44754,-25.4782 14.32788,-54.3286 l 14.32788,-52.4551 14.08435,-2.7075 c 97.94195,-18.8279 175.90088,-28.3312 291.24857,-35.5039 60.51172,-3.7627 312.05963,-3.6592 368.77913,0.1518 112.7194,7.5737 245.3073,24.3589 286.9714,36.3296 14.0052,4.0239 11.4502,-1.8756 29.4564,68.0134 l 10.3767,40.2764 -6.2652,-1.3154 c -3.4458,-0.7235 -26.0175,-5.6008 -50.1592,-10.8384 -66.0977,-14.3402 -115.5628,-21.4784 -219.354,-31.6546 -50.1275,-4.9147 -361.65604,-7.2592 -425.60365,-3.203 -122.09354,7.7444 -255.28747,27.4285 -324.13137,47.9016 -2.23239,0.6639 -4.05889,0.3641 -4.05889,-0.6663 z" + id="path279" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 918.46886,1804.0679 c -122.29056,-3.5409 -264.15213,-19.7468 -344.42583,-39.3463 -29.45286,-7.1912 -81.1778,-24.0709 -81.1778,-26.4913 0,-2.601 66.47165,-23.9567 103.40188,-33.2205 80.00299,-20.0685 166.81771,-31.8795 286.25158,-38.9442 63.16579,-3.7363 242.48191,-3.7164 295.71911,0.033 150.0963,10.5705 244.4379,26.4594 342.9309,57.7558 l 41.4134,13.1592 -22.8584,7.6941 c -132.1252,44.4732 -365.4509,66.7673 -621.25484,59.3604 z" + id="path281" /> </svg> diff --git a/client/public/images/pieces/Musketeer/wm.svg b/client/public/images/pieces/Musketeer/wm.svg index 7f087be0..a153b120 100644 --- a/client/public/images/pieces/Musketeer/wm.svg +++ b/client/public/images/pieces/Musketeer/wm.svg @@ -36,17 +36,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" + inkscape:window-width="960" inkscape:window-height="1060" id="namedview8" showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg6" /> + inkscape:current-layer="svg6" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1756 1774q-1 0 2-54t3-118q1-125 0-258t-36-267q-34-128-75-218t-89-157q-72-108-196-183t-259-98q9 49 8 96-2 36-34 36-37 0-33-36 3-132-94-226-76 80-82 186-2 35-36 31-32-1-32-37 0 0 2-8-41 13-86 37-29 20-47-10t16-47q43-22 65-33-86-88-196-142 12 139 76 263 17 26-8 46-28 22-47-7-7-10-20-36-21 21-28 31-7 9-24 40t-26 51q-9 25-8 40t3 35q-9 59-40 111t-81 127q-47 72-72 108t-38 92q-9 34 0 82t39 76q46 47 89 43 14 0 37-11t37-42q26-57 43-57 25 0 27 28 0 6-16 50-9 20-24 42-19 26-17 22 16 57 53 20 11-11 25-41t44-81q35-59 75-96t71-60q18-13 44-30t70-35q35-14 77-34t76-53q46-45 71-111 13-37 10-91-9-34 34-34 32 0 36 33 0 113-64 206 21 64 11 140-9 61-42 130t-136 155q-207 172-196 354 0 0 170 0t321 0h547z" @@ -66,4 +67,8 @@ style="fill:#ffdead;stroke:#000000;stroke-width:2.31937" d="m 718.84132,1770.5735 c -2.56462,-4.1496 1.1986,-49.9663 6.11049,-74.3944 11.48888,-57.1374 41.08721,-115.8949 86.82195,-172.3558 24.77804,-30.5892 56.85571,-62.4674 107.85478,-107.1841 63.39692,-55.5873 89.68046,-83.5791 115.10956,-122.5908 26.4423,-40.566 51.845,-110.549 58.7258,-161.7859 5.0893,-37.8973 1.5831,-94.7107 -7.7322,-125.2886 l -3.4204,-11.22767 7.9164,-12.37528 c 20.8749,-32.63269 40.5872,-81.36467 48.3471,-119.52153 1.9585,-9.63029 4.6818,-29.55401 6.0517,-44.27498 3.5685,-38.34649 -0.5238,-52.97107 -17.0117,-60.79513 -15.2978,-7.25931 -43.5558,-3.32174 -51.7847,7.21585 -2.3976,3.07026 -2.8124,9.29943 -1.7358,26.06826 2.8888,44.99716 -5.552,83.90684 -27.1889,125.33338 -14.9158,28.55819 -30.7181,49.82953 -54.42071,73.25515 -31.50968,31.14145 -64.24611,50.29855 -140.82554,82.40965 -58.91773,24.7053 -97.86033,47.5615 -144.25258,84.6647 -78.43309,62.7286 -112.29161,106.2782 -168.32044,216.4979 -13.3592,26.2802 -19.98472,36.5458 -30.31313,46.9672 -10.91972,11.0181 -14.58524,13.3363 -21.0867,13.3363 -9.25617,0 -17.92993,-7.9604 -23.54276,-21.6066 l -3.64014,-8.8501 12.41761,-17.8226 c 18.35678,-26.3469 25.9132,-40.9047 35.20785,-67.8297 12.34341,-35.7568 9.6545,-51.5333 -9.88207,-57.981 -16.74775,-5.5272 -28.62984,5.8932 -49.30018,47.3849 -15.91599,31.9482 -24.10634,41.1514 -46.1372,51.8429 -15.97898,7.7545 -19.68797,8.6379 -36.34961,8.6575 -16.1456,0.018 -20.64104,-0.9608 -34.62062,-7.5456 -19.30608,-9.0938 -44.31998,-28.813 -57.42909,-45.2732 -21.37841,-26.8434 -32.6282,-63.5775 -32.80374,-107.1146 -0.10366,-25.7112 1.87942,-36.6966 12.77002,-70.7407 8.42765,-26.3448 19.63997,-45.6267 74.85286,-128.7248 56.10526,-84.44115 98.95063,-151.58241 113.22569,-177.43146 11.69002,-21.16811 21.92577,-48.02971 28.20767,-74.02516 4.57595,-18.93597 5.20554,-26.35113 4.25045,-50.06091 -0.98065,-24.3443 -0.486,-29.72177 3.94696,-42.90827 9.80247,-29.15907 46.85824,-93.80979 65.71287,-114.64845 l 12.44634,-13.75602 9.8144,17.7793 c 10.39612,18.83314 20.39567,30.48633 28.31776,33.00071 18.00584,5.71482 46.15327,-16.59453 46.15327,-36.5806 0,-3.10943 -5.33027,-16.51998 -11.84507,-29.80123 -38.0045,-77.47716 -59.78879,-152.21988 -70.05018,-240.3449 l -1.13807,-9.77362 14.26413,7.18956 c 34.35064,17.3138 82.35465,48.94793 118.60374,78.15862 17.63469,14.2106 56.85628,51.08812 56.85628,53.45829 0,0.80845 -16.84326,10.26437 -37.42946,21.01313 -39.75154,20.75564 -46.0415,26.33468 -46.05903,40.85321 -0.0209,16.82208 18.30494,38.05449 32.84407,38.05449 3.65957,0 18.11371,-5.74739 32.12034,-12.77197 19.82545,-9.94285 69.46689,-31.3629 72.49595,-31.28168 0.29326,0.008 0.63057,5.04941 0.74955,11.20345 0.44528,23.02885 13.89467,34.04277 39.57383,32.40764 20.23925,-1.28873 25.7426,-6.76241 28.90014,-28.74434 8.84453,-61.5733 13.86243,-80.2427 30.49391,-113.45409 10.84512,-21.65669 22.53305,-39.3534 39.28945,-59.48823 l 12.01763,-14.44067 14.73523,16.09016 c 50.20552,54.82205 77.14722,122.94156 77.14722,195.05963 0,41.98189 6.7087,50.81195 37.2919,49.08383 17.4892,-0.98821 23.7293,-4.73621 29.1301,-17.49636 5.2983,-12.51797 3.5792,-75.87465 -2.8746,-105.94341 l -1.4415,-6.71602 10.1158,1.59661 c 60.926,9.61616 149.6481,41.75652 216.2861,78.35157 133.1705,73.13206 220.9219,167.40865 296.6811,318.74223 51.1841,102.24331 95.3016,239.12926 115.039,356.93866 12.9062,77.0349 12.9771,78.7311 12.9771,310.795 0,118.6356 -0.8913,231.0959 -1.9807,249.9117 l -1.9806,34.2107 h -516.8406 c -377.05888,0 -517.27206,-0.6982 -518.43608,-2.5817 z M 352.63469,1245.653 c 7.09991,-4.652 11.94181,-14.9711 13.79775,-29.4058 1.94729,-15.1453 13.87539,-33.5285 29.83299,-45.9777 20.91885,-16.3197 24.03466,-25.2663 15.17399,-43.57 -6.57931,-13.5911 -18.55774,-21.5217 -32.50637,-21.5217 -9.09212,0 -12.95605,1.5864 -24.39477,10.016 -36.02838,26.5505 -56.49977,64.3176 -56.49977,104.2348 0,16.0593 4.61291,25.3183 14.81638,29.7394 7.35251,3.1857 33.01378,0.9183 39.7798,-3.515 z M 581.12181,816.35437 c 4.82704,-2.49617 9.61618,-9.04632 16.22577,-22.19213 5.15755,-10.25786 10.11274,-18.26355 11.01149,-17.79037 18.68832,9.83854 43.39357,13.47331 60.32956,8.87598 21.05254,-5.71478 37.09659,-28.99268 39.26336,-56.96615 0.98272,-12.68714 -0.5955,-20.52287 -7.2678,-36.08405 -1.1845,-2.76248 2.29821,-5.41704 14.80653,-11.28575 8.99543,-4.22051 18.42337,-10.30277 20.95099,-13.51611 9.39267,-11.94084 3.4768,-40.19493 -10.76867,-51.43101 -27.88184,-21.99176 -125.90225,35.35312 -167.86656,98.20696 -35.98042,53.89123 -39.65003,86.66774 -11.2756,100.71269 11.86908,5.87502 24.99388,6.43276 34.59093,1.46994 z" id="path14" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 743.62502,1769.1024 -24.08506,-0.7552 1.63972,-22.5292 c 5.56497,-76.4611 31.26565,-140.2271 84.33279,-209.2382 26.03474,-33.8569 48.49826,-56.952 105.99829,-108.9786 89.27184,-80.774 115.95964,-111.0579 140.10014,-158.9781 21.44,-42.5596 39.0097,-97.3532 44.2284,-137.9323 4.5433,-35.3271 1.7479,-85.4518 -6.5986,-118.3179 l -4.0501,-15.94834 5.4821,-8.82611 c 10.4988,-16.9028 27.8904,-53.04177 36.0957,-75.00526 12.1009,-32.39084 17.8639,-62.86529 19.2846,-101.97488 1.1258,-30.99294 0.8528,-34.21218 -3.4805,-41.04273 -6.5966,-10.39814 -14.2117,-14.72039 -28.5174,-16.18614 -14.1473,-1.44951 -29.1635,1.9382 -37.07,8.36315 -5.1977,4.22382 -5.4072,5.55221 -4.7384,30.05358 1.2307,45.08492 -6.6528,81.88936 -25.6367,119.68614 -14.4876,28.84491 -30.8754,51.50752 -53.76553,74.35251 -32.69452,32.62998 -60.98513,49.71298 -136.72898,82.56248 -87.48857,37.9431 -145.90683,76.7199 -205.56025,136.4464 -41.10266,41.1531 -63.55187,73.8007 -107.20101,155.9009 -18.27046,34.3651 -26.80271,47.883 -36.68254,58.1174 -7.50864,7.7781 -14.87156,13.3363 -17.66635,13.3363 -6.73068,0 -16.36227,-8.1839 -21.51243,-18.2791 l -4.36861,-8.5631 15.75211,-23.5787 c 24.15977,-36.1637 42.15058,-84.3319 38.58894,-103.3171 -2.75091,-14.6636 -19.18867,-24.6794 -33.01469,-20.1164 -10.75687,3.5501 -20.67308,16.0255 -36.53913,45.9693 -17.54289,33.1085 -25.48654,42.1763 -45.8891,52.3833 -14.815,7.4116 -18.36404,8.2401 -35.29442,8.2384 -16.07271,0 -20.95957,-1.0125 -33.44419,-6.9187 -28.55853,-13.5104 -57.70289,-40.5484 -70.03037,-64.969 -13.95857,-27.6518 -17.40068,-44.1709 -17.40068,-83.508 0,-31.2861 0.72404,-38.3574 5.58091,-54.5051 11.94859,-39.7256 17.03428,-48.7555 90.78589,-161.19589 87.79606,-133.85229 106.89233,-165.66854 119.02414,-198.30578 11.95675,-32.16633 15.38596,-50.76493 15.38596,-83.44721 0,-21.20123 1.13433,-34.36579 3.71518,-43.1171 8.27858,-28.07138 52.48834,-104.64009 69.96309,-121.17195 l 6.89422,-6.52224 7.59743,13.48034 c 15.91403,28.23663 26.38395,37.10352 41.00899,34.7302 16.7955,-2.72553 34.52093,-19.24213 36.99193,-34.46914 1.0067,-6.20346 -1.26289,-13.43142 -10.80984,-34.42625 C 591.58465,431.74176 574.8061,375.58582 562.8609,289.2296 c -2.39003,-17.27835 -4.78079,-17.45224 29.35098,2.13475 47.81249,27.43787 95.1877,62.40095 129.84974,95.82961 25.06661,24.17469 26.21322,20.07153 -11.17601,39.99421 -43.65897,23.2635 -50.86891,30.5799 -47.93732,48.6452 2.71521,16.73187 20.38395,35.55627 33.39388,35.57808 2.84415,0.005 15.89058,-4.80626 28.99207,-10.69117 55.01564,-24.71186 69.88662,-31.04874 72.86307,-31.04874 2.15072,0 3.14631,3.11328 3.15225,9.8573 0.0186,21.14496 17.36435,33.85912 42.63516,31.25095 14.49696,-1.49622 20.9152,-4.91615 24.66293,-13.14152 1.48205,-3.25275 5.21486,-21.05215 8.29516,-39.55423 3.08028,-18.50207 7.25213,-39.38057 9.27072,-46.39665 8.76641,-30.46937 28.57549,-67.28883 52.4288,-97.45026 l 14.30033,-18.08211 10.59549,11.68421 c 50.75615,55.97151 78.95005,125.47896 79.00305,194.76911 0.019,24.18616 3.5851,39.47433 10.7828,46.22127 5.2059,4.87983 7.9975,5.48727 24.8011,5.39663 21.6292,-0.11666 29.2621,-3.59731 34.3561,-15.66664 3.7588,-8.9059 3.8163,-81.84079 0.079,-100.19768 -1.2983,-6.37725 -1.9867,-11.96893 -1.5297,-12.42596 2.1968,-2.19678 52.9573,10.76029 89.2414,22.77969 237.2662,78.59621 381.5753,228.16638 480.1241,497.6277 35.7198,97.66825 63.6303,214.77525 71.8516,301.47545 2.6816,28.2785 3.4752,468.6076 0.906,502.6414 l -1.5381,20.3756 -491.9526,-0.4892 c -270.57396,-0.269 -502.7909,-0.8289 -516.03768,-1.2442 z M 341.93804,1251.1173 c 14.85363,-3.1856 22.07487,-11.4117 25.78063,-29.3682 4.16674,-20.1902 10.3061,-30.2318 30.14761,-49.3097 19.76706,-19.0063 22.88073,-25.5884 18.70226,-39.5348 -7.22616,-24.1188 -30.56153,-35.8531 -52.81155,-26.5564 -12.20121,5.098 -44.78128,39.0777 -53.56854,55.8699 -8.65007,16.53 -14.38669,38.8259 -14.43503,56.1033 -0.0826,29.5039 14.21012,39.6532 46.18462,32.7959 z m 237.84658,-432.208 c 6.07665,-2.53899 10.22903,-7.38467 17.90061,-20.88946 8.22141,-14.4727 10.80929,-17.3656 14.62734,-16.35125 2.5513,0.67781 10.3375,2.77208 17.3027,4.6539 24.61642,6.65083 43.65216,3.42079 58.40882,-9.91095 11.73307,-10.60013 17.24196,-21.39842 20.81807,-40.80669 2.42984,-13.18722 2.28274,-17.31655 -1.04293,-29.27833 -2.12943,-7.6592 -3.87171,-14.37362 -3.87171,-14.92092 0,-0.54728 6.55021,-4.65817 14.55604,-9.13529 8.00582,-4.47709 16.444,-10.22636 18.75149,-12.77611 9.76613,-10.79145 6.56485,-36.62861 -6.27423,-50.63846 -13.40026,-14.62221 -35.87303,-12.72402 -73.26833,6.1887 -51.61401,26.10386 -95.901,70.11614 -119.808,119.06483 -10.69842,21.90462 -14.00101,36.00342 -11.52514,49.20089 3.97247,21.17516 31.94027,34.57615 53.42527,25.59914 z" + id="path269" /> </svg> diff --git a/client/public/images/pieces/Musketeer/ws.svg b/client/public/images/pieces/Musketeer/ws.svg index a2b8cdc4..7facb419 100644 --- a/client/public/images/pieces/Musketeer/ws.svg +++ b/client/public/images/pieces/Musketeer/ws.svg @@ -36,17 +36,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" + inkscape:window-width="960" inkscape:window-height="1060" id="namedview36" showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg34" /> + inkscape:current-layer="svg34" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1024 1621q-57 0-96 40t-40 97q0 56 39 96t97 40q56 0 96-40t41-96q0-57-40-97t-97-40zm0 70q67 0 67 67 0 66-67 66-66 0-66-66 0-67 66-67zm509-1007q-193 49-505 49-320 0-511-50l15-96q195 46 496 46 299 0 488-45l17 96zm25 60 65 115q-48-19-98-19-134 0-214 109-60-50-134-50-96 0-153 75-64-70-153-70-72 0-132 49-84-107-217-107-51 0-101 19l70-120q194 56 533 56 345 0 534-57zm-448 239-85 489-85-483q3 2 14 10 23 45 70 45 51 0 66-45 6-6 20-16zm277-19v463l-165-454q19 7 32 18 20 25 54 25 40 0 64-35 3-4 7-8t8-9zm-562 14-164 449v-457q3 4 9 10 20 42 66 42 38 0 62-32 27-12 27-12zm-254-56-215 371 55-338q57-40 111-40 21 0 49 7zm903-5q23-7 51-7 61 0 114 38l55 346-220-377zm60-506-30 113q-196 43-480 43-281 0-479-43l-31-114q186 56 511 56 317 0 509-55zm106-128q-49-43-220-72t-394-29q-227 0-399 30t-217 75l63 240-28 157-88 153-85 622 49 19 274-462 6 550 68 12 209-553 112 595h69l112-593 207 551 69-12 6-550 275 463 47-22-83-619-89-153-28-159 65-243zm-81 36q-183 76-531 76-355 0-537-78 175-69 534-69 172 0 314 19t220 52zm-955 1252q-57 0-97 39t-40 97q0 56 40 96t97 40q56 0 96-40t40-96q0-57-40-96t-96-40zm0 70q66 0 66 66t-66 66q-67 0-67-66t67-66zm840 0q67 0 67 66t-67 66q-66 0-66-66t66-66zm0-70q-57 0-96 39t-40 97q0 56 39 96t97 40q57 0 97-40t40-96q0-57-40-96t-97-40zm-1208-110q-57 0-96 39t-40 97q0 56 39 96t97 41q57 0 97-40t40-97-40-96-97-40zm0 70q67 0 67 66 0 67-67 67-66 0-66-67 0-66 66-66zm1578 0q66 0 66 66 0 67-66 67-67 0-67-67 0-66 67-66zm0-70q-57 0-97 39t-40 97q0 56 40 96t97 41q56 0 96-40t40-97-40-96-96-40z" @@ -186,4 +187,60 @@ style="fill:#ffdead;stroke:#000000;stroke-width:2.31937" d="m 904.55266,1797.0338 c -109.22626,-3.5609 -239.61617,-19.0316 -317.72142,-37.6975 -25.02575,-5.9807 -84.6614,-24.0715 -90.21089,-27.366 -4.84525,-2.8764 63.05715,-25.9802 109.89381,-37.3914 112.60217,-27.4343 242.78787,-39.6774 422.12454,-39.6981 201.3376,-0.023 345.7735,16.2503 466.1528,52.5213 29.8659,8.9988 58.0239,19.5691 58.0239,21.7819 0,2.7513 -52.8837,19.679 -86.7148,27.757 -82.957,19.8077 -191.6331,33.2607 -318.0145,39.3669 -43.4273,2.0982 -188.20193,2.5297 -243.53344,0.7259 z" id="path68" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 210.32615,509.48129 c -26.61734,-9.52268 -36.11132,-26.51171 -34.85893,-62.37839 0.72954,-20.89306 1.46233,-24.10553 7.8577,-34.44727 9.83407,-15.90236 22.22022,-22.3574 45.48431,-23.70414 47.19845,-2.73228 69.1568,16.30889 69.20661,60.01242 0.0287,25.19583 -4.43063,38.7792 -16.23087,49.44001 -10.30382,9.30888 -20.14923,12.58695 -42.8903,14.28054 -12.43165,0.92581 -19.12511,0.17532 -28.56852,-3.20317 z" + id="path239" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 575.47055,398.99512 c -12.3285,-4.3941 -26.03916,-18.41317 -30.33321,-31.01553 -1.96099,-5.75517 -3.56543,-17.97466 -3.56543,-27.15442 0,-40.63864 20.93085,-61.34163 62.01678,-61.34163 20.62243,0 33.59005,3.8071 44.35586,13.02224 12.56105,10.75178 17.72362,24.9002 17.6755,48.44095 -0.0645,31.52967 -9.59659,48.081 -32.66011,56.71017 -15.05914,5.63435 -43.57352,6.2981 -57.48939,1.33822 z" + id="path241" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 998.51895,349.31243 c -23.40541,-8.35962 -37.14183,-30.34425 -37.14183,-59.44409 0,-38.50114 22.26693,-61.33794 59.85628,-61.38819 25.621,-0.0343 36.7726,3.61074 49.2644,16.10245 7.5695,7.5695 11.4688,13.8245 13.4005,21.49618 6.0084,23.86131 1.4576,54.99204 -10.0356,68.65091 -13.4601,15.99637 -51.0278,23.26759 -75.34375,14.58274 z" + id="path243" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1412.2223,396.83844 c -19.7739,-9.20723 -31.04,-29.49338 -31.04,-55.89171 0,-38.82592 22.206,-61.39116 60.4624,-61.44053 44.2253,-0.0571 64.8065,19.76739 64.7705,62.38899 -0.017,20.07969 -3.2561,30.96085 -12.2734,41.23105 -11.8046,13.44464 -26.9637,19.23837 -50.3366,19.23837 -15.9029,0 -22.0093,-1.06846 -31.5829,-5.52617 z" + id="path245" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1793.3742,511.31759 c -29.199,-7.24124 -41.2581,-24.99336 -41.315,-60.81973 -0.03,-18.71996 0.7302,-22.68569 6.5146,-33.99634 11.1259,-21.75497 27.6111,-29.15851 61.3529,-27.55376 17.268,0.82125 21.6603,1.92121 31.1845,7.80957 19.3049,11.93532 29.5586,41.45059 24.0779,69.30843 -6.1694,31.35811 -20.9587,43.62554 -55.6466,46.15768 -9.5674,0.6984 -21.3431,0.29077 -26.1683,-0.90585 z" + id="path247" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1499.6868,1132.7238 c -8.1725,-1.0072 -15.8182,-2.7905 -16.9905,-3.9627 -1.2955,-1.2956 27.817,-53.4051 74.2399,-132.88454 103.9341,-177.94277 128.83,-220.07496 129.5918,-219.31311 0.3575,0.35748 -1.9231,16.25485 -5.0679,35.3275 -3.1448,19.07264 -12.4978,77.46983 -20.7843,129.77153 -8.2866,52.3017 -17.8069,109.49172 -21.1563,127.08892 l -6.0897,31.995 -11.895,6.0293 c -46.5694,23.6051 -81.1352,30.966 -121.848,25.9481 z" + id="path249" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1375.3839,1065.276 c -9.2652,-12.4354 -23.3392,-23.8007 -37.2946,-30.1169 -8.7475,-3.9591 -15.7444,-5.1651 -29.967,-5.1651 -22.5541,0 -31.6146,3.731 -57.9841,23.8765 -10.2052,7.7965 -19.2934,14.1803 -20.1958,14.1864 -1.9311,0.013 -0.925,-2.8089 85.5838,-240.04335 l 66.8158,-183.2299 0.6029,108.60585 c 0.3316,59.73322 0.3316,156.44525 0,214.9156 l -0.6029,106.3098 z" + id="path251" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 1096.3674,1048.247 c -2.9198,-3.7685 -8.6551,-12.04 -12.7452,-18.381 -14.2673,-22.1196 -40.3644,-31.41229 -74.6981,-26.5986 -20.10851,2.8193 -36.70715,13.3743 -50.67156,32.222 -5.84657,7.891 -9.79773,11.5165 -10.22096,9.3784 -0.61313,-3.0975 30.61758,-187.04228 64.74282,-381.32654 l 12.186,-69.3783 5.1542,29.94908 c 2.8349,16.47199 13.0244,75.35066 22.6435,130.84149 38.5487,222.3811 50.339,292.76717 49.6448,296.37157 -0.5595,2.9055 -1.9481,2.1973 -6.0355,-3.0781 z" + id="path253" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 665.96333,1054.5858 c -2.12189,-12.8334 -1.68411,-397.74836 0.45621,-401.1196 1.18657,-1.86899 4.0074,3.12245 7.86449,13.9162 3.30786,9.25676 36.90186,101.33618 74.65335,204.62094 37.75148,103.28477 68.63906,188.63526 68.63906,189.66776 0,3.3093 -13.50656,-4.9737 -25.54543,-15.6659 -17.46514,-15.5116 -28.36117,-20.2801 -49.18094,-21.5236 -31.02271,-1.8528 -49.40176,5.6738 -66.41657,27.1992 l -9.05619,11.4569 z" + id="path255" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 487.06681,1124.9351 c -21.50544,-5.8063 -49.42354,-18.4994 -67.84236,-30.8449 -1.59507,-1.0691 -5.02635,-13.3628 -7.62506,-27.3194 -9.89562,-53.1451 -48.71135,-287.18581 -47.98918,-289.35234 0.77906,-2.33719 13.53603,18.215 27.80579,44.79668 4.45123,8.29173 45.27583,79.1496 90.72135,157.46194 45.44552,78.31232 82.62822,142.67522 82.62822,143.02862 0,0.3535 -5.26995,1.7728 -11.71099,3.1542 -15.89377,3.4086 -51.80164,2.9053 -65.98777,-0.9248 z" + id="path257" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 482.06149,1279.8225 c -14.99573,-24.0596 -51.35228,-87.498 -50.63567,-88.3539 0.31562,-0.3769 8.47311,1.3836 18.12776,3.9124 52.31258,13.702 113.96447,11.6857 164.83422,-5.3907 37.80942,-12.6922 64.93431,-30.131 100.09353,-64.3509 l 25.62971,-24.945 11.48014,8.211 c 13.99104,10.0068 44.05833,24.5936 61.34653,29.7614 19.4155,5.8037 58.80369,8.6225 83.93344,6.0065 43.33299,-4.5109 71.63382,-18.0361 119.65105,-57.1821 l 7.5982,-6.1944 17.9148,17.3075 c 24.9804,24.1335 49.951,38.4234 82.8572,47.4169 16.7649,4.5819 86.2677,4.3635 104.2786,-0.3278 17.6262,-4.591 49.0799,-19.3698 66.429,-31.2122 l 13.6524,-9.319 27.2673,27.4705 c 37.9312,38.2136 70.6622,57.5477 119.5349,70.6088 16.857,4.5049 24.6964,5.0799 67.7687,4.9702 42.6938,-0.1088 50.9716,-0.7497 67.0528,-5.1917 10.0904,-2.7872 19.1385,-5.0676 20.107,-5.0676 2.4742,0 -47.8559,92.1556 -53.7649,98.4446 -1.2837,1.3663 -8.3921,0.6434 -18.8864,-1.9206 -121.4426,-29.6724 -219.3586,-41.6667 -392.5651,-48.0876 -77.4846,-2.8724 -242.66752,-1.4989 -311.9547,2.5939 -120.77478,7.1341 -218.49186,20.2335 -303.52045,40.6882 -18.32288,4.4078 -34.16538,8.0142 -35.20556,8.0142 -1.04018,0 -6.9012,-8.0381 -13.0245,-17.8626 z" + id="path259" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 534.56751,1456.6417 c -0.88343,-1.5267 -13.10158,-88.5063 -12.51957,-89.1253 1.36577,-1.4526 45.70264,-11.1033 80.48469,-17.5189 104.24592,-19.2282 210.17145,-27.7525 379.09355,-30.5072 195.58672,-3.1897 361.52632,8.6443 493.12592,35.1671 51.816,10.4431 55.1929,11.5756 53.6913,18.0069 -0.647,2.7714 -4.3564,22.23 -8.243,43.2414 -3.8866,21.0113 -7.2707,38.3894 -7.5202,38.6179 -0.2495,0.2285 -16.6313,-2.6446 -36.4039,-6.3847 -110.7712,-20.953 -199.8354,-29.6011 -357.1823,-34.6824 -201.13169,-6.4952 -404.41144,7.1145 -553.58633,37.063 -16.99162,3.4112 -30.9147,6.1662 -30.94016,6.1222 z" + id="path261" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 520.69762,1628.7598 c 0,-2.2912 13.44077,-52.4598 25.31751,-94.4994 2.03644,-7.2082 15.35067,-10.8779 75.5749,-20.8303 121.70577,-20.1125 232.68082,-27.8143 401.25027,-27.8472 185.6173,-0.036 297.6311,8.5748 441.3029,33.9254 l 35.4138,6.2488 5.716,18.7477 c 6.7123,22.0155 21.9765,80.2287 22.0078,83.9312 0.014,1.6142 -14.3288,-0.7152 -38.8078,-6.3031 -146.2448,-33.3836 -335.7345,-48.0047 -542.88855,-41.8898 -179.11746,5.2874 -288.37157,17.8008 -399.79412,45.7902 -26.22022,6.5865 -25.09271,6.464 -25.09271,2.7265 z" + id="path263" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 887.15742,1794.0347 c -101.97067,-4.5956 -224.06798,-19.5601 -294.09626,-36.045 -29.6776,-6.9862 -86.65523,-23.8773 -89.36805,-26.4932 -2.89952,-2.796 78.0813,-28.6574 119.0566,-38.021 108.80616,-24.8641 236.25172,-36.2175 407.04869,-36.2614 192.1107,-0.049 343.5229,16.6115 455.7554,50.15 34.2619,10.2384 60.3035,19.5844 60.3035,21.642 0,1.8949 -53.1816,18.7528 -80.0181,25.3647 -64.0425,15.7786 -155.4404,28.4904 -260.9287,36.2905 -56.1698,4.1534 -253.87483,6.2523 -317.75308,3.3734 z" + id="path265" /> </svg> diff --git a/client/public/images/pieces/Musketeer/wu.svg b/client/public/images/pieces/Musketeer/wu.svg index feef69ce..5cab5e37 100644 --- a/client/public/images/pieces/Musketeer/wu.svg +++ b/client/public/images/pieces/Musketeer/wu.svg @@ -36,17 +36,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" + inkscape:window-width="960" inkscape:window-height="1060" id="namedview20" showgrid="false" inkscape:zoom="0.43115234" inkscape:cx="1024" - inkscape:cy="1021.6806" + inkscape:cy="1019.3612" inkscape:window-x="0" inkscape:window-y="20" inkscape:window-maximized="0" - inkscape:current-layer="svg18" /> + inkscape:current-layer="svg18" + inkscape:document-rotation="0" /> <path style="color:black;" d="m1161 1706h170v137h274v-375l-222-171v-478l170-170v-205h153v-239h-1365v239h153v205l171 170v478l-222 171v375h273v-137h171v137h274v-137zm478-1330h-1230v-103h1230v103zm-155 204h-920v-136h920v136zm-170 717h-580v-478h580v478zm222 239v239h-137v-137h-308v137h-135v-137h-307v137h-137v-239h1024zm-77-887l-103 102h-663l-105-102h871zm-110 716l127 103h-904l128-103h649z" @@ -118,4 +119,28 @@ style="fill:#ffdead;stroke:#000000;stroke-width:2.31937" d="m 409.36806,1723.2888 v -49.8664 H 1024 1638.6319 v 49.8664 49.8664 H 1024 409.36806 Z" id="path36" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="M 516.05889,393.13246 V 277.16417 h 64.94224 64.94224 v 68.42129 68.4213 h 156.55719 156.5572 v -68.4213 -68.42129 h 63.74694 63.747 l 0.6154,66.68177 0.6155,66.68177 11.5968,1.53633 c 6.3782,0.84499 77.0899,1.62777 157.137,1.73953 l 145.5402,0.20319 v -68.4213 -68.42129 h 64.9423 64.9422 V 393.13246 509.10075 H 1024 516.05889 Z" + id="path227" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 642.61177,632.60698 -59.48382,-48.12684 220.43602,-0.59155 c 121.23982,-0.32535 319.62843,-0.32535 440.86363,0 l 220.4276,0.59155 -59.1901,48.12684 -59.1901,48.12684 H 1024.2853 702.09559 Z" + id="path229" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="M 736.39864,990.36916 V 754.95353 H 1024 1311.6014 V 990.36916 1225.7848 H 1024 736.39864 Z" + id="path231" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 646.449,1347.4789 48.05263,-47.4744 h 329.68677 329.6868 l 47.8642,47.5004 47.8642,47.5004 -425.6036,-0.026 -425.60363,-0.026 z" + id="path233" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 567.08493,1536.5798 v -64.9422 H 1024 1480.9151 v 64.9422 64.9423 H 1024 567.08493 Z" + id="path235" /> + <path + style="fill:#ffd700;stroke:#000000;stroke-width:2.31937" + d="m 411.68742,1723.2888 v -47.547 H 1024 1636.3126 v 47.547 47.547 H 1024 411.68742 Z" + id="path237" /> </svg> diff --git a/client/public/images/pieces/Shogun/bM.svg b/client/public/images/pieces/Shogun/bm.svg similarity index 100% rename from client/public/images/pieces/Shogun/bM.svg rename to client/public/images/pieces/Shogun/bm.svg diff --git a/client/src/translations/rules/Progressive2/en.pug b/client/src/translations/rules/Progressive2/en.pug index 1590c187..bd56f338 100644 --- a/client/src/translations/rules/Progressive2/en.pug +++ b/client/src/translations/rules/Progressive2/en.pug @@ -3,6 +3,6 @@ p.boxed | then white plays three moves... p - Same as + | Same as a(href="/#/variants/Progressive1") Progressive1 | , but without initial double-step pawn move, and without castling. diff --git a/client/src/translations/rules/Progressive2/es.pug b/client/src/translations/rules/Progressive2/es.pug index a3f70e97..76139456 100644 --- a/client/src/translations/rules/Progressive2/es.pug +++ b/client/src/translations/rules/Progressive2/es.pug @@ -3,6 +3,6 @@ p.boxed | entonces las blancas juegan tres movimientos... p - | Como + | Como a(href="/#/variants/Progressive1") Progressive1 | , pero sin el doble movimiento inicial de peón, y sin enroque. diff --git a/client/src/translations/rules/Progressive2/fr.pug b/client/src/translations/rules/Progressive2/fr.pug index 6b8248fe..0aff27db 100644 --- a/client/src/translations/rules/Progressive2/fr.pug +++ b/client/src/translations/rules/Progressive2/fr.pug @@ -3,6 +3,6 @@ p.boxed | ensuite les blancs jouent trois coups... p - Comme + | Comme a(href="/#/variants/Progressive1") Progressive1 | , mais sans le double coup initial de pion, et sans roque. diff --git a/client/src/variants/Alapo.js b/client/src/variants/Alapo.js index 6864457e..f525555a 100644 --- a/client/src/variants/Alapo.js +++ b/client/src/variants/Alapo.js @@ -221,4 +221,15 @@ export class AlapoRules extends ChessRules { return super.getCurrentScore(); } + static get VALUES() { + return { + r: 5, + b: 3, + q: 9, + t: 3, + c: 2, + s: 5 + }; + } + }; diff --git a/client/src/variants/Atomic1.js b/client/src/variants/Atomic1.js index c44c2cac..a5198d69 100644 --- a/client/src/variants/Atomic1.js +++ b/client/src/variants/Atomic1.js @@ -5,6 +5,17 @@ export class Atomic1Rules extends ChessRules { getPotentialMovesFrom([x, y]) { let moves = super.getPotentialMovesFrom([x, y]); + if (this.getPiece(x, y) == V.PAWN) { + // Promotions by captures can be reduced to only one deterministic + // move (because of the explosion). + moves = moves.filter(m => { + return ( + m.vanish.length == 1 || + [V.PAWN, V.QUEEN].includes(m.appear[0].p) + ); + }); + } + // Handle explosions moves.forEach(m => { // NOTE: if vanish.length==2 and appear.length==2, this is castle diff --git a/client/src/variants/Crazyhouse.js b/client/src/variants/Crazyhouse.js index 7fa47b72..2a95dc85 100644 --- a/client/src/variants/Crazyhouse.js +++ b/client/src/variants/Crazyhouse.js @@ -80,9 +80,9 @@ export class CrazyhouseRules extends ChessRules { setOtherVariables(fen) { super.setOtherVariables(fen); + const fenParsed = V.ParseFen(fen); // Also init reserves (used by the interface to show landable pieces) - const reserve = - V.ParseFen(fen).reserve.split("").map(x => parseInt(x, 10)); + const reserve = fenParsed.reserve.split("").map(x => parseInt(x, 10)); this.reserve = { w: { [V.PAWN]: reserve[0], diff --git a/client/src/variants/Fanorona.js b/client/src/variants/Fanorona.js index 39911635..4593e6bb 100644 --- a/client/src/variants/Fanorona.js +++ b/client/src/variants/Fanorona.js @@ -80,13 +80,14 @@ export class FanoronaRules extends ChessRules { return "Fanorona/" + b; } - getPPpath(m) { + getPPpath(m, orientation) { // m.vanish.length >= 2, first capture gives direction const ref = (Math.abs(m.vanish[1].x - m.start.x) == 1 ? m.start : m.end); const step = [m.vanish[1].x - ref.x, m.vanish[1].y - ref.y]; + const multStep = (orientation == 'w' ? 1 : -1); const normalizedStep = [ - step[0] / Math.abs(step[0]), - step[1] / Math.abs(step[1]) + multStep * step[0] / Math.abs(step[0]), + multStep * step[1] / Math.abs(step[1]) ]; return ( "Fanorona/arrow_" + diff --git a/client/src/variants/Hypnotic.js b/client/src/variants/Hypnotic.js index 130b1279..a429c7c4 100644 --- a/client/src/variants/Hypnotic.js +++ b/client/src/variants/Hypnotic.js @@ -74,6 +74,21 @@ export class HypnoticRules extends ChessRules { return moves; } + getAllPotentialMoves() { + let potentialMoves = []; + for (let i = 0; i < V.size.x; i++) { + for (let j = 0; j < V.size.y; j++) { + if (this.board[i][j] != V.EMPTY) { + Array.prototype.push.apply( + potentialMoves, + this.getPotentialMovesFrom([i, j]) + ); + } + } + } + return potentialMoves; + } + getEnpassantCaptures([x, y], shiftX) { const Lep = this.epSquares.length; const epSquare = this.epSquares[Lep - 1]; //always at least one element diff --git a/client/src/variants/Madhouse.js b/client/src/variants/Madhouse.js index 72c41cd8..1ed248d0 100644 --- a/client/src/variants/Madhouse.js +++ b/client/src/variants/Madhouse.js @@ -3,10 +3,13 @@ import { randInt } from "@/utils/alea"; export class MadhouseRules extends ChessRules { - hoverHighlight([x, y]) { + hoverHighlight([x, y], side) { // Testing move validity results in an infinite update loop. // TODO: find a way to test validity anyway. - return (this.subTurn == 2 && this.board[x][y] == V.EMPTY); + return ( + (this.subTurn == 2 && this.board[x][y] == V.EMPTY) && + (!side || side == this.turn) + ); } setOtherVariables(fen) { @@ -15,6 +18,12 @@ export class MadhouseRules extends ChessRules { this.firstMove = []; } + canIplay(side, [x, y]) { + if (this.subTurn == 1) return super.canIplay(side, [x, y]); + // subturn == 2, drop a piece: + return side == this.turn && this.board[x][y] == V.EMPTY; + } + getPotentialMovesFrom([x, y]) { if (this.subTurn == 1) return super.getPotentialMovesFrom([x, y]); // subTurn == 2: a move is a click, not handled here diff --git a/client/src/variants/Makruk.js b/client/src/variants/Makruk.js index c7dd3430..55617025 100644 --- a/client/src/variants/Makruk.js +++ b/client/src/variants/Makruk.js @@ -16,6 +16,10 @@ export class MakrukRules extends ChessRules { return true; } + static get Notoodark() { + return true; + } + static get PawnSpecs() { return Object.assign( {}, diff --git a/client/src/variants/Minixiangqi.js b/client/src/variants/Minixiangqi.js index f467e2dc..fc1d164e 100644 --- a/client/src/variants/Minixiangqi.js +++ b/client/src/variants/Minixiangqi.js @@ -67,8 +67,10 @@ export class MinixiangqiRules extends XiangqiRules { let evaluation = 0; for (let i = 0; i < V.size.x; i++) { for (let j = 0; j < V.size.y; j++) { - if (this.board[i][j] != V.EMPTY) - evaluation += (c == 'w' ? 1 : -1) * V.VALUES[this.getPiece(i, j)]; + if (this.board[i][j] != V.EMPTY) { + const sign = this.getColor(i, j) == "w" ? 1 : -1; + evaluation += sign * V.VALUES[this.getPiece(i, j)]; + } } } return evaluation; diff --git a/client/src/variants/Pawnmassacre.js b/client/src/variants/Pawnmassacre.js index 12ce1d04..1fe61cbe 100644 --- a/client/src/variants/Pawnmassacre.js +++ b/client/src/variants/Pawnmassacre.js @@ -6,6 +6,10 @@ export class PawnmassacreRules extends ChessRules { return false; } + get showFirstTurn() { + return true; + } + static GenRandInitFen(randomness) { const bFen = ChessRules.GenRandInitFen(randomness) diff --git a/client/src/variants/Recycle.js b/client/src/variants/Recycle.js index eb84044e..4afae21c 100644 --- a/client/src/variants/Recycle.js +++ b/client/src/variants/Recycle.js @@ -86,6 +86,14 @@ export class RecycleRules extends ChessRules { return this.board[i][j].charAt(1); } + getPPpath(m) { + if (m.vanish.length == 2 && m.appear.length == 2) { + // Castle: show castle symbol + return "Coregal/castle"; + } + return super.getPPpath(m); + } + // Used by the interface: getReservePpath(index, color) { return color + V.RESERVE_PIECES[index]; diff --git a/client/src/variants/Screen.js b/client/src/variants/Screen.js index 41334da0..7ccb5a5d 100644 --- a/client/src/variants/Screen.js +++ b/client/src/variants/Screen.js @@ -61,7 +61,7 @@ export class ScreenRules extends ChessRules { for (let i=0; i<4; i++) { for (let j=0; j<8; j++) this.enlightened['b'][i][j] = true; } - for (let i=5; i<8; i++) { + for (let i=4; i<8; i++) { for (let j=0; j<8; j++) this.enlightened['w'][i][j] = true; } } diff --git a/client/src/variants/Selfabsorb.js b/client/src/variants/Selfabsorb.js index 0a8a7473..a5d30b58 100644 --- a/client/src/variants/Selfabsorb.js +++ b/client/src/variants/Selfabsorb.js @@ -70,4 +70,8 @@ export class SelfabsorbRules extends AbsorptionRules { return moves; } + static get SEARCH_DEPTH() { + return 2; + } + }; diff --git a/client/src/variants/Shogi.js b/client/src/variants/Shogi.js index 63c0d726..9104ed92 100644 --- a/client/src/variants/Shogi.js +++ b/client/src/variants/Shogi.js @@ -16,6 +16,10 @@ export class ShogiRules extends ChessRules { return true; } + get showFirstTurn() { + return true; + } + static get Notoodark() { return true; } diff --git a/client/src/variants/Synochess.js b/client/src/variants/Synochess.js index 52915220..f8e9386b 100644 --- a/client/src/variants/Synochess.js +++ b/client/src/variants/Synochess.js @@ -527,7 +527,7 @@ export class SynochessRules extends ChessRules { evalPosition() { let evaluation = super.evalPosition(); - if (this.turn == 'b') + if (this.turn == 'b' && !!this.reserve) // Add reserves: evaluation += this.reserve['b'][V.SOLDIER] * V.VALUES[V.SOLDIER]; return evaluation; diff --git a/client/src/variants/Wormhole1.js b/client/src/variants/Wormhole1.js index 8219d28b..11901119 100644 --- a/client/src/variants/Wormhole1.js +++ b/client/src/variants/Wormhole1.js @@ -90,7 +90,7 @@ export class Wormhole1Rules extends Wormhole2Rules { return ( baseFen.substr(0, 8).split('').map(p => piecesMap[p]).join('') + baseFen.substr(8, 27) + - baseFen.substr(35, 43).split('') + baseFen.substr(35, 8).toLowerCase().split('') .map(p => piecesMap[p]).join('').toUpperCase() + " w 0" ); -- 2.44.0