diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java index f0b81e6e..cc1c959d 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java @@ -57,11 +57,11 @@ public void hitEffect(Node battleshipNode, Shot shot){ debris.setMaterial(debrisMaterial); debris.setImagesX(2); debris.setImagesY(2); - debris.setStartColor(ColorRGBA.DarkGray); - debris.setEndColor(ColorRGBA.Gray); + debris.setStartColor(ColorRGBA.White); + debris.setEndColor(ColorRGBA.White); debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0.25f, 2f, 0.25f)); - debris.setStartSize(1.2f); - debris.setEndSize(0.8f); + debris.setStartSize(0.25f); + debris.setEndSize(0.1f); debris.setGravity(0, 1.5f, 0); debris.getParticleInfluencer().setVelocityVariation(0.3f); debris.setLowLife(1f); @@ -87,6 +87,7 @@ public void hitEffect(Node battleshipNode, Shot shot){ fire.getParticleInfluencer().setVelocityVariation(0.2f); fire.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f); fire.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation()); + battleshipNode.attachChild(fire); fire.emitAllParticles(); // LOGGER.log(Level.DEBUG, "Created HitEffect at {0}", explosion.getLocalTranslation().toString()); @@ -96,7 +97,6 @@ public void hitEffect(Node battleshipNode, Shot shot){ battleshipNode.attachChild(explosion); explosion.addControl(new EffectControl(explosion, battleshipNode)); - battleshipNode.attachChild(fire); fire.addControl(new EffectControl(fire, battleshipNode)); battleshipNode.attachChild(debris); debris.addControl(new EffectControl(debris, battleshipNode)); diff --git a/Projekte/battleship/client/src/main/resources/Textures/Debris/README.txt b/Projekte/battleship/client/src/main/resources/Textures/Debris/README.txt new file mode 100644 index 00000000..7898fe30 --- /dev/null +++ b/Projekte/battleship/client/src/main/resources/Textures/Debris/README.txt @@ -0,0 +1,2 @@ +Created using Metal Plates 13 from ambientCG.com, +licensed under the Creative Commons CC0 1.0 Universal License. \ No newline at end of file diff --git a/Projekte/battleship/client/src/main/resources/Textures/Debris/debris.png b/Projekte/battleship/client/src/main/resources/Textures/Debris/debris.png index 3f6698a0..6d01982f 100644 Binary files a/Projekte/battleship/client/src/main/resources/Textures/Debris/debris.png and b/Projekte/battleship/client/src/main/resources/Textures/Debris/debris.png differ diff --git a/Projekte/battleship/client/src/main/resources/Textures/Fire/README.txt b/Projekte/battleship/client/src/main/resources/Textures/Fire/README.txt new file mode 100644 index 00000000..1d4d61b4 --- /dev/null +++ b/Projekte/battleship/client/src/main/resources/Textures/Fire/README.txt @@ -0,0 +1,2 @@ +https://www.rawpixel.com/image/13141087/png-fire-bonfire-illuminated-destruction-generated-image-rawpixel +Licence: Free for personal use \ No newline at end of file diff --git a/Projekte/battleship/client/src/main/resources/Textures/Fire/fire.png b/Projekte/battleship/client/src/main/resources/Textures/Fire/fire.png index 42027e53..c76f5af5 100644 Binary files a/Projekte/battleship/client/src/main/resources/Textures/Fire/fire.png and b/Projekte/battleship/client/src/main/resources/Textures/Fire/fire.png differ