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.

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

merged 50 commits into from
Oct 10, 2023

Conversation

jac-oblong
Copy link
Collaborator

@jac-oblong jac-oblong commented Aug 10, 2023

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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Enhancement (improvement to an already existing feature)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

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:

  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (if applicable)
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

longj6 added 30 commits June 18, 2023 16:35
Corppet and others added 3 commits October 3, 2023 17:24
@charlestian23
Copy link
Collaborator

@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.

Copy link
Collaborator

@charlestian23 charlestian23 left a 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.

@jac-oblong
Copy link
Collaborator Author

@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.

@charlestian23
Copy link
Collaborator

@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?

@jac-oblong
Copy link
Collaborator Author

@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.

charlestian23 and others added 5 commits October 6, 2023 17:22
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
Copy link
Collaborator

@Corppet Corppet left a 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.

@Corppet Corppet merged commit b718165 into Bram-Hub:dev Oct 10, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants