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

Remove launched blocks outside of playing field

Browse Source
This commit is contained in:
Joshua Sigona 2021-09-26 20:04:54 +09:00
parent c5b6fe2d2d
commit d8563b5ecb
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sig/Board.java
View File

@ -19,6 +19,7 @@ public class Board {
int x,y; int x,y;
int block_width,block_height; int block_width,block_height;
double vspeed; double vspeed;
int attack_counter=0;
final static BlockState[] STARTINGSTATES = {BlockState.BLUE, final static BlockState[] STARTINGSTATES = {BlockState.BLUE,
BlockState.GREEN, BlockState.GREEN,
BlockState.ORANGE, BlockState.ORANGE,
@ -44,26 +45,6 @@ public class Board {
this.max_fall_spd = max_fall_spd; this.max_fall_spd = max_fall_spd;
this.combo_power_bonus = combo_power_bonus; this.combo_power_bonus = combo_power_bonus;
this.blockData = new ArrayList<BlockClump>(); this.blockData = new ArrayList<BlockClump>();
/*List<Block> initialBlocks = new ArrayList<Block>();
for (int x=0;x<boardWidth;x++) {
for (int y=0;y<(int)(Meteo.r.nextInt(12));y++) {
initialBlocks.add(new Block(x,y));
}
}
BlockClump defaultClump = new BlockClump(initialBlocks,0,260,0,width,120);
List<Block> initialBlocks2 = new ArrayList<Block>();
for (int x=0;x<boardWidth;x++) {
for (int y=0;y<(int)(Meteo.r.nextInt(12));y++) {
initialBlocks2.add(new Block(x,y));
}
}
BlockClump defaultClump2 = new BlockClump(initialBlocks2,0,540,0,width,120);
blockData.add(defaultClump);
blockData.add(defaultClump2);*/
} }
public void run(long frames) { public void run(long frames) {
if (frames%20==0) { if (frames%20==0) {
@ -72,6 +53,7 @@ public class Board {
outerloop: outerloop:
for (BlockClump blocks : blockData) { for (BlockClump blocks : blockData) {
DestroyOutsideBlocks(blocks);
if (checkForMatches(blocks)) {continue;} if (checkForMatches(blocks)) {continue;}
double FUTURE_FALL_POSITION = blocks.y+blocks.yspd+gravity; double FUTURE_FALL_POSITION = blocks.y+blocks.yspd+gravity;
for (int x=0;x<width;x++) { for (int x=0;x<width;x++) {
@ -116,6 +98,16 @@ public class Board {
blockClumpAddList.clear(); blockClumpAddList.clear();
} }
} }
private void DestroyOutsideBlocks(BlockClump blocks) {
if (blocks.yspd>0) {
for (int[] range : blocks.collisionColumnRanges) {
if (range[1]*block_height+blocks.y>block_height*height) {
List<Block> removedBlocks = blocks.getBlocks().stream().filter((block)->block.y*block_height+blocks.y>block_height*height).collect(Collectors.toList());
blocks.removeBlock(removedBlocks.toArray(new Block[removedBlocks.size()]));
}
}
}
}
private void MergeAllGroundedClumps() { private void MergeAllGroundedClumps() {
List<BlockClump> groundedClumps = blockData.stream().filter((cl)->cl.y==0).collect(Collectors.toList()); List<BlockClump> groundedClumps = blockData.stream().filter((cl)->cl.y==0).collect(Collectors.toList());
if (groundedClumps.size()>1) { if (groundedClumps.size()>1) {