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

Spring Merge #818

Merged
merged 96 commits into from
Jun 1, 2024
Merged

Spring Merge #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
bcc904a
Added a text file
EmilioBejasa Feb 2, 2024
9fa0e02
Imported the black and star tiles
EmilioBejasa Feb 9, 2024
17d26d7
Added UnknownTile
EmilioBejasa Feb 10, 2024
8955343
Create StarBattleCellType.java
summerhenson Feb 13, 2024
1ad2347
Update StarBattleCellType.java
summerhenson Feb 13, 2024
12b7a43
Added StarBattle.java
EmilioBejasa Feb 13, 2024
24450fd
Added White Tile and finished starter code for Cell
EmilioBejasa Feb 14, 2024
c64481d
create StarBattleBoard.java
sarah-min Feb 16, 2024
4b07c3b
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Feb 16, 2024
f3b2383
Added getRow, getCol, and potential group implementation for later.
EmilioBejasa Feb 16, 2024
f6e11dc
Update allfiles.txt
summerhenson Feb 23, 2024
9c3daa7
Direct Rule Classes
summerhenson Feb 23, 2024
cda9403
Added javadoc to cell
EmilioBejasa Feb 23, 2024
0fb71de
Adding barebones Contradiction Rules Files
EmilioBejasa Feb 23, 2024
cef9d47
Added the Element and Board Controller
EmilioBejasa Feb 23, 2024
973f041
Added View file
EmilioBejasa Feb 24, 2024
3fe6695
Create StarOrEmptyCaseRule.java
summerhenson Feb 27, 2024
e677a6e
Adding Region files
EmilioBejasa Feb 27, 2024
738fbf9
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Feb 27, 2024
23df2a1
Added the first XML puzzle file to be read later.
EmilioBejasa Feb 27, 2024
47337b7
Implement Surround Star Direct Rule
summerhenson Feb 27, 2024
fa518b1
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Feb 27, 2024
024aa4f
Changed files to java instead of text.
summerhenson Feb 27, 2024
2d9dc03
created add star case rule and reference sheet to keep track of the r…
sarah-min Feb 27, 2024
3dd86fb
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Feb 27, 2024
7f2406c
New puzzle
EmilioBejasa Mar 12, 2024
555890a
Add Regions to StarBattleBoard
summerhenson Mar 12, 2024
1f72e6a
Changed some elements in puzzles and added importer
EmilioBejasa Mar 12, 2024
31a311d
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Mar 12, 2024
be30904
Blackout rule check method
summerhenson Mar 12, 2024
f37f4ef
FinishWithStars rule check method
summerhenson Mar 12, 2024
337f8b0
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Mar 12, 2024
9fe76cb
Deleted Add Star Case Rule, started on Clashing Orbit
sarah-min Mar 12, 2024
28376ed
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Mar 12, 2024
78069d4
Added importer
EmilioBejasa Mar 12, 2024
5e32a0f
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Mar 12, 2024
4b75d46
Fix clashing orbit bugs
summerhenson Mar 15, 2024
900854f
Add puzzle number field to board
summerhenson Mar 15, 2024
e0db103
Contradiction check function for too few stars
summerhenson Mar 15, 2024
e8375db
Changed importer and xml files to include puzzleNum
EmilioBejasa Mar 15, 2024
52c1aee
Rule check method for star or empty case rule
summerhenson Mar 15, 2024
f4b0168
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Mar 15, 2024
08492e1
Added exporter
EmilioBejasa Mar 15, 2024
1940e5a
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Mar 15, 2024
cbe1635
Updated TooManyStarsContradictionRule
sarah-min Mar 16, 2024
dd8b3fe
added region check to TooManyStarsContradictionRule
sarah-min Mar 19, 2024
2555896
Split up row/column and region containment rules into separate rules …
summerhenson Mar 19, 2024
489f31d
Create StarBattleCellFactory.java
EmilioBejasa Mar 19, 2024
2662b93
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Mar 19, 2024
3fab333
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Mar 19, 2024
7674f22
Start implementing columns within regions direct rule
summerhenson Mar 19, 2024
53a5004
Continue columns within regions
summerhenson Mar 19, 2024
eee926b
reworked TooManyStars logic
sarah-min Mar 20, 2024
3a033cd
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Mar 20, 2024
59c8d6f
Exporter and Cell Factory started
EmilioBejasa Mar 22, 2024
9d5362b
Update StarBattleCellFactory.java
EmilioBejasa Mar 22, 2024
0deae52
Deleted extraneous libraries, and finished going thru guide of implem…
EmilioBejasa Mar 22, 2024
2ba4382
Implemented rule check function for region/row/column overlap rules
summerhenson Mar 22, 2024
49cd17e
Minor changes to direct rules
summerhenson Mar 22, 2024
096f070
Added StarBattle to config
EmilioBejasa Mar 22, 2024
71ba357
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Mar 22, 2024
b713212
Reorganized puzzle files (put in subdirectories)
sarah-min Mar 26, 2024
52220ca
Created 8x8 1 star puzzle
sarah-min Mar 26, 2024
e2db3f2
Created more puzzles
sarah-min Mar 26, 2024
f747aa8
Update StarBattleView.java
EmilioBejasa Mar 29, 2024
23c3d92
Wrote 5x5 puzzle file 1
summerhenson Mar 29, 2024
99e431f
StarBattle Runs
EmilioBejasa Mar 29, 2024
92f99d0
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Mar 29, 2024
63ea491
Fix spelling error
summerhenson Mar 29, 2024
617b0ac
Update StarBattleController.java
EmilioBejasa Mar 29, 2024
fe5800b
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
EmilioBejasa Mar 29, 2024
b3452a8
Created more puzzles
sarah-min Mar 29, 2024
7bfa85b
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Mar 29, 2024
85c9b7c
created image for star or empty case rule
sarah-min Apr 2, 2024
8482770
Deleted WHITE element
EmilioBejasa Apr 2, 2024
09263e6
More rule images
sarah-min Apr 2, 2024
b53a5f0
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Apr 2, 2024
999fa17
Made small test board
summerhenson Apr 5, 2024
15e19d3
Add image paths to rule constructors
summerhenson Apr 5, 2024
729d6b7
Write first test for blackout direct rule
summerhenson Apr 5, 2024
ee074b1
Test puzzle files
summerhenson Apr 5, 2024
c789e5b
remade images to be 3x3
sarah-min Apr 5, 2024
81179e0
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
sarah-min Apr 5, 2024
c63f882
Added direct rule images, updated image locations
sarah-min Apr 9, 2024
41d8f1e
Fix a puzzle file
summerhenson Apr 9, 2024
0becf20
Merge branch 'star-battle' of https://github.com/Bram-Hub/LEGUP into …
summerhenson Apr 9, 2024
1db4a7a
Fixed some bugs with the rules
summerhenson Apr 9, 2024
4e64baf
Merge branch 'star-battle' into dev
Chase-Grajeda Apr 16, 2024
4a502d5
Checkstyle update
Chase-Grajeda Apr 16, 2024
e7ea944
Update StarBattleBoard.java
Chase-Grajeda Apr 16, 2024
8b2397a
Tree Tent Test Suite (#775)
jadeandtea May 5, 2024
0e8ae65
Issue 784 (#790)
kevinkxu May 5, 2024
58eba41
Binary (#812)
B-McCusker56 May 5, 2024
d68859b
Minesweeper (#815)
vockek May 5, 2024
9b46ce7
Team Thermometers final merge (#816)
morenomarcus03 May 5, 2024
ed91549
Merge branch 'master' into dev
Chase-Grajeda Jun 1, 2024
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
43 changes: 0 additions & 43 deletions bin/main/edu/rpi/legup/legup/config
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions puzzles files/binary/6x6 easy/089764562
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Binary">
<board height="6" width="6">
<cells>
<cell value="0" x="2" y="0"/>
<cell value="1" x="5" y="0"/>
<cell value="1" x="0" y="1"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="1" x="1" y="2"/>
<cell value="1" x="4" y="3"/>
<cell value="1" x="2" y="4"/>
<cell value="0" x="5" y="4"/>
<cell value="0" x="0" y="5"/>
<cell value="0" x="1" y="5"/>
<cell value="1" x="3" y="5"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
21 changes: 21 additions & 0 deletions puzzles files/binary/6x6 easy/128903434
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Binary">
<board height="6" width="6">
<cells>
<cell value="0" x="1" y="0"/>
<cell value="1" x="0" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="0" x="4" y="1"/>
<cell value="0" x="4" y="2"/>
<cell value="0" x="0" y="3"/>
<cell value="1" x="3" y="3"/>
<cell value="0" x="2" y="4"/>
<cell value="1" x="1" y="5"/>
<cell value="0" x="5" y="5"/>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
25 changes: 25 additions & 0 deletions puzzles files/binary/6x6 easy/876868768
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="Binary">
<board height="6" width="6">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="0" x="3" y="0"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="1" x="5" y="1"/>
<cell value="0" x="1" y="2"/>
<cell value="0" x="2" y="2"/>
<cell value="1" x="5" y="2"/>
<cell value="0" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
<cell value="1" x="3" y="4"/>
<cell value="1" x="1" y="5"/>
<cell value="0" x="4" y="5"/>
<cell value="0" x="5" y="5"/>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
28 changes: 28 additions & 0 deletions puzzles files/binary/6x6 easy/927364891
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Binary">
<board height="6" width="6">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="1" x="2" y="0"/>
<cell value="1" x="3" y="0"/>
<cell value="0" x="5" y="0"/>
<cell value="0" x="1" y="1"/>
<cell value="1" x="0" y="2"/>
<cell value="0" x="3" y="2"/>
<cell value="0" x="5" y="2"/>
<cell value="1" x="0" y="3"/>
<cell value="1" x="4" y="3"/>
<cell value="0" x="5" y="3"/>
<cell value="1" x="1" y="4"/>
<cell value="1" x="3" y="4"/>
<cell value="0" x="0" y="5"/>
<cell value="0" x="2" y="5"/>
<cell value="1" x="4" y="5"/>
<cell value="1" x="5" y="5"/>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
11 changes: 11 additions & 0 deletions puzzles files/minesweeper/5x5 Minesweeper Easy/123456
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Minesweeper">
<board height="5" width="5">
<cells>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
53 changes: 53 additions & 0 deletions puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Legup version="2.0.0">
<puzzle name="StarBattle">
<board size="5" puzzle_num="1">
<region>
<cells>
<cell value="0" x="0" y="0"/>
<cell value="0" x="0" y="1"/>
<cell value="0" x="1" y="1"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="1" y="0"/>
<cell value="0" x="2" y="0"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="0" y="2"/>
<cell value="0" x="1" y="2"/>
<cell value="0" x="2" y="2"/>
<cell value="0" x="3" y="2"/>
<cell value="0" x="4" y="2"/>
<cell value="0" x="0" y="3"/>
<cell value="0" x="1" y="3"/>
<cell value="0" x="2" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="0" x="2" y="4"/>
<cell value="0" x="3" y="4"/>
<cell value="0" x="4" y="4"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="3" y="0"/>
<cell value="0" x="4" y="0"/>
<cell value="0" x="3" y="1"/>
<cell value="0" x="4" y="1"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="4" y="3"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
</cells>
</region>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
68 changes: 68 additions & 0 deletions puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="StarBattle">
<board size="6" puzzle_num="1">
<region>
<cells>
<cell value="0" x="0" y="0"/>
<cell value="0" x="1" y="0"/>
<cell value="0" x="2" y="0"/>
<cell value="0" x="3" y="0"/>
<cell value="0" x="4" y="0"/>
<cell value="0" x="5" y="0"/>
<cell value="0" x="0" y="1"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="0" x="4" y="1"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="1" y="1"/>
<cell value="0" x="1" y="2"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="5" y="1"/>
<cell value="0" x="3" y="2"/>
<cell value="0" x="4" y="2"/>
<cell value="0" x="5" y="2"/>
<cell value="0" x="4" y="3"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="0" y="2"/>
<cell value="0" x="0" y="3"/>
<cell value="0" x="0" y="4"/>
<cell value="0" x="2" y="4"/>
<cell value="0" x="0" y="5"/>
<cell value="0" x="1" y="5"/>
<cell value="0" x="2" y="5"/>
<cell value="0" x="3" y="5"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="2" y="2"/>
<cell value="0" x="1" y="3"/>
<cell value="0" x="2" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="0" x="1" y="4"/>
<cell value="0" x="3" y="4"/>
<cell value="0" x="4" y="4"/>
<cell value="0" x="4" y="5"/>
<cell value="0" x="5" y="5"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="5" y="3"/>
<cell value="0" x="5" y="4"/>
</cells>
</region>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
68 changes: 68 additions & 0 deletions puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 Star Battle 1star Normal2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="StarBattle">
<board size="6" puzzle_num="1">
<region>
<cells>
<cell value="0" x="0" y="0"/>
<cell value="0" x="1" y="0"/>
<cell value="0" x="2" y="0"/>
<cell value="0" x="3" y="0"/>
<cell value="0" x="0" y="1"/>
<cell value="0" x="3" y="1"/>
<cell value="0" x="4" y="1"/>
<cell value="0" x="2" y="2"/>
<cell value="0" x="3" y="2"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="4" y="0"/>
<cell value="0" x="5" y="0"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="1" y="1"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="0" y="2"/>
<cell value="0" x="1" y="2"/>
<cell value="0" x="0" y="3"/>
<cell value="0" x="1" y="3"/>
<cell value="0" x="0" y="4"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="5" y="1"/>
<cell value="0" x="4" y="2"/>
<cell value="0" x="5" y="2"/>
<cell value="0" x="5" y="3"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="2" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="0" x="4" y="3"/>
<cell value="0" x="1" y="4"/>
<cell value="0" x="2" y="4"/>
<cell value="0" x="3" y="4"/>
<cell value="0" x="4" y="4"/>
<cell value="0" x="5" y="4"/>
<cell value="0" x="2" y="5"/>
<cell value="0" x="3" y="5"/>
<cell value="0" x="4" y="5"/>
<cell value="0" x="5" y="5"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="0" y="5"/>
<cell value="0" x="1" y="5"/>
</cells>
</region>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
Loading
Loading