From 8a64368b9b9fcbe908c801d8761dbef0bae5e193 Mon Sep 17 00:00:00 2001 From: Recrown Date: Sat, 22 Jul 2017 15:13:03 -0500 Subject: [PATCH] minor changes --- core/src/zero1hd/polyjet/entity/CollisionDetector.java | 4 ++-- core/src/zero1hd/polyjet/entity/enemies/Flake.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/zero1hd/polyjet/entity/CollisionDetector.java b/core/src/zero1hd/polyjet/entity/CollisionDetector.java index fcb1917..aa1696f 100755 --- a/core/src/zero1hd/polyjet/entity/CollisionDetector.java +++ b/core/src/zero1hd/polyjet/entity/CollisionDetector.java @@ -44,10 +44,10 @@ public class CollisionDetector { Gdx.app.debug("Collision Detector", "Collision between entities: " + fe.getEntityType() + " and " + se.getEntityType()); //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); } - if (fe.playCollidePFX()) { + if (se.playCollidePFX() && fe.playCollidePFX()) { PooledEffect currentPFX; currentPFX = explosionEffectPool.obtain(); currentPFX.setPosition(fe.getX() + fe.getWidth()/2f, fe.getY() + fe.getHeight()/2f); diff --git a/core/src/zero1hd/polyjet/entity/enemies/Flake.java b/core/src/zero1hd/polyjet/entity/enemies/Flake.java index d5beba2..959be7e 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/Flake.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Flake.java @@ -61,7 +61,7 @@ public class Flake extends Entity implements Poolable { @Override 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.setColor(Color.WHITE); super.draw(batch, parentAlpha);