From 4298dfceb290d8deb3bb973713b2b61f9bed920f Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Fri, 24 Sep 2021 01:52:58 +0000 Subject: [PATCH] Fixed reset bug for block clearing. --- Meteo_Engine.jar | Bin 14325 -> 14238 bytes src/sig/Block.java | 2 +- src/sig/BlockClump.java | 3 ++- src/sig/Board.java | 43 +++++++++++++++++++++++----------------- src/sig/Meteo.java | 3 +++ 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index ee98b0e782cd67ec83ff10236bf36475595c0400..8d657ed60fe3392497a14523661c1e2a21ddb01d 100644 GIT binary patch delta 10189 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 TPk|uBo#@3+gYuK-Uu*vdT0EQR diff --git a/src/sig/Block.java b/src/sig/Block.java index 1fc2a7e..4a0b470 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)(Math.random()*1)]; + state = STARTINGSTATES[(int)(Meteo.r.nextInt(1))]; } @Override public String toString() { diff --git a/src/sig/BlockClump.java b/src/sig/BlockClump.java index ed7216b..6a4b780 100644 --- a/src/sig/BlockClump.java +++ b/src/sig/BlockClump.java @@ -43,8 +43,9 @@ public class BlockClump { public void addBlock(Block...blocks) { //Adds the block to the strucutre. Update collision column ranges to reflect the new bounds. for (Block b : blocks) - {updateBlockCollisionRangeWithBlock(b); + { this.blocks.add(b); + updateBlockCollisionRangeWithBlock(b); } } public void removeBlock(Block...blocks) { diff --git a/src/sig/Board.java b/src/sig/Board.java index 560563e..2d68892 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -38,9 +38,9 @@ public class Board { this.combo_power_bonus = combo_power_bonus; this.blockData = new ArrayList(); - List initialBlocks = new ArrayList(); + /*List initialBlocks = new ArrayList(); for (int x=0;x initialBlocks2 = new ArrayList(); for (int x=0;x blockList = blocks.getSortedBlocksOnRow(y); - markedBlocks.addAll(FindMatches(blockList,width,true)); + System.out.println(" "+blockList); + markedBlocks.addAll(FindMatches(blockList)); } for (int x=0;x blockList = blocks.getSortedBlocksOnCol(x); - markedBlocks.addAll(FindMatches(blockList,blocks.maxBlockHeight,false)); + markedBlocks.addAll(FindMatches(blockList)); } if (markedBlocks.size()>0) { List newClumpBlocks = new ArrayList(); @@ -146,22 +147,23 @@ public class Board { } return false; } - private List FindMatches(List blockList, int maxSearch, boolean searchingRows) { - BlockState col = BlockState.IGNITED; - int matches=0; + private List FindMatches(List blockList) { List markedBlocks = new ArrayList(); List tempMarkedBlocks = new ArrayList(); - for (int i=0;i0) { Block currentBlock = blockList.get(0); - if (searchingRows&¤tBlock.x==i||(!searchingRows&¤tBlock.y==i)) { + if (Math.abs(currentBlock.x-prevX)==1||Math.abs(currentBlock.y-prevY)==1) { if (col!=BlockState.IGNITED&¤tBlock.state==col) { matches++; tempMarkedBlocks.add(blockList.remove(0)); } else { if (matches>=3) { markedBlocks.addAll(tempMarkedBlocks); - System.out.println(" Added to Marked blocks: "+tempMarkedBlocks); } matches=1; col=currentBlock.state; @@ -169,14 +171,19 @@ public class Board { tempMarkedBlocks.add(blockList.remove(0)); } } else { - col = BlockState.IGNITED; - matches=0; + if (matches>=3) { + markedBlocks.addAll(tempMarkedBlocks); + } + matches=1; + col=currentBlock.state; tempMarkedBlocks.clear(); + tempMarkedBlocks.add(blockList.remove(0)); } + prevX=currentBlock.x; + prevY=currentBlock.y; } if (matches>=3) { markedBlocks.addAll(tempMarkedBlocks); - System.out.println(" Added to Marked blocks: "+tempMarkedBlocks); } return markedBlocks; } diff --git a/src/sig/Meteo.java b/src/sig/Meteo.java index 8fe2767..33eb8f0 100644 --- a/src/sig/Meteo.java +++ b/src/sig/Meteo.java @@ -2,6 +2,7 @@ package sig; import java.util.ArrayList; import java.util.List; +import java.util.Random; import javax.swing.JFrame; @@ -13,6 +14,7 @@ public class Meteo { public static double GAMELOOPTIME=0; public static JFrame f; public static Board b; + public static Random r; public final static long TIMEPERTICK = 16666667l; public static DebugMode DEBUG_DRAWING = DebugMode.MODE2; @@ -23,6 +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);