Mikescher
/
CannonShooter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

grid size x2

This commit is contained in:
Mike Schwörer 2015-09-20 14:36:56 +02:00
parent 6508d95fab
commit 3f3a638d09
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/de/samdev/cannonshooter/entities/Cannon.java
View File

@ -27,7 +27,7 @@ public class Cannon extends Entity {
public float health; // 1 = active | 0 = neutral public float health; // 1 = active | 0 = neutral
public Cannon(float x, float y, Team t) { public Cannon(float x, float y, Team t) {
super(Textures.cannon_body, 2, 2); super(Textures.cannon_body, 4, 4);
setPosition(x, y); setPosition(x, y);
setZLayer(ZLayers.LAYER_CANNON_BODY); setZLayer(ZLayers.LAYER_CANNON_BODY);

4
core/src/de/samdev/cannonshooter/entities/CannonBarrel.java
View File

@ -35,7 +35,7 @@ public class CannonBarrel extends Entity {
private float[] booster = new float[MAX_BOOSTER_COUNT]; private float[] booster = new float[MAX_BOOSTER_COUNT];
public CannonBarrel(Cannon owner) { public CannonBarrel(Cannon owner) {
super(Textures.cannon_barrel[0], 4, 2); super(Textures.cannon_barrel[0], 8, 4);
cannon = owner; cannon = owner;
clearBooster(); clearBooster();
@ -65,7 +65,7 @@ public class CannonBarrel extends Entity {
private void updateBullet() { private void updateBullet() {
if (loaded) { if (loaded) {
Vector2 v = new Vector2(1f - 0.5f + (1.9f) * charge, 0); Vector2 v = new Vector2(1.5f + 3f * charge, 0);
v.rotate(rotation); v.rotate(rotation);

4
core/src/de/samdev/cannonshooter/entities/CannonBullet.java
View File

@ -14,7 +14,7 @@ public class CannonBullet extends Entity {
private final static float RESIZE_SPEED = 0.002f; private final static float RESIZE_SPEED = 0.002f;
private final static float MAX_LIFETIME = 25 * 1000; private final static float MAX_LIFETIME = 25 * 1000;
private final static float SHOOTING_SPEED = 0.002f; private final static float SHOOTING_SPEED = 0.004f;
public Cannon cannon; public Cannon cannon;
private final Team team; private final Team team;
@ -26,7 +26,7 @@ public class CannonBullet extends Entity {
public float lifetime = 0; public float lifetime = 0;
public CannonBullet(Cannon owner, Team t) { public CannonBullet(Cannon owner, Team t) {
super(Textures.cannon_bullet, 0.5f, 0.5f); super(Textures.cannon_bullet, 1f, 1f);
this.cannon = owner; this.cannon = owner;
this.team = t; this.team = t;

2
core/src/de/samdev/cannonshooter/entities/CannonHearth.java
View File

@ -21,7 +21,7 @@ public class CannonHearth extends Entity {
private Cannon cannon; private Cannon cannon;
public CannonHearth(Cannon owner) { public CannonHearth(Cannon owner) {
super(Textures.cannon_hearth[0], 2, 2); super(Textures.cannon_hearth[0], 4, 4);
cannon = owner; cannon = owner;
setPosition(owner.getPositionX(), owner.getPositionY()); setPosition(owner.getPositionX(), owner.getPositionY());

8
core/src/de/samdev/cannonshooter/level/StandardLevel.java
View File

@ -27,7 +27,7 @@ public class StandardLevel extends GameLayer {
private Team team_computer3 = new Team(12, Team.COL_P4, false, true, false, Team.MULTIPLIER_AI_D0); private Team team_computer3 = new Team(12, Team.COL_P4, false, true, false, Team.MULTIPLIER_AI_D0);
public StandardLevel(AgdxGame owner) { public StandardLevel(AgdxGame owner) {
super(owner, TileMap.createEmptyMapUnsafe(35, 20, StandardTile.class)); super(owner, TileMap.createEmptyMapUnsafe(70, 40, StandardTile.class));
initTeams(); initTeams();
@ -38,9 +38,9 @@ public class StandardLevel extends GameLayer {
addBackground(new RepeatingBackground(Textures.texbackground, 1/32f)); addBackground(new RepeatingBackground(Textures.texbackground, 1/32f));
setMapScaleResolver(new ShowCompleteMapScaleResolver()); setMapScaleResolver(new ShowCompleteMapScaleResolver());
addEntity(new Cannon(3, 13, team_player)); addEntity(new Cannon(6, 25, team_player));
addEntity(new Cannon(24, 3, team_computer1)); addEntity(new Cannon(48, 6, team_computer1));
addEntity(new Cannon(30, 17, team_neutral)); addEntity(new Cannon(60, 34, team_neutral));
} }
private void initTeams() { private void initTeams() {