MMGames/BrickBuster
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: MMGames:39ad9eb4b89ed2eec72f9db6b98a4353a6a77ae8
Branches Tags
MMGames:master
MMGames:dev
MMGames:box2d
..
compare: MMGames:35dea757760ff72138aa413efd0e560b3d15b34d
Branches Tags
MMGames:dev
MMGames:master
MMGames:box2d

No commits in common. "39ad9eb4b89ed2eec72f9db6b98a4353a6a77ae8" and "35dea757760ff72138aa413efd0e560b3d15b34d" have entirely different histories.
39ad9eb4b8 ... 35dea75776

11 changed files with 27 additions and 64 deletions
Show Stats Expand all files Collapse all files

1
core/assets/levels/level_1.json
View File

@ -1,5 +1,4 @@
{
randomPowerUpChance: 0.15
bricks: [
{
row: 15

1
core/assets/levels/level_2.json
View File

@ -1,5 +1,4 @@
{
randomPowerUpChance: 0.15
bricks: [
{
row: 5

4
core/src/com/me/brickbuster/entity/Ball.java
View File

@ -177,8 +177,4 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
return isStuck;
}
public void setStuck(boolean isStuck) {
this.isStuck = isStuck;
}
}

5
core/src/com/me/brickbuster/entity/Brick.java
View File

@ -165,11 +165,6 @@ public class Brick extends Entity implements PhysicsBody, CollisionListener {
}
}
float powerUpChance = ((PlayState) state).currentLevel.getRandomPowerUpChance();
if (powerUpType == null && powerUpChance > 0f && MathUtils.randomBoolean(powerUpChance)) {
powerUpType = PowerUpType.getWeightedRandom();
}
if (powerUpType != null) {
((PlayState) state).powerUps.add(powerUpType.createInstance((PlayState) state, this));
}

2
core/src/com/me/brickbuster/entity/Entity.java
View File

@ -31,7 +31,7 @@ public abstract class Entity {
}
public void setPos(Vector2 pos) {
this.pos.set(pos);
this.pos = pos;
}
public float getX() {

22
core/src/com/me/brickbuster/entity/powerup/MultiBallPowerUp.java
View File

@ -3,7 +3,6 @@ package com.me.brickbuster.entity.powerup;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import com.me.brickbuster.entity.Ball;
import com.me.brickbuster.entity.Paddle;
import com.me.brickbuster.state.PlayState;
@ -11,7 +10,6 @@ import com.me.brickbuster.state.PlayState;
public class MultiBallPowerUp extends PowerUp {
private Vector2 pos;
private static final Array<Ball> ballsToAdd = new Array<Ball>();
public MultiBallPowerUp(PlayState state, Vector2 brick, Color color) {
super(state, brick, color);
@ -20,26 +18,10 @@ public class MultiBallPowerUp extends PowerUp {
@Override
public void activate() {
final Array<Ball> existing = ((PlayState) state).balls;
if (existing.size >= 3) {
return;
}
for (Ball b : existing) {
Vector2 velocity = b.getBody().getLinearVelocity();
velocity.setAngleRad(velocity.angleRad() - MathUtils.PI/8);
for (int x = 0; x < 2; x++) {
Ball ball = new Ball((PlayState) state);
ball.setX(b.getX());
ball.setY(b.getY());
ball.setStuck(false);
ball.getBody().setLinearVelocity(velocity);
ballsToAdd.add(ball);
velocity.setAngleRad(velocity.angleRad() + MathUtils.PI/4);
ball.launch();
((PlayState) state).balls.add(ball);
}
}
existing.addAll(ballsToAdd);
ballsToAdd.clear();
}
}

18
core/src/com/me/brickbuster/layout/FileLayout.java
View File

@ -1,26 +1,30 @@
package com.me.brickbuster.layout;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Json;
import com.me.brickbuster.entity.Brick;
import com.me.brickbuster.state.FieldState;
import com.me.brickbuster.state.PlayState;
public class FileLayout implements BrickLayout {
private FieldState state;
private LevelJsonTemplate template;
private Array<Brick> bricks;
private static final Json JSON = new Json();
public FileLayout(FieldState state, LevelJsonTemplate template) {
private PlayState state;
private Array<Brick> bricks;
private FileHandle file;
public FileLayout(PlayState state, FileHandle file) {
this.state = state;
this.template = template;
this.file = file;
}
@Override
public void initialize() {
bricks = new Array<Brick>();
for (LevelJsonTemplate.BrickJsonTemplate brick : template.bricks) {
LevelJsonTemplate level = JSON.fromJson(LevelJsonTemplate.class, file);
for (LevelJsonTemplate.BrickJsonTemplate brick : level.bricks) {
final float x = PlayState.EDGE_PADDING + Brick.BRICK_WIDTH/2 + brick.col * Brick.BRICK_WIDTH;
final float y = PlayState.EDGE_PADDING + Brick.BRICK_HEIGHT/2 + brick.row * Brick.BRICK_HEIGHT;

18
core/src/com/me/brickbuster/layout/FileLevelLoader.java
View File

@ -2,19 +2,14 @@ package com.me.brickbuster.layout;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Json;
import com.me.brickbuster.state.FieldState;
import com.me.brickbuster.state.PlayState;
public class FileLevelLoader implements LevelLoader {
private static final Json JSON = new Json();
private FieldState state;
private PlayState state;
private int level = 1;
public FileLevelLoader(FieldState state) {
public FileLevelLoader(PlayState state) {
this.state = state;
}
@ -22,15 +17,8 @@ public class FileLevelLoader implements LevelLoader {
public Level getNextLevel() {
FileHandle file = Gdx.files.internal("levels/level_" + level + ".json");
if (file.exists()) {
LevelJsonTemplate template = JSON.fromJson(LevelJsonTemplate.class, file);
Texture background = null;
if (template.backgroundFile != null && !"".equals(template.backgroundFile)) {
background = new Texture(Gdx.files.internal(template.backgroundFile));
}
level++;
return new Level(new FileLayout(state, template), background, template.randomPowerUpChance);
return new Level(new FileLayout(state, file), null, null);
}
return null;
}

12
core/src/com/me/brickbuster/layout/Level.java
View File

@ -6,16 +6,16 @@ public class Level {
private final BrickLayout layout;
private final Texture background;
private final float randomPowerUpChance;
private final Texture border;
public Level(BrickLayout layout) {
this(layout, null, 0f);
this(layout, null, null);
}
public Level(BrickLayout layout, Texture background, float randomPowerUpChance) {
public Level(BrickLayout layout, Texture background, Texture border) {
this.layout = layout;
this.background = background;
this.randomPowerUpChance = randomPowerUpChance;
this.border = border;
}
public BrickLayout getLayout() {
@ -26,8 +26,8 @@ public class Level {
return background;
}
public float getRandomPowerUpChance() {
return randomPowerUpChance;
public Texture getBorder() {
return border;
}
}

2
core/src/com/me/brickbuster/layout/LevelJsonTemplate.java
View File

@ -9,7 +9,7 @@ import java.util.List;
public class LevelJsonTemplate {
public String backgroundFile;
public float randomPowerUpChance;
public String borderFile;
public List<BrickJsonTemplate> bricks;
public static class BrickJsonTemplate {

2
core/src/com/me/brickbuster/state/FieldState.java
View File

@ -24,7 +24,7 @@ public abstract class FieldState extends State {
@Override
public void dispose() {
super.dispose();
game.assets.unload("textures.atlas");
textures.dispose();
}
}