Skip to content

Commit 49258b4

Browse files
committed
consistent explosionRadius = 1.5 between physics and visuals
1 parent 6641d37 commit 49258b4

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

game/src/main/java/mygame/weapon/ExplosiveArrowControl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class ExplosiveArrowControl extends AdapterControl implements PhysicsColl
3838

3939
public float maxFlyingTime = 10f;
4040
public float explosionForce = 20f;
41-
public float explosionRadius = 4f;
4241
public ExplosionPrefab explosionPrefab;
4342

4443
public ExplosiveArrowControl() {
@@ -56,7 +55,7 @@ public void setSpatial(Spatial sp) {
5655
}
5756

5857
private void createGhostObject() {
59-
ghostObject = new PhysicsGhostObject(new SphereCollisionShape(explosionRadius));
58+
ghostObject = new PhysicsGhostObject(new SphereCollisionShape(FireWeapon.explosionRadius));
6059
}
6160

6261
@Override
@@ -134,7 +133,7 @@ private void explode() {
134133
PhysicsRigidBody rb = (PhysicsRigidBody) pco;
135134
if (rb.getMass() > 0) {
136135
logger.log(Level.INFO, "addExplosionForce to: {0}", gameObject);
137-
Physics.addExplosionForce(rb, explosionForce, rigidBody.getPhysicsLocation(), explosionRadius);
136+
Physics.addExplosionForce(rb, explosionForce, rigidBody.getPhysicsLocation(), FireWeapon.explosionRadius);
138137
}
139138
if (!affectedGameObjects.contains(gameObject)) {
140139
affectedGameObjects.add(gameObject);

game/src/main/java/mygame/weapon/FireWeapon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class FireWeapon extends Weapon {
2727
private static final Logger logger = Logger.getLogger(FireWeapon.class.getName());
2828

2929
public float distance = 30f;
30-
public float explosionRadius = 5;
30+
public static float explosionRadius = 1.5f;
3131
public float baseStrength = 10f;
3232
public int layerMask = Main.DEFAULT_GROUP;
3333
public AudioNode impactSFX;

0 commit comments

Comments
 (0)