From 8db65566c956ea1a352782b3f9876ee99b0291d0 Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Sun, 16 Jul 2017 02:15:00 -0500
Subject: [PATCH] bar data set and fixed index mistake

---
 android/assets/1280x720/bar.png                 | Bin 113 -> 119 bytes
 android/assets/1280x800/bar.png                 | Bin 117 -> 121 bytes
 android/assets/1366x768/bar.png                 | Bin 116 -> 121 bytes
 android/assets/1920x1080/bar.png                | Bin 132 -> 127 bytes
 android/assets/1920x1200/bar.png                | Bin 135 -> 139 bytes
 android/assets/2560x1440/bar.png                | Bin 143 -> 145 bytes
 android/assets/3840x2160/bar.png                | Bin 232 -> 262 bytes
 android/assets/800x480/bar.png                  | Bin 97 -> 105 bytes
 .../zero1hd/polyjet/audio/map/GamePlayMap.java  |   4 +++-
 .../polyjet/audio/map/RhythmMapAlgorithm.java   |   3 ++-
 .../src/zero1hd/polyjet/entity/enemies/Bar.java |   2 +-
 .../polyjet/entity/enemies/VoidCircle.java      |   5 +++--
 12 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/android/assets/1280x720/bar.png b/android/assets/1280x720/bar.png
index 0c5d015670b46bd7081a12676e245814c6d3fff6..468d9867afc1945fb0f176a4faf2a462303f2a53 100755
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^6+q0v!3HFa+^mIxl%1!GV@SoVx7Q7M84P%s9WU#5
zPYYdgh@-)T@#4{64}Bh}doSM<8{ze}rA$|1);1P30}dXh<^w;3XUtBinJl+wO-5#1
S+d%`MNerH@elF{r5}E*8ZzXO3

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^-ayR3!3HEZHZf@cDGN^*$B>F!$q5lZ{u>M2mpjVx
zF`Z4JusQMI|8s#p49$l!O*XhOXG4j${DfXJ*^V4528I>yoX&k*Ha8b&27{-opUXO@
GgeCyG;v>HR

