diff --git a/android/assets/1280x720/bar.png b/android/assets/1280x720/bar.png index 0c5d015..468d986 100755 Binary files a/android/assets/1280x720/bar.png and b/android/assets/1280x720/bar.png differ diff --git a/android/assets/1280x800/bar.png b/android/assets/1280x800/bar.png index a11fa61..1b51029 100755 Binary files a/android/assets/1280x800/bar.png and b/android/assets/1280x800/bar.png differ diff --git a/android/assets/1366x768/bar.png b/android/assets/1366x768/bar.png index 4e88c6e..d9a978a 100755 Binary files a/android/assets/1366x768/bar.png and b/android/assets/1366x768/bar.png differ diff --git a/android/assets/1920x1080/bar.png b/android/assets/1920x1080/bar.png index 38370e2..4383352 100755 Binary files a/android/assets/1920x1080/bar.png and b/android/assets/1920x1080/bar.png differ diff --git a/android/assets/1920x1200/bar.png b/android/assets/1920x1200/bar.png index 2e09483..12c9400 100755 Binary files a/android/assets/1920x1200/bar.png and b/android/assets/1920x1200/bar.png differ diff --git a/android/assets/2560x1440/bar.png b/android/assets/2560x1440/bar.png index c1dd2a2..19bff9e 100755 Binary files a/android/assets/2560x1440/bar.png and b/android/assets/2560x1440/bar.png differ diff --git a/android/assets/3840x2160/bar.png b/android/assets/3840x2160/bar.png index 5b85c15..0aef058 100755 Binary files a/android/assets/3840x2160/bar.png and b/android/assets/3840x2160/bar.png differ diff --git a/android/assets/800x480/bar.png b/android/assets/800x480/bar.png index 00aae1a..7bd6da2 100755 Binary files a/android/assets/800x480/bar.png and b/android/assets/800x480/bar.png differ diff --git a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java index 9bc8ae0..c886865 100755 --- a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java +++ b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java @@ -96,8 +96,10 @@ public class GamePlayMap { int howMuchLess = -(index - amount); index = 0; return howMuchLess; + } else { + index -= amount; + return amount; } - return amount; } public void goForward(int amount) { diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java index 0655798..1116444 100755 --- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java +++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java @@ -72,8 +72,9 @@ public class RhythmMapAlgorithm implements Runnable { map.resetIndex(); } if (bassPeaks.get(index) != 0) { + int spawnLocations = (Polyjet.GAME_AREA_WIDTH-8)/8; map.addToMap(Entities.BAR, - MathUtils.round(1.5f+rand.nextFloat()*(Polyjet.GAME_AREA_WIDTH-3)), + MathUtils.round(rand.nextFloat()*spawnLocations)*8, (8f/avgSPB)*speedMod); } else { if (UMPeaks.get(index) != 0) { diff --git a/core/src/zero1hd/polyjet/entity/enemies/Bar.java b/core/src/zero1hd/polyjet/entity/enemies/Bar.java index 39ebfae..fa5399d 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/Bar.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Bar.java @@ -22,7 +22,7 @@ public class Bar extends Actor implements Entity, Poolable { } public void init(float x, float rate) { - setSize(5f, 0.5f); + setSize(8f, 0.5f); setPosition(x, Polyjet.GAME_AREA_HEIGHT); this.rate = rate; hitbox.set(getX(), getY(), getWidth(), getHeight()); diff --git a/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java b/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java index f8b9d6e..47cbec2 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java +++ b/core/src/zero1hd/polyjet/entity/enemies/VoidCircle.java @@ -47,7 +47,8 @@ public VoidCircle(Texture voidTexture) { } else { voidCircleTexture.setSize(2*endRadius, 2*endRadius); voidCircleTexture.setColor(1f,1f,1f,0.1f); - } hitBox.setCenter(getX()+center.x, getY()+center.y); + } + hitBox.setCenter(getX()+center.x, getY()+center.y); if (timer > 0) { timer -= delta; @@ -58,7 +59,7 @@ public VoidCircle(Texture voidTexture) { } else { endRadius = -1f; if (currentRadius > 0) { - growCurrentRadius(delta*-3*growthRate); + growCurrentRadius(delta*-2f*growthRate); } else { done = true; }