Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fillapix #569

Merged
merged 50 commits into from
Oct 10, 2023
Merged

Fillapix #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ef1bed2
rework fill-a-pix UI pictures to make clearer
longj6 Jun 18, 2023
4d1fe76
allow right click to cycle backwards through cell states
longj6 Jun 18, 2023
93a11a7
Rename file
longj6 Jun 23, 2023
2344c62
create isComplete utility, begin implementation of CompleteClue case …
longj6 Jun 23, 2023
dea56fe
find number of completion cases for a rule
longj6 Jun 23, 2023
102631d
create icons for more fill-a-pix rules
longj6 Jun 26, 2023
16e2564
implement max possible number of cases
longj6 Jun 30, 2023
8a461ca
fillapix utility for finding all combinations
longj6 Jun 30, 2023
cb36f20
implement CompleteClue case rule, still some bugs
longj6 Jun 30, 2023
2aab6d7
potentially shorten time taken for calculating combinations, catch so…
longj6 Jun 30, 2023
c619f0b
make sure cell has empty adjacent cells before adding it to CompleteC…
longj6 Jun 30, 2023
3418310
combine similar rules into one
longj6 Jul 6, 2023
871785f
begin work on verifying cases
longj6 Jul 6, 2023
7f4b0cf
implement CompleteClueCaseRule
longj6 Jul 15, 2023
1ac948f
fix typo
longj6 Jul 21, 2023
e5eda0d
initial version of MirrorDirectRule
longj6 Jul 21, 2023
a295d51
prevent trying to access out of board bounds
longj6 Jul 21, 2023
8ac6aa7
further changing of contradictions to stop errors
longj6 Jul 21, 2023
bc15350
more stopping of accessing non-existent data
longj6 Jul 21, 2023
4891e6c
remove duplicate methods
longj6 Jul 21, 2023
7644462
complete mirror direct rule
longj6 Jul 21, 2023
6756c13
add another utility
longj6 Jul 21, 2023
f921084
move method of FillapixUtilities
longj6 Jul 21, 2023
e5a8452
add TouchingSides direct rule
longj6 Jul 21, 2023
8a28ab3
Rename a file, complete touching corners rule
longj6 Jul 23, 2023
518607d
touch up some basic rule pictures
longj6 Jul 23, 2023
4994229
add puzzle, rename puzzle
longj6 Jul 27, 2023
03b24e7
implement nontouching shared direct rule
longj6 Jul 27, 2023
eb87a93
implementing fillapix puzzle editor
longj6 Jul 28, 2023
ac3942d
comply with style guide
longj6 Jul 28, 2023
31a2366
make fillapix boards editable through puzzle editor
longj6 Jul 28, 2023
33c938b
better handling of whether or not a cell is numbered
longj6 Jul 28, 2023
7a937d9
give cells in blank board default number
longj6 Jul 28, 2023
bf059f1
remove debug print
longj6 Jul 28, 2023
116e869
register the FillapixView that is created
longj6 Jul 28, 2023
eeb7153
fix setting elements in fillapix puzzle editor
longj6 Aug 2, 2023
8662169
finally fix fillapix puzzle editor
longj6 Aug 2, 2023
92cca33
remove data when setting fillapix cell to empty in puzzle editor
longj6 Aug 2, 2023
b4cd637
remove debug print
longj6 Aug 2, 2023
ede9f3d
add ability to save puzzles created in fillapix puzzle editor
longj6 Aug 3, 2023
35aa1b0
add more fillapix puzzles
longj6 Aug 4, 2023
ea2b674
comply with checkstyle
longj6 Aug 10, 2023
e50a132
Merge branch 'dev' into fillapix
Corppet Oct 3, 2023
ea693c5
Merge remote-tracking branch 'origin/dev' into fillapix
Corppet Oct 3, 2023
7c764c8
Merge branch 'dev' into fillapix
charlestian23 Oct 6, 2023
f8b0eb4
Changed max cases to 10
charlestian23 Oct 6, 2023
5050cbf
Merge remote-tracking branch 'origin/dev' into dev
Corppet Oct 10, 2023
a11ba3b
Merge branch 'dev' into fillapix
Corppet Oct 10, 2023
a68210e
Merge branch 'dev' into fillapix
Corppet Oct 10, 2023
2a26f0a
Merge branch 'dev' into fillapix
Corppet Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/main/edu/rpi/legup/legup/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<puzzle name="Fillapix"
qualifiedClassName="edu.rpi.legup.puzzle.fillapix.Fillapix"
fileType=".xml"
fileCreationDisabled="true"/>
fileCreationDisabled="false"/>
<puzzle name="HeyAwake"
qualifiedClassName="edu.rpi.legup.puzzle.heyawake.Heyawake"
fileType=".xml"
Expand Down Expand Up @@ -40,4 +40,4 @@
fileType=".xml"
fileCreationDisabled="true"/>
</puzzles>
</Legup>
</Legup>
48 changes: 48 additions & 0 deletions puzzles files/fillapix/10x10 Fillapix Advanced/FillapixAdvanced10x10_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Fillapix">
<board width="10" height="10">
<cells>
<cell value="3" x="2" y="0"/>
<cell value="3" x="3" y="0"/>
<cell value="3" x="0" y="1"/>
<cell value="0" x="6" y="1"/>
<cell value="0" x="8" y="1"/>
<cell value="3" x="2" y="2"/>
<cell value="4" x="3" y="2"/>
<cell value="3" x="5" y="2"/>
<cell value="3" x="0" y="3"/>
<cell value="4" x="2" y="3"/>
<cell value="3" x="7" y="3"/>
<cell value="2" x="0" y="4"/>
<cell value="3" x="1" y="4"/>
<cell value="5" x="3" y="4"/>
<cell value="4" x="5" y="4"/>
<cell value="4" x="6" y="4"/>
<cell value="4" x="9" y="4"/>
<cell value="5" x="2" y="5"/>
<cell value="4" x="3" y="5"/>
<cell value="6" x="4" y="5"/>
<cell value="6" x="5" y="5"/>
<cell value="4" x="7" y="5"/>
<cell value="4" x="9" y="5"/>
<cell value="3" x="5" y="6"/>
<cell value="3" x="6" y="6"/>
<cell value="4" x="9" y="6"/>
<cell value="3" x="1" y="7"/>
<cell value="5" x="4" y="7"/>
<cell value="6" x="5" y="7"/>
<cell value="5" x="6" y="7"/>
<cell value="4" x="9" y="7"/>
<cell value="7" x="3" y="8"/>
<cell value="7" x="7" y="8"/>
<cell value="5" x="9" y="8"/>
<cell value="4" x="1" y="9"/>
<cell value="6" x="4" y="9"/>
<cell value="6" x="6" y="9"/>
<cell value="5" x="8" y="9"/>
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
0 ...apix/10x10 Fillapix Very Easy/03010000074 → ...10x10 Fillapix Basic/FillapixBasic10x10_1
View file
Open in desktop
File renamed without changes.
91 changes: 91 additions & 0 deletions puzzles files/fillapix/15x15 Fillapix Advanced/FillapixAdvanced15x15_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<puzzle name="Fillapix">
<board height="15" width="15">
<cells>
<cell value="4" x="3" y="0"/>
<cell value="4" x="6" y="0"/>
<cell value="6" x="8" y="0"/>
<cell value="5" x="10" y="0"/>
<cell value="4" x="11" y="0"/>
<cell value="1" x="14" y="0"/>
<cell value="4" x="1" y="1"/>
<cell value="7" x="9" y="1"/>
<cell value="4" x="2" y="2"/>
<cell value="0" x="5" y="2"/>
<cell value="1" x="6" y="2"/>
<cell value="4" x="8" y="2"/>
<cell value="5" x="10" y="2"/>
<cell value="6" x="12" y="2"/>
<cell value="4" x="0" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="0" x="5" y="3"/>
<cell value="3" x="7" y="3"/>
<cell value="4" x="10" y="3"/>
<cell value="5" x="12" y="3"/>
<cell value="4" x="14" y="3"/>
<cell value="1" x="2" y="4"/>
<cell value="2" x="5" y="4"/>
<cell value="3" x="7" y="4"/>
<cell value="5" x="8" y="4"/>
<cell value="4" x="9" y="4"/>
<cell value="4" x="11" y="4"/>
<cell value="5" x="12" y="4"/>
<cell value="2" x="1" y="5"/>
<cell value="3" x="4" y="5"/>
<cell value="5" x="6" y="5"/>
<cell value="5" x="9" y="5"/>
<cell value="5" x="10" y="5"/>
<cell value="5" x="11" y="5"/>
<cell value="1" x="2" y="6"/>
<cell value="2" x="3" y="6"/>
<cell value="5" x="5" y="6"/>
<cell value="3" x="7" y="6"/>
<cell value="4" x="8" y="6"/>
<cell value="5" x="14" y="6"/>
<cell value="0" x="1" y="7"/>
<cell value="0" x="2" y="7"/>
<cell value="1" x="3" y="7"/>
<cell value="5" x="6" y="7"/>
<cell value="6" x="8" y="7"/>
<cell value="7" x="10" y="7"/>
<cell value="6" x="12" y="7"/>
<cell value="4" x="14" y="7"/>
<cell value="5" x="8" y="8"/>
<cell value="5" x="9" y="8"/>
<cell value="6" x="12" y="8"/>
<cell value="0" x="1" y="9"/>
<cell value="4" x="4" y="9"/>
<cell value="6" x="6" y="9"/>
<cell value="6" x="10" y="9"/>
<cell value="7" x="12" y="9"/>
<cell value="8" x="5" y="10"/>
<cell value="8" x="7" y="10"/>
<cell value="7" x="8" y="10"/>
<cell value="7" x="12" y="10"/>
<cell value="3" x="14" y="10"/>
<cell value="5" x="2" y="11"/>
<cell value="7" x="4" y="11"/>
<cell value="8" x="6" y="11"/>
<cell value="7" x="8" y="11"/>
<cell value="7" x="9" y="11"/>
<cell value="5" x="12" y="11"/>
<cell value="2" x="1" y="12"/>
<cell value="8" x="3" y="12"/>
<cell value="8" x="5" y="12"/>
<cell value="6" x="9" y="12"/>
<cell value="5" x="10" y="12"/>
<cell value="5" x="14" y="12"/>
<cell value="1" x="1" y="13"/>
<cell value="5" x="3" y="13"/>
<cell value="5" x="5" y="13"/>
<cell value="3" x="7" y="13"/>
<cell value="5" x="10" y="13"/>
<cell value="3" x="12" y="13"/>
<cell value="4" x="14" y="13"/>
<cell value="2" x="11" y="14"/>
<cell value="3" x="12" y="14"/>
</cells>
</board>
</puzzle>
</Legup>
111 changes: 111 additions & 0 deletions puzzles files/fillapix/15x15 Fillapix Basic/FillapixBasic15x15_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<puzzle name="Fillapix">
<board height="15" width="15">
<cells>
<cell value="0" x="0" y="0"/>
<cell value="4" x="3" y="0"/>
<cell value="3" x="4" y="0"/>
<cell value="2" x="5" y="0"/>
<cell value="1" x="6" y="0"/>
<cell value="3" x="12" y="0"/>
<cell value="5" x="2" y="1"/>
<cell value="4" x="5" y="1"/>
<cell value="4" x="8" y="1"/>
<cell value="4" x="9" y="1"/>
<cell value="3" x="14" y="1"/>
<cell value="5" x="1" y="2"/>
<cell value="4" x="2" y="2"/>
<cell value="5" x="3" y="2"/>
<cell value="4" x="4" y="2"/>
<cell value="5" x="5" y="2"/>
<cell value="5" x="6" y="2"/>
<cell value="5" x="8" y="2"/>
<cell value="3" x="9" y="2"/>
<cell value="1" x="11" y="2"/>
<cell value="2" x="12" y="2"/>
<cell value="3" x="14" y="2"/>
<cell value="4" x="0" y="3"/>
<cell value="4" x="4" y="3"/>
<cell value="4" x="7" y="3"/>
<cell value="2" x="8" y="3"/>
<cell value="1" x="10" y="3"/>
<cell value="5" x="2" y="4"/>
<cell value="4" x="3" y="4"/>
<cell value="2" x="5" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="1" x="8" y="4"/>
<cell value="0" x="9" y="4"/>
<cell value="7" x="12" y="4"/>
<cell value="5" x="13" y="4"/>
<cell value="5" x="3" y="5"/>
<cell value="0" x="6" y="5"/>
<cell value="4" x="11" y="5"/>
<cell value="5" x="12" y="5"/>
<cell value="2" x="14" y="5"/>
<cell value="4" x="0" y="6"/>
<cell value="5" x="3" y="6"/>
<cell value="4" x="4" y="6"/>
<cell value="2" x="5" y="6"/>
<cell value="0" x="6" y="6"/>
<cell value="0" x="7" y="6"/>
<cell value="5" x="11" y="6"/>
<cell value="6" x="12" y="6"/>
<cell value="5" x="0" y="7"/>
<cell value="6" x="3" y="7"/>
<cell value="5" x="4" y="7"/>
<cell value="3" x="10" y="7"/>
<cell value="3" x="11" y="7"/>
<cell value="3" x="12" y="7"/>
<cell value="3" x="14" y="7"/>
<cell value="5" x="2" y="8"/>
<cell value="5" x="4" y="8"/>
<cell value="3" x="5" y="8"/>
<cell value="3" x="12" y="8"/>
<cell value="5" x="0" y="9"/>
<cell value="6" x="3" y="9"/>
<cell value="5" x="4" y="9"/>
<cell value="3" x="6" y="9"/>
<cell value="5" x="7" y="9"/>
<cell value="6" x="9" y="9"/>
<cell value="0" x="12" y="9"/>
<cell value="0" x="14" y="9"/>
<cell value="5" x="2" y="10"/>
<cell value="4" x="4" y="10"/>
<cell value="3" x="5" y="10"/>
<cell value="2" x="6" y="10"/>
<cell value="4" x="7" y="10"/>
<cell value="5" x="8" y="10"/>
<cell value="4" x="10" y="10"/>
<cell value="1" x="13" y="10"/>
<cell value="7" x="1" y="11"/>
<cell value="5" x="4" y="11"/>
<cell value="1" x="7" y="11"/>
<cell value="5" x="9" y="11"/>
<cell value="5" x="10" y="11"/>
<cell value="5" x="11" y="11"/>
<cell value="6" x="2" y="12"/>
<cell value="4" x="3" y="12"/>
<cell value="4" x="4" y="12"/>
<cell value="4" x="5" y="12"/>
<cell value="3" x="6" y="12"/>
<cell value="1" x="7" y="12"/>
<cell value="2" x="8" y="12"/>
<cell value="4" x="9" y="12"/>
<cell value="6" x="12" y="12"/>
<cell value="4" x="13" y="12"/>
<cell value="5" x="1" y="13"/>
<cell value="6" x="3" y="13"/>
<cell value="4" x="9" y="13"/>
<cell value="6" x="10" y="13"/>
<cell value="3" x="6" y="14"/>
<cell value="2" x="7" y="14"/>
<cell value="0" x="8" y="14"/>
<cell value="4" x="10" y="14"/>
<cell value="4" x="11" y="14"/>
<cell value="3" x="12" y="14"/>
<cell value="2" x="14" y="14"/>
</cells>
</board>
</puzzle>
</Legup>
Loading
Loading