From a0d3bb31352f3a8b8888aae7bafd84f496f2e577 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Fri, 24 Sep 2021 04:34:18 +0000 Subject: [PATCH] Block launching enabled. Co-authored-by: sigonasr2 --- Meteo_Engine.jar | Bin 14238 -> 13357 bytes src/sig/Block.java | 2 +- src/sig/Board.java | 24 ++++++++++++++++++++++-- src/sig/Meteo.java | 4 +--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index 8d657ed60fe3392497a14523661c1e2a21ddb01d..a0676b918106f97feaeb329a56d1b248de093fd7 100644 GIT binary patch delta 7566 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 diff --git a/src/sig/Block.java b/src/sig/Block.java index 4a0b470..8e5ea08 100644 --- a/src/sig/Block.java +++ b/src/sig/Block.java @@ -16,7 +16,7 @@ public class Block{ public Block(int x,int y) { this.x=x; this.y=y; - state = STARTINGSTATES[(int)(Meteo.r.nextInt(1))]; + state = STARTINGSTATES[(int)(Meteo.r.nextInt(3))]; } @Override public String toString() { diff --git a/src/sig/Board.java b/src/sig/Board.java index 2d68892..326a805 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -19,6 +19,13 @@ public class Board { int x,y; int block_width,block_height; double vspeed; + final static BlockState[] STARTINGSTATES = {BlockState.BLUE, + BlockState.GREEN, + BlockState.ORANGE, + BlockState.PURPLE, + BlockState.RED, + BlockState.WHITE, + BlockState.YELLOW,}; List blockClumpDeleteList = new ArrayList(); List blockClumpAddList = new ArrayList(); @@ -127,7 +134,7 @@ public class Board { //System.out.println(blocks.getSortedBlocksOnRow(y)); //System.out.println(blocks.getSortedBlocksOnRow(y)); List blockList = blocks.getSortedBlocksOnRow(y); - System.out.println(" "+blockList); + //System.out.println(" "+blockList); markedBlocks.addAll(FindMatches(blockList)); } for (int x=0;x0) { + int minY=Integer.MAX_VALUE; List newClumpBlocks = new ArrayList(); newClumpBlocks.addAll(markedBlocks); for (Block b : markedBlocks) { b.state = BlockState.IGNITED; //All blocks above marked blocks now join the clump. newClumpBlocks.addAll(blocks.getSortedBlocksOnCol(b.x).stream().filter((block)->!newClumpBlocks.contains(block)&&block.y>b.y).collect(Collectors.toList())); + minY=Math.min(minY,b.y); } //For now just get rid of them. blocks.removeBlock(newClumpBlocks.toArray(new Block[newClumpBlocks.size()])); + for (Block b : newClumpBlocks) { + b.y-=minY; + } + blockClumpAddList.add( + new BlockClump(newClumpBlocks, blocks.x, blocks.y+minY*block_height, launch_power, width, 120) + ); } - return false; + return markedBlocks.size()>0; } private List FindMatches(List blockList) { List markedBlocks = new ArrayList(); @@ -201,6 +216,11 @@ public class Board { blocks.launched--; } else if (blocks.launched==0) { + for (Block b : blocks.getBlocks()) { + if (b.state==BlockState.IGNITED) { + b.state=STARTINGSTATES[(int)(Meteo.r.nextInt(3))]; + } + } SplitBlockClump(blocks); } } diff --git a/src/sig/Meteo.java b/src/sig/Meteo.java index 33eb8f0..c43c5da 100644 --- a/src/sig/Meteo.java +++ b/src/sig/Meteo.java @@ -1,7 +1,5 @@ package sig; -import java.util.ArrayList; -import java.util.List; import java.util.Random; import javax.swing.JFrame; @@ -27,7 +25,7 @@ public class Meteo { public static void main(String[] args) { r = new Random(437210983125739812l); double[] val = {0,0,}; - b = new Board(SCREEN_WIDTH/2,SCREEN_HEIGHT/2,24,24,8,14,-0.065,1,4,-2,val); + b = new Board(SCREEN_WIDTH/2,SCREEN_HEIGHT/2,24,24,8,14,-0.065,5,4,-2,val); JFrame f = new JFrame("Meteo Engine"); Panel p = new Panel();