Added visual display when boat dies. Added sound when boat dies. #story[1311]

2017-09-26 17:05:22 +13:00
parent e53d7d894b
commit f4001e0ae3
4 changed files with 25 additions and 22 deletions
@@ -698,7 +698,13 @@ public class RaceViewController extends Controller {
                } else {
                    for(VisualiserBoat boat : raceState.getBoats()){
                        for (HealthEffect fp : healthEffectList){
+
                            if(fp.getSourceID()==boat.getSourceID()){
+                                if(boat.getHealth()<=0){
+                                    fp.displayDeath();
+                                    fp.setSourceID(0);
+                                }
+                                else
                                if(boat.getHealth()<=10){
                                    fp.flash(System.currentTimeMillis(), 300, boat.getSourceID()==raceState.getPlayerBoatID());
                                }
@@ -713,25 +719,6 @@ public class RaceViewController extends Controller {
                            }
                        }
                    }
-//                    try {
-//                        if(raceState.getBoat(raceState.getPlayerBoatID()).getHealth()<=10){
-//                            heartbeatDelay = 300;
-//                        } else if (raceState.getBoat(raceState.getPlayerBoatID()).getHealth()<=20){
-//                            heartbeatDelay = 500;
-//                        }
-//                        if(raceState.getBoat(raceState.getPlayerBoatID()).getHealth()<=20){
-//
-//                            //imageView.translateXProperty().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getPosition().getLongitude());
-//                            if(System.currentTimeMillis() > heartbeatTime+heartbeatDelay) {
-//                                AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/warning.mp3").toExternalForm());
-//                                sound.setVolume(0.3);
-//                                sound.play();
-//                                heartbeatTime = System.currentTimeMillis() + heartbeatDelay;
-//                            }
-//                        }
-//                    } catch (BoatNotFoundException e) {
-//                        e.printStackTrace();
-//                    }
                }
            }
        }.start();
@@ -16,7 +16,8 @@ public class HealthEffect extends Subject3D {
    private int sourceID;
    private long currentTime;
    private long flashInterval;
-    private AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/warning.mp3").toExternalForm());
+    private AudioClip warningSound = new AudioClip(this.getClass().getResource("/visualiser/sounds/warning.mp3").toExternalForm());
+    private AudioClip deadSound = new AudioClip(this.getClass().getResource("/visualiser/sounds/dead1.wav").toExternalForm());

    public HealthEffect(int sourceID, long currentTime){
        super(createEffect(), 0);
@@ -66,6 +67,21 @@ public class HealthEffect extends Subject3D {
        return sourceID;
    }

+    public void setSourceID(int id){
+        this.sourceID = id;
+    }
+
+    public void displayDeath(){
+        Image image = new Image(HealthEffect.class.getClassLoader().getResourceAsStream("images/warning2.png"));
+        PhongMaterial material = (PhongMaterial) this.getMesh().getMaterial();
+        material.setDiffuseColor(Color.web("#FFFFFF"));
+        material.setSpecularColor(Color.web("#000000"));
+        material.setDiffuseMap(image);
+        this.getMesh().setMaterial(material);
+        deadSound.play();
+    }
+
+
    /**
     * Flash the mesh view at a certain interval
     * @param checkTime The current time of flash
@@ -78,8 +94,8 @@ public class HealthEffect extends Subject3D {
                this.setVisible(false);
            } else {
                if(playerBoat) {
-                    sound.setVolume(0.1);
-                    sound.play();
+                    warningSound.setVolume(0.1);
+                    warningSound.play();
                }
                this.setVisible(true);
            }