Skip to content

Commit

Permalink
Merge branch 'dev' into sudoku
Browse files Browse the repository at this point in the history
  • Loading branch information
@kchiu1
kchiu1 authored Apr 16, 2024
2 parents 31c3ead + 4e64baf commit 63de212
Show file tree
Hide file tree
Showing 67 changed files with 2,954 additions and 14 deletions.
6 changes: 5 additions & 1 deletion bin/main/edu/rpi/legup/legup/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@
<puzzle name="Sudoku" qualifiedClassName="edu.rpi.legup.puzzle.sudoku.Sudoku"
fileType=".xml"
fileCreationDisabled="true"/>
<puzzle name="StarBattle"
qualifiedClassName="edu.rpi.legup.puzzle.starbattle.StarBattle"
fileType=".xml"
fileCreationDisabled="true"/>
<puzzle name="TreeTent"
qualifiedClassName="edu.rpi.legup.puzzle.treetent.TreeTent"
fileType=".xml"
fileCreationDisabled="false"/>
<puzzle name="Skyscrapers"
qualifiedClassName="edu.rpi.legup.puzzle.skyscrapers.Skyscrapers"
fileType=".xml"
fileCreationDisabled="false"/>
fileCreationDisabled="true"/>
</puzzles>
</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
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
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
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>
68 changes: 68 additions & 0 deletions puzzles files/starbattle/6x6 Star Battle 1 star Normal/6x6 StarBattle 1star Normal3.xml
View file
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="0" y="1"/>
<cell value="0" x="0" y="2"/>
<cell value="0" x="0" y="3"/>
</cells>
</region>
<region>
<cells>
<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="1" y="1"/>
<cell value="0" x="2" y="2"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="5" y="0"/>
<cell value="0" x="4" y="1"/>
<cell value="0" x="5" y="1"/>
<cell value="0" x="4" y="2"/>
<cell value="0" x="5" y="3"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="3" y="1"/>
<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="3" y="3"/>
<cell value="0" x="4" y="3"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="1" y="3"/>
<cell value="0" x="2" y="3"/>
<cell value="0" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
<cell value="0" x="0" y="5"/>
<cell value="0" x="1" y="5"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="5" y="3"/>
<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>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
85 changes: 85 additions & 0 deletions puzzles files/starbattle/7x7 Star Battle 1 star Hard/7x7 Star Battle 1star Hard1.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Legup version="2.0.0">
<puzzle name="StarBattle">
<board size="7" 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"/>
<cell value="0" x="2" y="1"/>
<cell value="0" x="3" 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"/>
</cells>
</region>
<region>
<cells>
<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="6" y="0"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="4" y="1"/>
<cell value="0" x="5" y="1"/>
<cell value="0" x="6" y="1"/>
<cell value="0" x="6" y="2"/>
<cell value="0" x="6" y="3"/>
</cells>
</region>
<region>
<cells>
<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="5" y="2"/>
<cell value="0" x="5" y="3"/>
<cell value="0" x="5" y="4"/>
<cell value="0" x="5" y="5"/>
<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="2" y="3"/>
<cell value="0" x="2" y="4"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="3" y="3"/>
<cell value="0" x="4" y="3"/>
<cell value="0" x="3" y="4"/>
<cell value="0" x="4" y="4"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
<cell value="0" x="0" y="5"/>
<cell value="0" x="1" y="5"/>
<cell value="0" x="0" y="6"/>
<cell value="0" x="1" y="6"/>
<cell value="0" x="2" y="6"/>
<cell value="0" x="3" y="6"/>
<cell value="0" x="4" y="6"/>
</cells>
</region>
<region>
<cells>
<cell value="0" x="6" y="4"/>
<cell value="0" x="6" y="5"/>
<cell value="0" x="5" y="6"/>
<cell value="0" x="6" y="6"/>
</cells>
</region>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
Loading

0 comments on commit 63de212

Please sign in to comment.