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

Minesweeper #875

Merged
merged 35 commits into from
Jan 9, 2025
Merged

Minesweeper #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0567f8b
Don't let user change numbers
willyoung366 Oct 1, 2024
7b2b37d
little bug fix
willyoung366 Oct 4, 2024
0cc33f2
new minesweeper puzzle
willyoung366 Oct 4, 2024
f44d4b3
fixes to some rules
willyoung366 Oct 12, 2024
5231687
Another board
willyoung366 Oct 12, 2024
25455b1
new rule
willyoung366 Oct 20, 2024
d4a85d9
Minesweeper
willyoung366 Oct 25, 2024
4db1bf9
Minesweeper changes
willyoung366 Nov 1, 2024
fd909de
New rule added
willyoung366 Nov 2, 2024
7832044
2-2-X case rule update
willyoung366 Nov 2, 2024
7e50edd
1-2-X rule DONE
willyoung366 Nov 5, 2024
9a26831
1-1-E direct rule
willyoung366 Nov 8, 2024
4c16ac3
Some changes
willyoung366 Nov 9, 2024
3642a16
Must Contain Bomb Direct Rule test
willyoung366 Nov 14, 2024
e0c311e
Must Not Contain Bomb test cases
willyoung366 Nov 14, 2024
0e3ceb6
New Minesweeper rules images
willyoung366 Nov 15, 2024
3a3e222
Merge branch 'Bram-Hub:master' into local-brancj
willyoung366 Nov 19, 2024
f62a86c
massive refacotring
willyoung366 Nov 20, 2024
33c5f5c
Merge branch 'local-brancj' of https://github.com/willyoung366/will-l…
willyoung366 Nov 20, 2024
fafd7d6
finished test suites for direct rules
willyoung366 Nov 22, 2024
8c7ebf8
Test suites for case rules
willyoung366 Nov 27, 2024
e7a6546
Contradiction Rules Test
willyoung366 Nov 27, 2024
5357d7c
couple tiny changes
willyoung366 Nov 27, 2024
d589811
bug fixes
willyoung366 Dec 2, 2024
63cf5a4
remove print
willyoung366 Dec 2, 2024
18a8cb2
Merge branch 'minesweeper' into local-brancj
willyoung366 Dec 2, 2024
2085954
Merge pull request #872 from Bram-Hub/dev
jadeandtea Dec 2, 2024
28b12fe
prepare to merge
willyoung366 Dec 2, 2024
420a535
prepare to merge part 2
willyoung366 Dec 2, 2024
174518c
1 comment
willyoung366 Dec 2, 2024
94d74f0
some small improvements
willyoung366 Dec 7, 2024
67e5143
new rule + test suite for the rule
willyoung366 Dec 7, 2024
390e57d
Merge pull request #871 from willyoung366/local-brancj
jadeandtea Jan 8, 2025
14c95d4
Merge branch 'dev' into minesweeper
jadeandtea Jan 8, 2025
c57d4d7
Automated Java code formatting changes
Bram28 Jan 8, 2025
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
24 changes: 24 additions & 0 deletions puzzles files/minesweeper/5x5 Minesweeper Easy/Minesweeper 5x5 easy 1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="5" width="5">
<cells>
<cell value="1" x="1" y="0"/>
<cell value="1" x="2" y="0"/>
<cell value="2" x="3" y="0"/>
<cell value="1" x="4" y="0"/>
<cell value="2" x="1" y="1"/>
<cell value="5" x="3" y="1"/>
<cell value="1" x="0" y="2"/>
<cell value="3" x="1" y="2"/>
<cell value="2" x="1" y="3"/>
<cell value="4" x="3" y="3"/>
<cell value="3" x="4" y="3"/>
<cell value="1" x="0" y="4"/>
<cell value="1" x="1" y="4"/>
<cell value="1" x="3" y="4"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
26 changes: 26 additions & 0 deletions puzzles files/minesweeper/5x5 Minesweeper Easy/Minesweeper 5x5 easy 2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="5" width="5">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="1" x="1" y="0"/>
<cell value="2" x="1" y="1"/>
<cell value="3" x="2" y="1"/>
<cell value="3" x="4" y="1"/>
<cell value="2" x="0" y="2"/>
<cell value="2" x="2" y="2"/>
<cell value="1" x="3" y="2"/>
<cell value="1" x="4" y="2"/>
<cell value="1" x="0" y="3"/>
<cell value="1" x="1" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="1" x="3" y="3"/>
<cell value="1" x="4" y="3"/>
<cell value="1" x="2" y="4"/>
<cell value="1" x="4" y="4"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
25 changes: 25 additions & 0 deletions puzzles files/minesweeper/5x5 Minesweeper Easy/Minesweeper 5x5 easy 3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="5" width="5">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="1" x="1" y="0"/>
<cell value="1" x="3" y="0"/>
<cell value="1" x="1" y="1"/>
<cell value="1" x="3" y="1"/>
<cell value="1" x="4" y="1"/>
<cell value="1" x="0" y="2"/>
<cell value="1" x="1" y="2"/>
<cell value="2" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="1" x="3" y="3"/>
<cell value="1" x="4" y="3"/>
<cell value="2" x="2" y="4"/>
<cell value="1" x="4" y="4"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
41 changes: 41 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Easy/Minesweeper 7x7 easy1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="1" x="1" y="0"/>
<cell value="3" x="2" y="0"/>
<cell value="2" x="4" y="0"/>
<cell value="1" x="5" y="0"/>
<cell value="1" x="0" y="1"/>
<cell value="5" x="2" y="1"/>
<cell value="3" x="4" y="1"/>
<cell value="2" x="5" y="1"/>
<cell value="2" x="6" y="1"/>
<cell value="1" x="0" y="2"/>
<cell value="2" x="1" y="2"/>
<cell value="3" x="4" y="2"/>
<cell value="2" x="5" y="2"/>
<cell value="1" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="3" x="2" y="3"/>
<cell value="3" x="3" y="3"/>
<cell value="3" x="4" y="3"/>
<cell value="2" x="6" y="3"/>
<cell value="1" x="1" y="4"/>
<cell value="2" x="2" y="4"/>
<cell value="3" x="4" y="4"/>
<cell value="1" x="5" y="4"/>
<cell value="1" x="6" y="4"/>
<cell value="1" x="0" y="5"/>
<cell value="2" x="1" y="5"/>
<cell value="4" x="2" y="5"/>
<cell value="3" x="4" y="5"/>
<cell value="1" x="1" y="6"/>
<cell value="2" x="4" y="6"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
37 changes: 37 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Easy/Minesweeper 7x7 easy2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="3" x="1" y="0"/>
<cell value="3" x="3" y="0"/>
<cell value="1" x="5" y="0"/>
<cell value="3" x="0" y="1"/>
<cell value="4" x="2" y="1"/>
<cell value="2" x="4" y="1"/>
<cell value="1" x="6" y="1"/>
<cell value="4" x="1" y="2"/>
<cell value="2" x="3" y="2"/>
<cell value="2" x="5" y="2"/>
<cell value="0" x="0" y="3"/>
<cell value="3" x="0" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="2" x="3" y="3"/>
<cell value="1" x="4" y="3"/>
<cell value="3" x="5" y="3"/>
<cell value="2" x="1" y="4"/>
<cell value="2" x="3" y="4"/>
<cell value="4" x="5" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="1" x="0" y="5"/>
<cell value="2" x="3" y="5"/>
<cell value="1" x="6" y="5"/>
<cell value="1" x="3" y="6"/>
<cell value="2" x="4" y="6"/>
<cell value="2" x="5" y="6"/>
<cell value="1" x="6" y="6"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
41 changes: 41 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Easy/Minesweeper 7x7 easy3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="3" x="2" y="0"/>
<cell value="1" x="4" y="0"/>
<cell value="4" x="0" y="1"/>
<cell value="4" x="2" y="1"/>
<cell value="1" x="3" y="1"/>
<cell value="2" x="4" y="1"/>
<cell value="2" x="5" y="1"/>
<cell value="2" x="6" y="1"/>
<cell value="2" x="0" y="2"/>
<cell value="2" x="2" y="2"/>
<cell value="1" x="4" y="2"/>
<cell value="2" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="1" x="2" y="3"/>
<cell value="2" x="4" y="3"/>
<cell value="4" x="5" y="3"/>
<cell value="2" x="1" y="4"/>
<cell value="1" x="2" y="4"/>
<cell value="1" x="3" y="4"/>
<cell value="1" x="4" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="1" x="0" y="5"/>
<cell value="2" x="1" y="5"/>
<cell value="2" x="3" y="5"/>
<cell value="3" x="4" y="5"/>
<cell value="2" x="5" y="5"/>
<cell value="2" x="6" y="5"/>
<cell value="1" x="1" y="6"/>
<cell value="2" x="2" y="6"/>
<cell value="2" x="4" y="6"/>
<cell value="1" x="6" y="6"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
59 changes: 59 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Medium/Minesweeper 7x7 medium1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="-2" x="0" y="0"/>
<cell value="-2" x="1" y="0"/>
<cell value="-2" x="2" y="0"/>
<cell value="-2" x="3" y="0"/>
<cell value="1" x="4" y="0"/>
<cell value="2" x="5" y="0"/>
<cell value="-2" x="6" y="0"/>
<cell value="-2" x="0" y="1"/>
<cell value="4" x="1" y="1"/>
<cell value="-2" x="2" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="0" x="4" y="1"/>
<cell value="0" x="5" y="1"/>
<cell value="-2" x="6" y="1"/>
<cell value="-2" x="0" y="2"/>
<cell value="1" x="1" y="2"/>
<cell value="-2" x="2" y="2"/>
<cell value="2" x="3" y="2"/>
<cell value="-2" x="4" y="2"/>
<cell value="5" x="5" y="2"/>
<cell value="3" x="6" y="2"/>
<cell value="-2" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="-2" x="2" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="-2" x="4" y="3"/>
<cell value="-2" x="5" y="3"/>
<cell value="-2" x="6" y="3"/>
<cell value="-2" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
<cell value="0" x="2" y="4"/>
<cell value="-2" x="3" y="4"/>
<cell value="-2" x="4" y="4"/>
<cell value="6" x="5" y="4"/>
<cell value="-2" x="6" y="4"/>
<cell value="-2" x="0" y="5"/>
<cell value="5" x="1" y="5"/>
<cell value="3" x="2" y="5"/>
<cell value="-2" x="3" y="5"/>
<cell value="-2" x="4" y="5"/>
<cell value="-2" x="5" y="5"/>
<cell value="0" x="6" y="5"/>
<cell value="-2" x="0" y="6"/>
<cell value="-2" x="1" y="6"/>
<cell value="-2" x="2" y="6"/>
<cell value="0" x="3" y="6"/>
<cell value="2" x="4" y="6"/>
<cell value="1" x="5" y="6"/>
<cell value="1" x="6" y="6"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
24 changes: 24 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Medium/Minesweeper 7x7 medium2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="2" x="5" y="0"/>
<cell value="3" x="1" y="1"/>
<cell value="7" x="3" y="1"/>
<cell value="2" x="5" y="1"/>
<cell value="3" x="0" y="3"/>
<cell value="4" x="2" y="3"/>
<cell value="2" x="5" y="3"/>
<cell value="2" x="6" y="3"/>
<cell value="3" x="2" y="4"/>
<cell value="4" x="5" y="5"/>
<cell value="1" x="0" y="6"/>
<cell value="3" x="1" y="6"/>
<cell value="2" x="3" y="6"/>
<cell value="2" x="5" y="6"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
30 changes: 30 additions & 0 deletions puzzles files/minesweeper/7x7 Minesweeper Medium/Minesweeper 7x7 medium3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="7" width="7">
<cells>
<cell value="3" x="5" y="0"/>
<cell value="3" x="5" y="1"/>
<cell value="3" x="3" y="2"/>
<cell value="3" x="5" y="4"/>
<cell value="0" x="4" y="4"/>
<cell value="-2" x="6" y="4"/>
<cell value="0" x="6" y="3"/>
<cell value="0" x="5" y="3"/>
<cell value="3" x="3" y="4"/>
<cell value="0" x="3" y="5"/>
<cell value="0" x="2" y="5"/>
<cell value="0" x="4" y="5"/>
<cell value="3" x="0" y="6"/>
<cell value="0" x="1" y="3"/>
<cell value="0" x="1" y="4"/>
<cell value="3" x="2" y="4"/>
<cell value="3" x="6" y="6"/>
<cell value="3" x="2" y="0"/>
<cell value="3" x="0" y="2"/>
<cell value="0" x="1" y="2"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
23 changes: 19 additions & 4 deletions puzzles files/skyscrapers/5x5 Skyscrapers Easy1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Skyscrapers" tag="5x5 Skyscrapers Easy1">
<board size="5">
<cells>

