sigonasr2/meteo_engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Successfully detects matches in vertical and horizontal directions

Browse Source
This commit is contained in:
sigonasr2, Sig, Sigo 2021-09-23 06:01:04 +00:00
parent 63bf02aa4c
commit 6ed1928bf3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Meteo_Engine.jar
View File

Binary file not shown.

8
src/sig/Board.java
View File

@ -125,21 +125,21 @@ public class Board {
for (int y=0;y<blocks.maxBlockHeight;y++) { for (int y=0;y<blocks.maxBlockHeight;y++) {
//System.out.println(blocks.getSortedBlocksOnRow(y)); //System.out.println(blocks.getSortedBlocksOnRow(y));
List<Block> blockList = blocks.getSortedBlocksOnRow(y); List<Block> blockList = blocks.getSortedBlocksOnRow(y);
List<Block> markedBlocks = FindMatches(blockList,width); List<Block> markedBlocks = FindMatches(blockList,width,true);
if (markedBlocks.size()>0) { //Ignite these blocks. if (markedBlocks.size()>0) { //Ignite these blocks.
System.out.println("Marked: "+markedBlocks); System.out.println("Marked: "+markedBlocks);
} }
} }
for (int x=0;x<width;x++) { for (int x=0;x<width;x++) {
List<Block> blockList = blocks.getSortedBlocksOnCol(x); List<Block> blockList = blocks.getSortedBlocksOnCol(x);
List<Block> markedBlocks = FindMatches(blockList,blocks.maxBlockHeight); List<Block> markedBlocks = FindMatches(blockList,blocks.maxBlockHeight,false);
if (markedBlocks.size()>0) { //Ignite these blocks. if (markedBlocks.size()>0) { //Ignite these blocks.
System.out.println("Marked: "+markedBlocks); System.out.println("Marked: "+markedBlocks);
} }
} }
return false; return false;
} }
private List<Block> FindMatches(List<Block> blockList, int maxSearch) { private List<Block> FindMatches(List<Block> blockList, int maxSearch, boolean searchingRows) {
BlockState col = BlockState.IGNITED; BlockState col = BlockState.IGNITED;
int matches=0; int matches=0;
List<Block> markedBlocks = new ArrayList<Block>(); List<Block> markedBlocks = new ArrayList<Block>();
@ -147,7 +147,7 @@ public class Board {
for (int i=0;i<maxSearch;i++) { for (int i=0;i<maxSearch;i++) {
if (blockList.isEmpty()) {break;} if (blockList.isEmpty()) {break;}
Block currentBlock = blockList.get(0); Block currentBlock = blockList.get(0);
if (currentBlock.x==i) { if (searchingRows&&currentBlock.x==i||(!searchingRows&&currentBlock.y==i)) {
if (col!=BlockState.IGNITED&&currentBlock.state==col) { if (col!=BlockState.IGNITED&&currentBlock.state==col) {
matches++; matches++;
tempMarkedBlocks.add(blockList.remove(0)); tempMarkedBlocks.add(blockList.remove(0));