-
Notifications
You must be signed in to change notification settings - Fork 82
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.
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
Fillapix #569
Conversation
…me null reference bugs
# Conflicts: # src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java
@jac-oblong How did you generate all of the icons so nicely? They look much better than anything I've tried. Would be good to know for future puzzle development. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed most of the easy stuff first. Everything but 1 file seems good, not sure if that image file was intentionally so small.
src/main/resources/edu/rpi/legup/images/fillapix/cases/BlackOrWhite.png
Outdated
Show resolved
Hide resolved
@charlestian23 I used GIMP to create the images. It wasn't anything fancy, so most image editors should be able to do the same. I was trying to follow the style of the LightUp icons. |
Did you add in the colored highlights to cells in GIMP? I assume you used the puzzle editor to set up the icon and then used GIMP to add those colors and make it square? |
I believe so. I got the red and green colors from the LightUp icons and then drew the square outlines in GIMP. |
Talked to Bram and decided to up the limit to 10.
# Conflicts: # src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java
# Conflicts: # src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There aren't any provided unit tests so it's quite difficult to validate all the changes here. Nevertheless, I did some quick manual testing and didn't find anything alarming, so I'll approve of these for now since they're better than nothing.
Description
This PR adds more rules and puzzle files to the FillaPix puzzle. These new rules include "MirrorDirectRule", "NonTouchingSharedDirectRule", "SatisfyClueCaseRule", "TouchingCornersDirectRule", and "TouchingSidesDirectRule".
Some small quality of life changes were also made to the FillaPix puzzle, namely right clicking going through types of cells in reverse.
A working puzzle editor is also included for FillaPix.
Additionally, it limits the maximum number of cases an application of any Case Rule can generate to 5.
Type of change
How Has This Been Tested?
The testing process largely consisted of solving FillaPix puzzles and ensuring that the application of rules matched what is expected, i.e. a rule does apply when it should and a rule does not apply when it shouldn't.
Checklist: