ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Harrison Deng 2017-07-22 15:13:03 -05:00
parent a54a06c799
commit 8a64368b9b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/zero1hd/polyjet/entity/CollisionDetector.java
View File

@ -44,10 +44,10 @@ public class CollisionDetector {
Gdx.app.debug("Collision Detector", "Collision between entities: " + fe.getEntityType() + " and " + se.getEntityType()); Gdx.app.debug("Collision Detector", "Collision between entities: " + fe.getEntityType() + " and " + se.getEntityType());
//Play FX; //Play FX;
if (fe.playCollideSFX()) { if (se.playCollideSFX() && fe.playCollideSFX()) {
explosionSFX.play(prefs.getFloat("fx vol"), 1f, (fe.getX()/Polyjet.GAME_AREA_WIDTH)-0.55f); explosionSFX.play(prefs.getFloat("fx vol"), 1f, (fe.getX()/Polyjet.GAME_AREA_WIDTH)-0.55f);
} }
if (fe.playCollidePFX()) { if (se.playCollidePFX() && fe.playCollidePFX()) {
PooledEffect currentPFX; PooledEffect currentPFX;
currentPFX = explosionEffectPool.obtain(); currentPFX = explosionEffectPool.obtain();
currentPFX.setPosition(fe.getX() + fe.getWidth()/2f, fe.getY() + fe.getHeight()/2f); currentPFX.setPosition(fe.getX() + fe.getWidth()/2f, fe.getY() + fe.getHeight()/2f);

2
core/src/zero1hd/polyjet/entity/enemies/Flake.java
View File

@ -61,7 +61,7 @@ public class Flake extends Entity implements Poolable {
@Override @Override
public void draw(Batch batch, float parentAlpha) { public void draw(Batch batch, float parentAlpha) {
batch.setColor(0.25f,0.25f,0.25f,1f- timer/totalTime); batch.setColor(0.1f,0.1f,0.1f,1f - timer/totalTime);
batch.draw(texture, getX(), getY(), getWidth(), getHeight()); batch.draw(texture, getX(), getY(), getWidth(), getHeight());
batch.setColor(Color.WHITE); batch.setColor(Color.WHITE);
super.draw(batch, parentAlpha); super.draw(batch, parentAlpha);