From 581dbfd94ce8184c7516f50bcf67ac76568905db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 1 Apr 2022 16:20:44 -0400 Subject: [PATCH 1/6] Add dominosa --- Makefile.games | 2 +- config/dominosa.ini | 23 +++++++++++++++++++++++ help/dominosa.txt | 5 +++++ icons/blackbox.png | Bin 1018 -> 1018 bytes icons/bridges.png | Bin 2738 -> 2738 bytes icons/cube.png | Bin 561 -> 561 bytes icons/dominosa.png | Bin 0 -> 1481 bytes icons/galaxies.png | Bin 1232 -> 1232 bytes icons/inertia.png | Bin 2197 -> 2197 bytes icons/lightup.png | Bin 1626 -> 1626 bytes icons/mines.png | Bin 2577 -> 2577 bytes icons/net.png | Bin 1350 -> 1350 bytes icons/pearl.png | Bin 766 -> 766 bytes icons/pegs.png | Bin 1237 -> 1237 bytes icons/samegame.png | Bin 920 -> 920 bytes icons/slant.png | Bin 3858 -> 3858 bytes icons/tents.png | Bin 1814 -> 1814 bytes icons/tracks.png | Bin 2274 -> 2274 bytes icons/unruly.png | Bin 993 -> 993 bytes icons/untangle.png | Bin 1435 -> 1435 bytes src/game_list.hpp | 2 ++ 21 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 config/dominosa.ini create mode 100644 help/dominosa.txt create mode 100644 icons/dominosa.png diff --git a/Makefile.games b/Makefile.games index 751da11..f78a7c0 100644 --- a/Makefile.games +++ b/Makefile.games @@ -16,7 +16,7 @@ GAMES = GAMES += blackbox GAMES += bridges GAMES += cube -# GAMES += dominosa +GAMES += dominosa # GAMES += fifteen # GAMES += filling # GAMES += flip diff --git a/config/dominosa.ini b/config/dominosa.ini new file mode 100644 index 0000000..955b6cb --- /dev/null +++ b/config/dominosa.ini @@ -0,0 +1,23 @@ +[layout] +min_tilesize = 100 +max_tilesize = 150 + +[full_refresh] +# New puzzles are light gray and white; skip the full refresh +new_puzzle = false +solving_puzzle = true + +[colors] +# From PocketPuzzles +_order = background text textclash texthight_1 texthight_2 domino dominoclash dominotext edge highlight_1 highlight_2 +background = 1 +text = 0 +textclash = 0.5 +texthigh_1 = 0.25 +texthigh_2 = 0.75 +domino = 0 +dominoclash = 0.75 +dominotext = 1 +edge = 0 +highlight_1 = 0.6 +highlight_2 = 0.4 \ No newline at end of file diff --git a/help/dominosa.txt b/help/dominosa.txt new file mode 100644 index 0000000..14ca71f --- /dev/null +++ b/help/dominosa.txt @@ -0,0 +1,5 @@ +Dominosa + +Tile the rectangle with dominoes (1×2 rectangles) so that every possible domino appears exactly once (that is, every possible pair of numbers, including doubles). + +Click between two adjacent numbers to place or remove a domino. Right-click to place a line between numbers if you think a domino definitely cannot go there. Dominoes light up red if two identical ones appear on the grid. \ No newline at end of file diff --git a/icons/blackbox.png b/icons/blackbox.png index 781b997bab8ecd4bf39c8c22fedd53f1c230b38f..5ea7d4467474c22c41a3d038f216418c0f2b5b87 100644 GIT binary patch delta 91 zcmeyx{)>Hr2iG$eMs5pDiQb4e8-oIwrHph9OmqzlLkvx=OwFuJ41ruL1A|A4&!kS? Z%Pg*jU3&7rlA8=b;OXk;vd$@?2>{-$8lV6G delta 91 zcmeyx{)>Hr2iH?3Za!81P(P8LjX{CTQii$)M!JTEA%-Sa#^zRrrrHJuRt5(DuC#BM ayq8&A4ZC!Ir#%k?5O})!xvX>ZVck&3OCd>Fw!+N3o$UUGBC3;Fwr(Jure@cx<6wX t0|SFRc?MtW?ChKk%19*4WFA7q<|V2JYD@<);T3K0RYw^9%}#q diff --git a/icons/cube.png b/icons/cube.png index b0efdd0a6931f53e4e15f8fc867b87843bacbf1e..761128d942bae94e3d12ef587bbfe38b022dae52 100644 GIT binary patch delta 109 zcmdnUvXNzi2iG$eMs5pDiQb4e8-qF+!;N$eOmqzlLkvx=OwFuJ41ruL1A|A4&!jRi rFsPQeMwFx^mZVzc=BH$)RWcYE7-82i`CrLRpaup{S3j3^P6)!ag8WRNi0dV%FR#7OsixtGBCofp}*6f2dII;)78&qol`;+0EXZlg#Z8m diff --git a/icons/dominosa.png b/icons/dominosa.png new file mode 100644 index 0000000000000000000000000000000000000000..c907be240a882386e3d1e4434d3448d4dc3e825c GIT binary patch literal 1481 zcmZ{kdpOez7{^B!rKApyN~|kM4#h}e5s9*$gKDLcTg#C~Ee+d#O&8b5Da|4t-B(tw z&1$wp)@euU@=T(cOD3ZEVRo_oe&^Sp=a2Kp_x(Pf_kF(aKkxIrIltqA%uJV?qEINa z;9UV>h)*N>WP}uy5v%AY%qIGU`k_!Yg$wl2a}YL;*&P&sGLq$5+(F2M92^>GqL^*8 zV2k6@%Y;#+wKz5!mx{#g5t$&o^rx&0ix(ri`ho-eA_y(*Ouxi|otC1Y2LvAq$LHCJ zY*T~rrR~A1CxkpUBtkNTk{ZCgt-R*bJ|07(g z-f1WPYb+`GmJu-qb|>|evS7YL{GIsRgYPz8JfS$18rgtW$QHSkGWpwk-o*s?!c zX`$iQ3ADSW)hU`Csv0~ni{o38M?+ut(cyf`)f#N8On1DH=<{8z;kN-!AZSoQi zGBM>L&@sCl!#YjmRB?z+Un(?jz@ln`+l$SF=R#pWRuU_Ilvu7fu=>H?5Z#F~*wnjI zamJ>iQ`w4N-jgkCaS}Ojo{4xu(a`(yNg-4D0iEL3xoAK;ZD8oI(}wRo*f}#Pi|?z3 zdjKy9#@Mc(DtQsx@K&yD79ZufnBjHk>wdxm})Ca^3;c zzDHNu<>~pb5O%#51wytZ(v0QihE~d-pZhK*e?Uvk*|jR(*JFIZM6m|ES~eCX*4R9v z@d2@hEmhZZB(ae;y@u{~JjlpUrCBhT{lG>ru|U|Te_PgX&JlPCvFZ+M&@;AEzGgE2 zWGbW?f{z|q|9mnf2ypg1)GaDM4mUM5$zC}E=o4@ygjMO3gGF&G4_-Wt+?qL+RR8q} zYy5_4U`lrUZ+S$;ReDqoJ*MCdASL+U%782x6#0tvV zX{Cm~lE%#WO6spXJYS)%B8e>|^tz{L9f;>^ZUP1PIGW>g=QtYXdxqsq1{Hdz=Xwfn zG^Zv*_dE#bY!b|cC?mQAPxHYGZN1c;Jl~EmKonMCU#fDG4&D8z&da}5u|s}`VX13S zjcou&hURRMWeVpx+|*Ks!4jSn$krxY41WyI>Yt+T@h+OlX*+zrVv_O(~{6t6!?yI(7aYVl>Ci&@bE*|CV`RKPh^h=xtTu;jc4 zuc+O~(_2RlB#`5x$?;obPsJmK+U&Y{v$Lzav+JgaO_;41kFD;T5ZvnO+JF0>`2Pfw bNO1|r(*8ei6(WB|0;u3XT)<=hqnZB#!l?l0 literal 0 HcmV?d00001 diff --git a/icons/galaxies.png b/icons/galaxies.png index 2bbaef52f22defdf19a9ef8fcf88a0c0e5ac6f11..eb3a7ebf803ada40f82c042fca70f34b4ada1aef 100644 GIT binary patch delta 109 zcmcb>d4Y3+2iG$eMs5pDiQb4e8-vtY!i{tdOmqzlLkvx=OwFuJ41ruL1A|A4&!jRi rFsPQeMwFx^mZVzc=BH$)RWcYE7-82i`CrLRpaup{S3j3^P6d4Y3+2iH?3Za!81P(P8LjX~-x;fA^fM!JTEA%-Sa#^zRrrrHJuRt5(DuC#Ap sU|>)!ag8WRNi0dV%FR#7OsixtGBCofp}*6f2dII;)78&qol`;+0E8zUZvX%Q diff --git a/icons/inertia.png b/icons/inertia.png index 8f392dc3583611bff08080c90f8876d37bbf4cfc..a27b2db31ee1e6d5337c4a7f0c19ac898cd66a05 100644 GIT binary patch delta 109 zcmbO#I8|_h2iG$eMs5pDiQb4e8-w1kha2e{nCKc9h8UV!nVMOd7y`Lg1_qB7pGjq4 rU{Eb_jVMV;EJ?M>%}>cpt7I@TFv6~3^1qUsKn)C@u6{1-oD!M<>|`I* delta 109 zcmbO#I8|_h2iH?35pin)@vff}HU_<64>!~`Fw!+L2r)9YGPSfaG}AUPure?>x}eXS tfq_A_#5JNMC9x#cDmOnRGp&-r$iN7@hAn^1z5_Kdc)I$ztaD0e0s!a;ADaLG diff --git a/icons/lightup.png b/icons/lightup.png index 73146677801269b42ce5b9048d50f9a0f14db218..11b43932366be13e3893332eda00d15797adfb63 100644 GIT binary patch delta 91 zcmcb`bBkw!2iG$eMs5pDiQb4e8-q5oN*U=InCKc9h8UV!nVMOd7y`Lg1_qB7pGlo8 Z%O{J-8ZQ6< delta 91 zcmcb`bBkw!2iH?3Za!81P(P8LjX@h(r3`fqjC2hRLkvx)!ag8WRNi0dV%FR#7OsixtGBCofp}*6f2dII;)78&qol`;+0C311O#lD@ diff --git a/icons/net.png b/icons/net.png index 6cccd91d4bf9ef24014fc7666da341b2661577db..3139f81b6f9c42e6f0aab6429355ed61717a513c 100644 GIT binary patch delta 109 zcmX@cb&P9*2iG$eMs5pDiQb4e8-wPugd6D^nCKc9h8UV!nVMOd7y`Lg1_qB7pGjq4 rU{Eb_jVMV;EJ?M>%}>cpt7I@TFv6~3^1qUsKn)C@u6{1-oD!M<^AR7` delta 109 zcmX@cb&P9*2iH?3QAQ@sXEH9W8-wPugd6G_80i`rh8P%H85mia7-}0BSQ!|+)!ag8WRNi0dV%FR#7OsixtGBCofVSf0=`#=p0p00i_>zopr0CrFvwEzGB diff --git a/icons/pearl.png b/icons/pearl.png index 8205f232215e8c9a69b4f93e57c6f81ac32538a0..989c73c1f98c586111fdf623ead3c5d840b91db0 100644 GIT binary patch delta 91 zcmeyz`j2&j2iG$eMs5pDiQb4e8-qfbq>OY8OmqzlLkvx=OwFuJ41ruL1A|A4&!kR1 Z$Rw_YU3&7rlA8=b;OXk;vd$@?2>{`78ma&Q delta 91 zcmeyz`j2&j2iH?3Za!81P(P8LjX|MIQii$)M!JTEA%-Sa#^zRrrrHJuRt5(DuC#BM ae2__84ZC!Ir#%k?5O})!xvXbP0l+XkKFI^mL diff --git a/icons/samegame.png b/icons/samegame.png index 889594b42479443d43416595f173ead17e9caec3..3f45312306144e50973434f856094c43a73219ec 100644 GIT binary patch delta 109 zcmbQiK7)ON2iG$eMs5pDiQb4e8-w06g&XM_nCKc9h8UV!nVMOd7y`Lg1_qB7pGjq4 rU{Eb_jVMV;EJ?M>%}>cpt7I@TFv6~3^1qUsKn)C@u6{1-oD!M<<>4R1 delta 109 zcmbQiK7)ON2iH?3Za!81P(P8LjY033!VPr|jC2hRLkvxzm7AZEnO4bQWMG6{Lw~0|4^RVxr>mdKI;Vst0GQbw!2kdN diff --git a/icons/slant.png b/icons/slant.png index 06fd06e94545b5ae48801c8a8207666244c56be5..4ae26cdb694dc36acf798a7e3e5042d6adf0c420 100644 GIT binary patch delta 109 zcmbOvH%V@S2iG$eMs5pDiQb4e8-p_W!i{tdOmqzlLkvx=OwFuJ41ruL1A|A4&!jRi rFsPQeMwFx^mZVzc=BH$)RWcYE7-82i`CrLRpaup{S3j3^P6)!ag8WRNi0dV%FR#7OsixtGBCofp}*6f2dII;)78&qol`;+0DKc2X#fBK diff --git a/icons/tents.png b/icons/tents.png index af658dbf95dce1a522bccc110ea4920f76719dee..72114b43fa2f0bcc098d2fb6b95a598e62849003 100644 GIT binary patch delta 109 zcmbQnH;r$C2iG$eMs5qO#um=7jX}9=;YPX!Cb|ZOA%><_re;UO_Qmu0HQ!>*k8H@~!uxnT(mgfT0z~JfX=d#Wzp$PznxE+uH delta 109 zcmbQnH;r$C2iH?30TwovZ@b>>ZVbw03pdm?Fw!+N3o$UUGBC3;Fwr(Jure@cx<6wX t0|SFRc?MtW?ChKk%19*4WFA7q<|V2JYD@<);T3K0RY--9)$n^ diff --git a/icons/tracks.png b/icons/tracks.png index 58217b282dd66e3246d17a547ac463a46b922de9..7256f1d9316559d76da6c5e1130100b6ccd963e7 100644 GIT binary patch delta 109 zcmaDP_(*Vq2iG$eMs5qO#um=7jX{<_re;UO_Qmu0HQ!>*k8H@~!uxnT(mgfT0z~JfX=d#Wzp$P!D#2x$q delta 109 zcmaDP_(*Vq2iH?30TwovZ@b>>ZVa;I2shLRc?MtW?ChKk%19*4WFA7q<|V2JYD@<);T3K0RRhz9`OJG diff --git a/icons/unruly.png b/icons/unruly.png index 86deddbc7c819456d93d10d11b2646e7c696a72f..4a1b0f6f3d4c9c3bcba6c4b311d01ae31eb5bde2 100644 GIT binary patch delta 109 zcmaFJ{*Zlw2iG$eMs5qO#um=7jX@U7;YPX!Cb|ZOA%><_re;UO_Qmu0HQ!>*k8H@~!uxnT(mgfT0z~JfX=d#Wzp$P!2c^%*Y delta 109 zcmaFJ{*Zlw2iH?3Za!81P(P8LjX@U7;fA^fM!JTEA%-Sa#^zRrrrHJuRt5(DuC#Ap sU|>)!ag8WRNi0dV%FR#7OsixtGBCofp}*6f2dII;)78&qol`;+0G4zeod5s; diff --git a/icons/untangle.png b/icons/untangle.png index d83417bc804564665ec6e4ec990a225c0c5ab7aa..9e51d0b231ea041ac12291006fbddd21d9b54855 100644 GIT binary patch delta 91 zcmbQuJ)3)i2iG$eMs5qO#um=7jX|GSq>OY8OmqzlLkvx=OwFuJKwK*WgUjC6eoT&I Y6<5P9y+|z2g#idWUHx3vIVCg!0E=4~ZvX%Q delta 91 zcmbQuJ)3)i2iH?3Za!81P(P8LjX|GSqzrWpjC2hRLkvx Date: Fri, 1 Apr 2022 16:30:06 -0400 Subject: [PATCH 2/6] Switching to a 5x5 layout, to fit more puzzles. --- src/ui/chooser_scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/chooser_scene.cpp b/src/ui/chooser_scene.cpp index 39fd9ff..5c1ec96 100644 --- a/src/ui/chooser_scene.cpp +++ b/src/ui/chooser_scene.cpp @@ -75,8 +75,8 @@ ChooserScene::ChooserScene() { // Icons int padding = 25; - int dx = (w - 2*padding) / 4; - int dy = (h - 2*tb_h - 4*padding) / 4; + int dx = (w - 2*padding) / 5; + int dy = (h - 2*tb_h - 4*padding) / 5; int x = padding; int y = tb_h + padding; From 2ef033000d1360d1e7ca2e3ea7779ea666c89684 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 1 Apr 2022 17:01:45 -0400 Subject: [PATCH 3/6] Also add loopy. --- Makefile.games | 2 +- config/loopy.ini | 19 +++++++++++++++++++ help/loopy.txt | 7 +++++++ icons/blackbox.png | Bin 1018 -> 1018 bytes icons/bridges.png | Bin 2738 -> 2738 bytes icons/cube.png | Bin 561 -> 561 bytes icons/dominosa.png | Bin 1481 -> 1741 bytes icons/galaxies.png | Bin 1232 -> 1232 bytes icons/inertia.png | Bin 2197 -> 2197 bytes icons/lightup.png | Bin 1626 -> 1626 bytes icons/loopy.png | Bin 0 -> 1485 bytes icons/mines.png | Bin 2577 -> 2577 bytes icons/net.png | Bin 1350 -> 1350 bytes icons/pearl.png | Bin 766 -> 766 bytes icons/pegs.png | Bin 1237 -> 1237 bytes icons/samegame.png | Bin 920 -> 920 bytes icons/slant.png | Bin 3858 -> 3858 bytes icons/tents.png | Bin 1814 -> 1814 bytes icons/tracks.png | Bin 2274 -> 2274 bytes icons/unruly.png | Bin 993 -> 993 bytes icons/untangle.png | Bin 1435 -> 1435 bytes src/game_list.hpp | 1 + 22 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 config/loopy.ini create mode 100644 help/loopy.txt create mode 100644 icons/loopy.png diff --git a/Makefile.games b/Makefile.games index f78a7c0..1d3a75f 100644 --- a/Makefile.games +++ b/Makefile.games @@ -26,7 +26,7 @@ GAMES += galaxies GAMES += inertia # GAMES += keen GAMES += lightup -# GAMES += loopy +GAMES += loopy # GAMES += magnets # GAMES += map GAMES += mines diff --git a/config/loopy.ini b/config/loopy.ini new file mode 100644 index 0000000..29fdbc0 --- /dev/null +++ b/config/loopy.ini @@ -0,0 +1,19 @@ +[layout] +min_tilesize = 100 +max_tilesize = 150 + +[full_refresh] +# New puzzles are black and light gray; skip the full refresh +new_puzzle = false +solving_puzzle = true + +[colors] +# From PocketPuzzles +_order = background foreground lineunknown highlight mistake satisfied faint +background = 1 +foreground = 0 +lineunknown = 0.75 +highlight = 1 +mistake = 0.25 +satisfied = 0.9 +faint = 1 \ No newline at end of file diff --git a/help/loopy.txt b/help/loopy.txt new file mode 100644 index 0000000..02e5df8 --- /dev/null +++ b/help/loopy.txt @@ -0,0 +1,7 @@ +Loopy + +Form a single closed loop out of the grid edges, in such a way that every numbered square has exactly that many of its edges included in the loop. + +Click on a grid edge to mark it as part of the loop (black), and again to return to marking it as undecided (yellow). Right-click on a grid edge to mark it as definitely not part of the loop (faint grey), and again to mark it as undecided again. + +When you have mastered the square grid, look in the Type menu for many other types of tiling! \ No newline at end of file diff --git a/icons/blackbox.png b/icons/blackbox.png index 5ea7d4467474c22c41a3d038f216418c0f2b5b87..f88a649d1fd784b1b1351d093e897839efe40c1d 100644 GIT binary patch delta 70 zcmeyx{)>HrH#?7t;>%z|cC#%5Ng=DG$ZRt5$V%i?_|?`2kyMG?*X{rm$1 O5O})!xvXHrH#@h5rbKVVn~gzH%z~y?re;=d#Wzp$PyT(-sK; diff --git a/icons/bridges.png b/icons/bridges.png index bcc23150d547c509fa918b92f274c5d6957ba90e..d2b13f5925955b99f28432fde3473d8395164c66 100644 GIT binary patch delta 70 zcmdlax=D0`H#?7t;yT!Lm+#%5Ng=DG$ZRt5$V%i?_|mvSk{qKIbxe*S?0 O2s~Z=T-G@yGywpYsS|zx delta 70 zcmdlax=D0`H#@h5rbKVVn~gz2T!N-nre;&iy}JtU&&1d OAn;D83oO(jLob}&2xGQ6qdnlC)jG5==xo5b2n;1m4%5cm^* zOU^UMU)J%;92?*KW(MXIiV^fUq9?oAOUM6>8#H-JE>|P$7DBdDo0iSYS!BhUR z;^qC4KUvN{>dfCi_KjcpV}F2g;1>rA-yE1{p1sBVKB4|$XZ`d4$^P$(_xWd_VC0H2-BFcz6C&Xa39mC*Du&2mO!43jZJb{y!96 zc%QWJtNh=DU&lW;|GKAzU-K|t8%d#<@M9XT<{${s`O;_yi1~|9?IlTvBPA^GB3FC+!vdduaFz?LmZ3kw4|# z8$*9hS{deNRo74XiNgu-q#{saikBM4?ysFcakw@AC~Wn>xyG6K*_W@s!~L<2pSOSe z?*IPyUC;k|{`lso5bj&)0qF|fZhR#FeR0C)tNjChBzEiX)?P>-XzK6wubGt9tbbp( z|8?=*wacZJhW}mthxb3&3BNTz^9T6Y(eKx!eW9G+5ug98@vowtxPPa19?HpSt#GUbokfct$6<6h4cZ@?@-9< z#v6Pg+#Pka`@!n}+UvhJ|3|7owf~+9e+|yB4Lbb06aLWMm-!#)`M+@Z+kazkTBJqF zan{e6zqzATOf*iSYRjOL|6-Y+@WP*57*z9by5!$2;Sa!n`k{LOoB;PH^pDXXwKsju zPxy#eLi*R0@SozW-_h01C zZvxd%z5_2g0RFPSz3n^xd942T+E|Vg&l>*a;-BdhyqEkGXa1A+j?{l+2U5b*{g~o? ztv?Q1{+%?wem`qJ-Tt2IcmLP8172yo@ei86u3zui4gc?(f4%;-f*@o4XzeV`@p0_` zSM~q-p7+<8;M1&5MyCZb^rhYCIA2d2LJ#77ytkO7!~~x5C8xK z;Ymb6R9M5!mqBaeMij?Ks8~ICtv$MIhzk7zhCoRnc#b{pDfgUuD$7DHdstTb2Kfm4 z6?)G_w_XZ46?$8hLUXLPOF^bW)Bl_IMjp$O?QL+P0cT?WG=Fd2o0CrYsVuHJAL6x@GtD6fStq|c>)dS0f+6yQsInS(FvQ@JV;Mb_bOL0+SOt?~do zB>oB3@4;!@EBq~)hnOMi@|o}wTnYE>&v^cTc;V*P;AyS2-45nIsXTK2HQ+UP1b)su ztiTt-4R`|{+JD_?dAR7Y|85MT&eQOhe-xyORCL;}+ zzhUxsB}bR82m(0 zezfPij(_ERJAR7M7m99YtB>Y;);Hu-J z0v_Ug&%k4~&fo9B%V4c94NhlV>Qm?s@85x`bWOM0M7_v3KU01Cjm_VAn1d%Z%}n~6 z+BY|@Z1 zf6Mr()%Ucm&tqE~;QiapPw|0!^?4J4m*Rgc@oSF1;rz~=;t#F9Iln*m))(@_Ph@>5yDemWHS2p6 z`+I!;(EPVIznZ~zaQ>z?SRaUQ|9`jscgNSG-GaXeC!P6x>G7Dk)qjZjX@yg+{{!OmeoQ=(`-#R~ zgP-$w%JHpzsxRntoq@j*elOhRZ>rBV_&f1m-mzQ#YvD~#{BC`xvc6x#J{qZjVjRQ% z9+_tke19!=zaRex@ltS$sKtESlV1iP5j8qBHaavhEig1XFfihy%w?011|S_ZIyE*r bG%+nOG&(Ralm2ws00000NkvXXu0mjf7$oW0 diff --git a/icons/galaxies.png b/icons/galaxies.png index eb3a7ebf803ada40f82c042fca70f34b4ada1aef..d28fc0980d638e66297208c1a9fb06fab98e2862 100644 GIT binary patch delta 97 zcmcb>d4Y3+H#?7t;0EPiHI#%5Ng=DG$ZRt5$V%i?_)7#LJbTq8d4Y3+H#@h5rbKVVn~gyREPkd|re;)!ag8WRNi0dV o%FR#7OsixtGB7d%s?aqs3^7E}F!^7}O`rw_Pgg&ebxsLQ0Ga?Cu>b%7 diff --git a/icons/inertia.png b/icons/inertia.png index a27b2db31ee1e6d5337c4a7f0c19ac898cd66a05..09de9a084d5bec1d6299ee87e3dc1baa2eaa0fe1 100644 GIT binary patch delta 70 zcmbO#I8|_hH#?7t<4*#*t4jLob}&2=d#Wzp$Py1(iM^b diff --git a/icons/lightup.png b/icons/lightup.png index 11b43932366be13e3893332eda00d15797adfb63..306ffa71a355aa7bc95495f3b3bb6f3df42cc6c0 100644 GIT binary patch delta 70 zcmcb`bBkw!H#?7t=BSOv|jjLob}&2=d#Wzp$PyFr4^U} diff --git a/icons/loopy.png b/icons/loopy.png new file mode 100644 index 0000000000000000000000000000000000000000..6f630f14de4be4924266d34d0a958abd1eab5839 GIT binary patch literal 1485 zcmZ{kZ8Q@K7{|BbZZx%Mh-{6KRNCexmgXjGi)l%h>d1R0MQLcaS+SKVvpW~5Zc1*g zmw8u>x&2wb=hF0Q3jTUdTo2x`s*KJAFq*FJSnRTxVH@-mrNtWbPJ)}x% z3e7FJ9)d{#wmUB=yQjh)44$yvYU-6&kp)RT`?7I*0FnxM#5HSpR{!#0tks!*RE~TP zaKf}G3KCC62vQLDHgvkd-tl)E?N*y&gl&XlQ*wtEY`=sK+s|vnC{**q7(!&bVA_~j z@EVUOpS~Ou1}{J0iFB~GKrJE>G3bToY!-cD)sZ^Sg}RCQMNwU2DD(M1^=xnV);oU1lPmO zSYulqCtM3PXTseW!d>gt`qH$_MqA@VwbB~2*P4IpI?zkRft>Ap<#2*JM0^UXy5BQH zR5uV7&WyGa`5aDp3LFSMZGA(8wL+!DFprf^A7}I?!QUD>Ns`#&gZmv1blF|_O+I+c z^$hAe0Mrt*pT+V-)T?^HTw=|pgdC7xFNO>zgMCH^QB{_$oK&$yV#i-ClioT>->q(`%N0nmqi` z@*1MMQ&c@=7JuH|sRbMS=CV?v4mYr!*t$9KtaF0b`7x!scx(8kW$D9jilhLO*X;aYuy+q2c9);f#}k(4j(PCn<+Fm z$|dOTr7<{GR}hD^qsE>pt-g!KLHhN5k?I@mVeU9>-fd(mrcb_jL-y^cp@1+)^LKu? zBKcLmxc1(MUq|a44Uh(Jd-V|akTpCdktzx`hb9%>N5Q;~MuOI#c$nVLL&e9&^JsYVf6n3f) z+S^N6dZlQ~DVXcw3aiEJ?GyFPS1dwlGR{M+JgBMgQ@f8Gxvl~yMn_y*%Gv(3Bn`hW z^+~?(W+80ee`&cTN$psy-8b^(Rrba3TWM)+X-TeLyENfsFAb+_?YBNgw8N^hH1t(T zvF3J9N0&`5Uh%i&VDh2ba>hctWW$$pRc#$zu?(e6Fg@@7R=sH)Pl8>wV?5V)PcY9! zX|o^yW7E3v@%RUzHN{G$g$1U!?f%zd20*iSbzx?$IP;Fc2Cop#Rf5S9Uxu{H##9Ow zXBHvC5>lCq-$#;QMcy@R;n|O4$(kE5tAM-8a$qHdB4CT(LBZb z$*-09ycBq3@XV;Tfb>^D_oRf`kX$!rX|1sd`q0s=TX}&|xKJ`L;?SVgq{;g`Q{mcH zO+nW9N5?SWcjLU5nrGZ|y2ocr^9i9vN6=z$QAshn0l=cM*ez)1Eoe*-#uew}igVef lvp6)`{7#tve*(u7qvMXy|346?9Z~B70FqCDcbQjs#y`DJslWgL literal 0 HcmV?d00001 diff --git a/icons/mines.png b/icons/mines.png index 5759ed0460429b0293cee32a279f9cddd907d947..4cbfbe379b60afbe7b67dc7c7965648b54aa999b 100644 GIT binary patch delta 70 zcmbOzGEroLH#?7t=d#Wzp$P!>;T4Mj diff --git a/icons/net.png b/icons/net.png index 3139f81b6f9c42e6f0aab6429355ed61717a513c..2bdc74a1f096407944896d43a9393fc18fd9129f 100644 GIT binary patch delta 70 zcmX@cb&P9*H#?7t=RSOm?ijLob}&2=d#Wzp$P!|ofSd= diff --git a/icons/pearl.png b/icons/pearl.png index 989c73c1f98c586111fdf623ead3c5d840b91db0..72c698443d8caf7cf61dc39fa8aa695348ec4683 100644 GIT binary patch delta 70 zcmeyz`j2&jH#?7t=d#Wzp$PyV@)i>S diff --git a/icons/pegs.png b/icons/pegs.png index 47785a95a30f99988007c2ead977da763102e856..b624ecc9ce2b184d891afb44a50f2f0a53539c11 100644 GIT binary patch delta 70 zcmcc0d6jd5H#?7t<>EP`fM#%5Ng=DG$ZRt5$V%i?_|&tOrIMG?*X{rm$1 O5O})!xvX=d#Wzp$P!~q!oJr diff --git a/icons/samegame.png b/icons/samegame.png index 3f45312306144e50973434f856094c43a73219ec..5d681126f193159776a63900d14dad90d65a3dfb 100644 GIT binary patch delta 70 zcmbQiK7)ONH#?7t;vm;}wNjLob}&2=d#Wzp$P!}Z54n3 diff --git a/icons/slant.png b/icons/slant.png index 4ae26cdb694dc36acf798a7e3e5042d6adf0c420..c3d7055f52ec7844f998cbf6537ffe856c9754c0 100644 GIT binary patch delta 70 zcmbOvH%V@SH#?7t;#e1c|H#%5Ng=DG$ZRt5$V%i?_|U*%JfMG?*X{rm$1 O5O})!xvX=d#Wzp$P!}yA`bf diff --git a/icons/tents.png b/icons/tents.png index 72114b43fa2f0bcc098d2fb6b95a598e62849003..8db6293f1fe60d435dbdc179ffb13e1fb1b1ced3 100644 GIT binary patch delta 70 zcmbQnH;r$CH#?7tQ!^_QBV7X%D+7be-q(IizR9K_iz2#6EYF1j O2s~Z=T-G@yGywq1*AvYE diff --git a/icons/tracks.png b/icons/tracks.png index 7256f1d9316559d76da6c5e1130100b6ccd963e7..7ee8f76ae44e45df6fc392e79cb3daac6658b6e4 100644 GIT binary patch delta 70 zcmaDP_(*VqH#?7t;;9D-(6#%5Ng=DG$ZRt5$V%i?_|FXd2>MG?*X{rm$1 O5O})!xvX=FSp?0jjLob}&27jMG?*X{rm$1 O5O})!xvX Date: Tue, 5 Apr 2022 13:34:29 -0400 Subject: [PATCH 4/6] Right-click -> long-press --- help/dominosa.txt | 2 +- help/loopy.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/help/dominosa.txt b/help/dominosa.txt index 14ca71f..1ec2742 100644 --- a/help/dominosa.txt +++ b/help/dominosa.txt @@ -2,4 +2,4 @@ Dominosa Tile the rectangle with dominoes (1×2 rectangles) so that every possible domino appears exactly once (that is, every possible pair of numbers, including doubles). -Click between two adjacent numbers to place or remove a domino. Right-click to place a line between numbers if you think a domino definitely cannot go there. Dominoes light up red if two identical ones appear on the grid. \ No newline at end of file +Click between two adjacent numbers to place or remove a domino. Long-press to place a line between numbers if you think a domino definitely cannot go there. Dominoes light up red if two identical ones appear on the grid. diff --git a/help/loopy.txt b/help/loopy.txt index 02e5df8..8870482 100644 --- a/help/loopy.txt +++ b/help/loopy.txt @@ -2,6 +2,6 @@ Loopy Form a single closed loop out of the grid edges, in such a way that every numbered square has exactly that many of its edges included in the loop. -Click on a grid edge to mark it as part of the loop (black), and again to return to marking it as undecided (yellow). Right-click on a grid edge to mark it as definitely not part of the loop (faint grey), and again to mark it as undecided again. +Click on a grid edge to mark it as part of the loop (black), and again to return to marking it as undecided (yellow). Long-press on a grid edge to mark it as definitely not part of the loop (faint grey), and again to mark it as undecided again. -When you have mastered the square grid, look in the Type menu for many other types of tiling! \ No newline at end of file +When you have mastered the square grid, look in the Type menu for many other types of tiling! From 4ddd5b772f964eb7c8372a6efdcc1397328288bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 5 Apr 2022 14:05:10 -0400 Subject: [PATCH 5/6] Add magnets and signpost --- Makefile.games | 4 ++-- config/magnets.ini | 22 ++++++++++++++++++++++ config/signpost.ini | 17 +++++++++++++++++ help/magnets.txt | 9 +++++++++ help/signpost.txt | 7 +++++++ icons/magnets.png | Bin 0 -> 1478 bytes icons/signpost.png | Bin 0 -> 2093 bytes src/game_list.hpp | 2 ++ 8 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 config/magnets.ini create mode 100644 config/signpost.ini create mode 100644 help/magnets.txt create mode 100644 help/signpost.txt create mode 100644 icons/magnets.png create mode 100644 icons/signpost.png diff --git a/Makefile.games b/Makefile.games index 1d3a75f..29fe309 100644 --- a/Makefile.games +++ b/Makefile.games @@ -27,7 +27,7 @@ GAMES += inertia # GAMES += keen GAMES += lightup GAMES += loopy -# GAMES += magnets +GAMES += magnets # GAMES += map GAMES += mines GAMES += net.patched @@ -39,7 +39,7 @@ GAMES += pegs # GAMES += range # GAMES += rect GAMES += samegame -# GAMES += signpost +GAMES += signpost # GAMES += singles # GAMES += sixteen GAMES += slant diff --git a/config/magnets.ini b/config/magnets.ini new file mode 100644 index 0000000..9145e85 --- /dev/null +++ b/config/magnets.ini @@ -0,0 +1,22 @@ +[layout] +min_tilesize = 100 +max_tilesize = 150 + +[full_refresh] +new_puzzle = true +solving_puzzle = true + +[colors] +# From PocketPuzzles +_order = background highlight lowlight text done negative positive cursor neutral not error +background = 1.0 +highlight = 0.75 +lowlight = 0.25 +text = 0.0 +done = 0.75 +negative = 0.25 +positive = 0.75 +cursor = 0.9 +neutral = 0.5 +not = 0.25 +error = 0.5 \ No newline at end of file diff --git a/config/signpost.ini b/config/signpost.ini new file mode 100644 index 0000000..fe2166c --- /dev/null +++ b/config/signpost.ini @@ -0,0 +1,17 @@ +[layout] +min_tilesize = 125 +max_tilesize = 200 + +[full_refresh] +new_puzzle = true +solving_puzzle = true + +[colors] +# From PocketPuzzles, but reversed +_order = black vdarkgrey darkgrey lightgrey vlightgrey white +black = 1.0 +vdarkgrey = 0.6 +darkgrey = 0.5 +lightgrey = 0.4 +vlightgrey = 0.3 +white = 0.0 diff --git a/help/magnets.txt b/help/magnets.txt new file mode 100644 index 0000000..ce6540c --- /dev/null +++ b/help/magnets.txt @@ -0,0 +1,9 @@ +Magnets + +Fill each domino shape with either a magnet (consisting of a + and − pole) or a neutral domino (green). + +The number of + poles that in each row and column must match the numbers along the top and left; the number of − poles must match the numbers along the bottom and right. Two + poles may not be orthogonally adjacent to each other, and similarly two − poles. + +Left-click a domino to toggle it between being empty and being a magnet (the + is placed in the end you click). Long-press to toggle between empty, neutral, and a ?? mark indicating that you're sure it's a magnet but don't yet know which way round it goes. + +Left-click a clue to mark it as done (grey it out). To unmark a clue as done, left-click it again. diff --git a/help/signpost.txt b/help/signpost.txt new file mode 100644 index 0000000..53a1934 --- /dev/null +++ b/help/signpost.txt @@ -0,0 +1,7 @@ +Signpost + +Connect all the squares together into a sequence, so that every square's arrow points towards the square that follows it (though the next square can be any distance away in that direction). + +Left-drag from a square to the square that should follow it, or right-drag from a square to the square that should precede it. + +Left-drag a square off the grid to break all links to it. Long-press a square off the grid to break all links to it and everything else in its connected chain. diff --git a/icons/magnets.png b/icons/magnets.png new file mode 100644 index 0000000000000000000000000000000000000000..bc865f3da6485d615730c2c7374ef91c6c5e6ab4 GIT binary patch literal 1478 zcmZ{keLT|%9LImwhG@)-wwjQqLw-igFyyddEkd2PD-SaorzmapN=Y0lY$&Y=Ln6t(1VCjxOSfD}YD|(pQEeIu(}3)K zMd=7qo)C0ezkksa^C+d`3$=x#>#Db+9*CEWCC&IlV5SG- z1*Wf>RbhqxcT^YEc?C8h=qxv&YcKJbo64q;srNkfku_ZWc~=SDDA(X`xY_$`C>Mu! zSlg)GTq~NKyvw5Zuc`6x9Pi&HLX0# zC@Q`3y-^P*ucl^|Wv;)=nr|2a^_+KO2vhS}3gfqkwvy^MyQWr5*WNQX?IyA51o(}m8ScvH@9byZ3Z{r&L9uJzlZr3Vr9ipY==UHkV&W*k* z{o)AW#qcf)%+fg1qaF1ePrbU&{!m zdH`;r5G>J(7;NGkh>|!^nfz_s-RADu8BA(EX4R)&FM4q(2z4vWO28T(OyEpE|W&p`kAHOQ=p0si)lFEw#pm;x4QR zB&7i%3W#{TWJzSS5Na`x76F>;b6gg)y?_Uei{Z4z##8 zc28);wbulWl?fPG62LJ(%#j_7)LDzR!e7pko9q+vK5Vo)lQY1N0)X7)Ag-N-5XC@> zRYF(zijGP=R`D6d@kySO&>m07pI~O%s%&#aTCXa1teEj{&a3Y@l=M+=>S$D>+QlPM z#|@fGckeTt0$;Z6R%^^a^;3_Iu$oL+5e{?tB8vDfvwF_ymuGG77v@w%3#`8|Y?y0Y z*`Jl?Zkb=8^t%q{1a5yww9&SZ41fuYKm>t0t-G>pI?u;+o$0hNEGU0CDVISNcPz!p z>3%`!2b__ya>0}u33;_yS9IoK*H0I25O<<+*^7lJLvMGGJ^*W$9cP2f`eCCWS9FED zlIqTNz$S%iY296mqy30dxuN(P*^Z+ovZ3YSrV;s>O_Hb5Ca|P}{&J&haolb8`QB@| z=4G-oWHoG3z7OHMt=kLk>dhZ1Hs@;^7HohaE;CYMd5UvY^t#_3{-<`)m?aWC)H-ib z$*(Uxs{zJ`R!+$EwCkTay0FGQh>PmF1$I*_OJpgl)uQu-mD{2x?-Hf{#H{hK`>9VE zly7xxROI*roCT@JA3af$pR66{g_CqQ&eK{D-wlT~w?BGhyyDJ7MTQHL7+64QTh3Fi z-&Hd`iV{8blpoKWNu)5NXv}ClJuzBofW4i)y^S5##?JBRek|V39`Eok;_d9JZu^Y> dCvZ9;D)!{X{|}7xY%!DpfJ6)+@Vz3^{sA{vnqvR} literal 0 HcmV?d00001 diff --git a/icons/signpost.png b/icons/signpost.png new file mode 100644 index 0000000000000000000000000000000000000000..93b40b086605f098d4bbf055a49031004cd704d8 GIT binary patch literal 2093 zcmZ`)YdDm7A0DTjEvH4Twdzva!E3{)6_GrM#d@b9B#~KJ$te{%YfP z%NkTGZ+OUIY-L7-ii{j)n8C~#)102?`LC|`)BEB5aR2V>zOUbX-PiBa@1p-cZ~fKZ zt|kx&`o2D%`&W4BGc;BPfof8@YK638+{x|)LIX_~jnrAunn(P+Jqa2g3Qa0j6fwn@ z>_y~h>#Ww?@Zw-+z>4)%ROG%?0zt$2zaXq%@z$4JGHP1c_VV>~4?5V{cY|`w+RT>!nOzCAd+en1tJO}| zHKB15tE#W2%RTmOB$hF#R)%P}RNsJjk^XPr(LfxBP_J>WTWjvO=O+Nl=(0W@} zL~^asnV}mWpUX6%v38p%8+0ZYcMC5$9)D?yv|e?dZ2EzH`Qc9UoW#r<$hS((=Az}pVY|ntqJp9#pubX z5e8yYns9`aHv$UC0$hE$6v;kas)5&6FLCdpr|;nL^B$g98mk7jd5VK!b<+i5)#r-= zwNl2~G|c@J9}cQ+Bh#QcFJ!~|2$Z!cJwH7R`B8eI4w^@dIo$NKss}pIU*Q_(;pF+q zwaVL>Euc}hQvu&w9-Za}pjq>K@{SwPuAj6eMO;PWG%r(Iv-40B1S&%FH-~cv(B1Q~ zMrcz2V87h7M3V{?Cl}8M_B<6lNv@!+N@d$Jwvz`BML*>5*d@5J;Lg|%ak+qTaTW@O!-QuW z)N-;MF?k231iI4bz!7F~Ka+@-?Vsgt#2nE$5wz;C#C)y*D z@krnIVY5(VzCteXZNU2`ypWW9sci5Iw(G<_OQt9K;BSBgj-iiaw$vyn)p%fKV{O)f8DOhq@`KR{B-^%~S?-OQC5N(s)7E+V(HYhqJasC> z2by6%5TuoKT%-(9rwy0mFZ{txY{lulP5COyvmOxyR1g`&FC^Jq`V;wh1d}ODS(6zp zz?H^-Hl|+-?(skYOP#b0`=fco2r>pD&8;U?&^LDxRxBpBF8Tznp*JYgZivIVm~wE+ zOGVPn`bJAfOyco#rycix>$7xN624MY7kouElW;&m3GKF4K*pR(P{Fob%l#rkFI-F- z$#ysB$hBII#teO+a_))19m-kid&(+cRS7v~*E3Q2Gw9{{JN z?lse#n+>*eIM=&8Vpok8vx;LztAS00tb1y{4v&+YA;Q!nm>ik|1O7lg0{&vB6_lxo zkF!?M5jPpol@ZmPQZ~rRNsPzQ_a`v z%#$X6X{bE^@jQOrwHyp6@Guvy-*3PTZI|Z)?P02TRS_Gk6KW}$TUt=dP65$nm{d8$ z7)Oc}9zwpv+8;E=#;UB_;A`;dV@qsAE9>j`h@kR*6V5-0nWkVJs?lN|tM<+ktxy6QKzC;h_J(M#||4idmFo*LEG(}?RGf-@L4+B**(1e h Date: Tue, 5 Apr 2022 22:55:31 -0400 Subject: [PATCH 6/6] Update help files --- help/magnets.txt | 4 ++-- help/signpost.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/help/magnets.txt b/help/magnets.txt index ce6540c..e6800fd 100644 --- a/help/magnets.txt +++ b/help/magnets.txt @@ -4,6 +4,6 @@ Fill each domino shape with either a magnet (consisting of a + and − pole) The number of + poles that in each row and column must match the numbers along the top and left; the number of − poles must match the numbers along the bottom and right. Two + poles may not be orthogonally adjacent to each other, and similarly two − poles. -Left-click a domino to toggle it between being empty and being a magnet (the + is placed in the end you click). Long-press to toggle between empty, neutral, and a ?? mark indicating that you're sure it's a magnet but don't yet know which way round it goes. +Click a domino to toggle it between being empty and being a magnet (the + is placed in the end you click). Long-press to toggle between empty, neutral, and a ?? mark indicating that you're sure it's a magnet but don't yet know which way round it goes. -Left-click a clue to mark it as done (grey it out). To unmark a clue as done, left-click it again. +Click a clue to mark it as done (grey it out). To unmark a clue as done, click it again. diff --git a/help/signpost.txt b/help/signpost.txt index 53a1934..eddf30e 100644 --- a/help/signpost.txt +++ b/help/signpost.txt @@ -2,6 +2,6 @@ Signpost Connect all the squares together into a sequence, so that every square's arrow points towards the square that follows it (though the next square can be any distance away in that direction). -Left-drag from a square to the square that should follow it, or right-drag from a square to the square that should precede it. +Drag from a square to the square that should follow it, or long-press drag from a square to the square that should precede it. -Left-drag a square off the grid to break all links to it. Long-press a square off the grid to break all links to it and everything else in its connected chain. +Drag a square off the grid to break all links to it. Long-press drag a square off the grid to break all links to it and everything else in its connected chain.