</cells>
<cells/>
<axis side="east">
<clue index="3" value="2"/>
<clue index="1" value="3"/>
Expand All @@ -20,5 +19,21 @@
</axis>
<flags dupe="true" view="false"/>
</board>
<proof>
<tree>
<node id="864747711" root="true">
<transition child="633206242" id="1863671408" rule="Last Visible Number" rule_id="SKYS-BASC-0005">
<cell value="5" x="4" y="4"/>
</transition>
</node>
<node id="633206242">
<transition child="399424725" id="953473809" rule="Number For Cell" rule_id="SKYS-CASE-0001">
<cell value="1" x="3" y="4"/>
</transition>
</node>
<node id="399424725"/>
</tree>
</proof>
</puzzle>
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/></Legup>
<solved isSolved="false" lastSaved="2024-10-10 15:16:07"/>
</Legup>
2 changes: 2 additions & 0 deletions src/main/java/edu/rpi/legup/model/Puzzle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ public void removeDirectRule(DirectRule rule) {

/**
* Accessor method for the puzzle UUID
*
* @return returns the puzzle UUID tag
*/
public String getTag() {
Expand All @@ -391,6 +392,7 @@ public String getTag() {

/**
* Modifier method to override the puzzle persistent UUID
*
* @param tag String to overwrite the current puzzle UUID
*/
public void setTag(String tag) {
Expand Down
Loading