Skip to content

Commit

Permalink
DONE!
Browse files Browse the repository at this point in the history
  • Loading branch information
Portals committed Apr 19, 2015
1 parent e1040a4 commit a3f94b4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Binary file modified core/assets/Ai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/assets/libgdxsplash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void update(float deltaTime) {
}

Objects.BATCH.setProjectionMatrix(Objects.camera.combined);
Objects.BATCH.setColor(new Color(0.0f, 0.0f, 1.0f, 0.6f));
Objects.BATCH.setColor(new Color(0.0f, 0.0f, 1.0f, 0.4f));
Objects.BATCH.begin();

for(int i = 1; i < 8; i += 2){
Expand Down
9 changes: 5 additions & 4 deletions core/src/se/angergard/game/system/MapControllerSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public class MapControllerSystem extends EntitySystem implements Initializable,
public MapControllerSystem(MainGame game){ //Because MapControllerSystem checks alot of things
this.game = game;
}

private MainGame game;
private Engine engine;
private Entity player;
Expand All @@ -89,7 +88,7 @@ public MapControllerSystem(MainGame game){ //Because MapControllerSystem checks
private int lastGate = -1;

@Override
public void init() {
public void init() {
maps = new TiledMap[Values.MAPS];

TmxMapLoader mapLoader = new TmxMapLoader(new InternalFileHandleResolver());
Expand Down Expand Up @@ -292,10 +291,12 @@ private void spawnEnemies(TiledMap tiledMap, int level) {
if(numberOfEnemies >= 8){
numberOfEnemies = 8;
}
float speed = (float) Math.pow(1.04, level);
float speed = (float) Math.pow(1.045, level);

for(int i = 0; i < numberOfEnemies; i++){
Vector2 vec = spawnpoints.get(MathUtils.random(0, spawnpoints.size - 1));
int random = MathUtils.random(0, spawnpoints.size - 1);
Vector2 vec = spawnpoints.get(random);
spawnpoints.removeIndex(random);
Entity enemy = EntityUtils.createEnemyAStar(vec.x, vec.y, speed);
enemies.add(enemy);
engine.addEntity(enemy);
Expand Down
1 change: 0 additions & 1 deletion core/src/se/angergard/game/tween/FloatTweener.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public int getValues(FloatValue target, int tweenType, float[] returnValues) {

@Override
public void setValues(FloatValue target, int tweenType, float[] newValues) {
System.out.println(newValues[0]);
target.value = newValues[0];
}

Expand Down

0 comments on commit a3f94b4

Please sign in to comment.