diff --git a/android/assets/1280x800/bar.png b/android/assets/1280x800/bar.png
index a11fa6161a39461833e02947cf24e8ff92d05f8b..1b510298cb45c50a13a9cfcedb275703efb2cef6 100755
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^tw7Al!3HE{R=l4Nq#Qh5978H@y}h9=%Ag?Paxi?p
z*aaSEcA5Rn3mLMG<TR}|Thz19WJlGSl@r~YlD{i(xio4Bur6{Csp&rCfADj#&olk%
V*l$a&HUiCJ@O1TaS?83{1OP1cD5C%X

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^!9dK(!3HG#mJ3V-QZ}A0jv*Ddk`p3+{AU-impv--
zSf0n>5#!;e|8p15aN^-Qe(`_|?-?)=Xd^Xaaib*<Q}LF$o=eNr7<?x6)Jj~O?*KH1
N!PC{xWt~$(698CoB>eyY

diff --git a/android/assets/1366x768/bar.png b/android/assets/1366x768/bar.png
index 4e88c6e692aa2cbe0cbad820d0a8cd079e487545..d9a978ac731055dbf35f56663d75d8b17454048a 100755
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^4M5Dn!3HD^?|!cXQVyOjjv*Dd-d;BpWl-Q@zIfv}
z>rpX&$+^rgPVlBL`0Kr-Xup~3wM(Baepztf-+M-&4u*zgpfL`e3^N)p8h>EYd-(n3
SydZmPkc_9RpUXO@geCxy<SB~)

literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^0YJ>b!3HGr&QzEKDQiy`$B>F!Z?74OGAIZfzHsX}
zYeIK>&us1pjqEmwAHho=?$Yhj%B)(wJMhA0W&sBVMizk{nF+l=Z_QwSx^K>$V};wd
Q1C3$uboFyt=akR{0C(^w5C8xG

diff --git a/android/assets/1920x1080/bar.png b/android/assets/1920x1080/bar.png
index 38370e23922bcddedcc359434d164b7953cb8032..4383352825284b9801139b0bd750dc393a05650c 100755
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^TY#8{gAGWY4w<e6q})7R978H@y}fD3%b>vH>iA~!
z0!D)<AvTi>&)QZung89kO=&?-bs3Mxdsf@U&Q(or7ZfrCOgN+*xuqNr?{}1bs`)jd
bQHd}4@0<7R3pXqUn#kbk>gTe~DWM4f^k6A~

literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^g+R>1!3HEl4+WhEQr?~}jv*Dd-d<lQ+Tg(Ba&QYj
zQ`Ccul7|8%4IKGLT#nRj4OL#a^SR8;*Js>}H{X^nOxY{XefCVAQdb8EC@Cq$yO?~d
eH~g0QhH3hjr+k~*&wm3N%i!ti=d#Wzp$P!xi7_1j

diff --git a/android/assets/1920x1200/bar.png b/android/assets/1920x1200/bar.png
index 2e0948321267011d5d1d105475d889f4b3206740..12c9400ddcb8bca7a07cde196fc0ad8edf58e80c 100755
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^CqQftHX!+?R&gef3i5Pu45_&F_U1<31_K^f$Mxr#
zIwmc6^OB{2lc!;wMRim7-;QaVdv=_gSo@Dxqg+_j<Fx6wn1&)VMF9a04i*+BCdS4F
n2M2`@za4a5e%QH$nV&5>{^(Nsf3jDArZafD`njxgN@xNAnIA5)

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^wIDVJ8<1>Sl=uWl`FXlHhE&{odt*260Rs*P$7|=A
z0==w1%{%gwM{uS#UsasD%lRcU(&tz{vx~TM`)BvP;{IvU-Mg*3^>!`p=z9S{e++i@
d$DHh!X^pvh&VF~;oJ^2444$rjF6*2UngAA-HF5v|

diff --git a/android/assets/2560x1440/bar.png b/android/assets/2560x1440/bar.png
index c1dd2a2e8d3ee20061908f391a65893b1bf06fe2..19bff9e01691a1c6b0c4da5abc0cca87789c8469 100755
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^AAp#jgAGXDn&=b<q#`_B978H@y}h-Ov%x{Y<znuA
zy)6yQr+2LTW@E5{VRECm%?!3Wv(RvJfmgDh4I3mrOMi$>mv`v6yQabMKtlr~V>1vl
pGqJJofbbuQ4f-Z5^$QyvxP_;87_^jWGyv^j@O1TaS?83{1ORnqErkF8

literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^(}0+tgAGWsWte3GsW49$$B>F!Z*OkoJ)j`Kaxj0s
zUIF8@7`9m3Z7vVysLxJVqMfk0dxz1&J5rBJof|*$zwVsJyRBB2lRHsSr$tq#rFDbA
sv<(7chnyk~Jqn1}=hRoz8j!^_Yuc_m-Hkg|18rdNboFyt=akR{01;R*=Kufz

diff --git a/android/assets/3840x2160/bar.png b/android/assets/3840x2160/bar.png
index 5b85c1594da270160eb01350afe7d4cbdbc3cc64..0aef0586a57b792e270deaa89a0db568b2d08636 100755
GIT binary patch
delta 209
zcmaFC*v6#S8Q|y6%O%Cdz`(%k>ERN@z`&RRWQ%jK0ZFxIS4)8uV{wqX6T`Z5GA}18
zN^>1%VBkB<cszea%0xGf`Z7-!$B>G+w^tSl9xxDKcHBPSDCp(vG__}T8xk5r4y^rp
zjzOTrhH=MxV>t#P7AXa<1&oWxrRo~l7Cfn7D!6%u?Qzar$%jrqqj`YNWAJqKb6Mw<
G&;$TBhCwR;

delta 178
zcmZo;dcmmJ8Q|y6%O%Cdz`(%k>ERLtq#pvYI0qY${9B<>H&IWT>ktD2-yud(4X=iY
z!5USmo-U3d6>)DbFBCjrAi(UneZEo9%h_pa$LuyGG#<%cTh7KI>;GWh`HF_sE*yq}
sPChLH!iq<TW4;kr46vAYK-F0K6?1-Yw)OHCKxZ&`y85}Sb4q9e0P-(2tpET3

diff --git a/android/assets/800x480/bar.png b/android/assets/800x480/bar.png
index 00aae1a94593cb03f671f280284add57489d2581..7bd6da2722807bb499022f4bc882a376a02acb23 100755
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^0YJ>k!3HER1!cbkQU;zbjv*Ddk`p3+{1+2=FL^ZO
zVKk3JlK$bQ|8p15;NjugeUU+i_W&dRfr~~Hnv4V(Uhp+MiA?@538<IB)78&qol`;+
E0P9U5LjV8(

literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^MnKHU!3HGR9riB)QW~Bvjv*Ddk`p3+{1+2=FZt+)
v81sZ1r#C#Pe?H-uf_+a_ia=FL#1lb=wv&dYeJ@x+hB0`$`njxgN@xNA<n10y

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;
 				}