diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ce7685c..a75c649 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,8 @@ - + + @@ -19,8 +20,8 @@ - - + + @@ -28,11 +29,21 @@ + + + + + + + + + + - - + + @@ -48,18 +59,12 @@ - warehouse - warehouse\n - runfr - getGuns - approach initialize gif shipsRemainingGIF initial initializeS ship - shipWarfa imageView 20 shipsAttackingGif.set @@ -77,7 +82,13 @@ run setvisi fightand + shipWarfa + imageview image + shipsAttack + shipsAttackingOr + ships + shipw HP @@ -86,8 +97,9 @@ shipWarfare.getHowMuchRun() shipWarfare.isUserAttacks() shipWarfare.getNumOfPeasantShips() - shipsApproachingGIF attackImage + shipsAttacking + shipsApproachingGIF @@ -276,7 +288,7 @@ - + 1550458470138 @@ -565,11 +577,25 @@ - - @@ -672,7 +698,6 @@ - @@ -697,7 +722,8 @@ - @@ -801,13 +827,6 @@ - - - - - - - @@ -825,10 +844,23 @@ + + + + + + + + + + + + + - - + + diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java index 1cabd16..90c3a21 100644 --- a/src/ShipWarfareGUI.java +++ b/src/ShipWarfareGUI.java @@ -345,15 +345,18 @@ public class ShipWarfareGUI extends Player{ title.setPadding(new Insets(6.0, 0.0, 0.0, 0.0)); - Image image = new Image(new FileInputStream("src/ShipsAttacking.gif")); + Image shipsAttacking = new Image(new FileInputStream("src/ShipsAttacking.gif")); + Image shipsRunning = new Image(new FileInputStream("src/ShipsRunning.gif")); + //Setting the image view - ImageView shipsAttackingGif = new ImageView(image); - shipsAttackingGif.setFitHeight(193.0); - shipsAttackingGif.setFitWidth(349.0); - shipsAttackingGif.setPickOnBounds(true); - shipsAttackingGif.setPreserveRatio(true); - shipsAttackingGif.setVisible(false); + ImageView shipsAttackingOrRunningGif = new ImageView(shipsAttacking); + + shipsAttackingOrRunningGif.setFitHeight(193.0); + shipsAttackingOrRunningGif.setFitWidth(349.0); + shipsAttackingOrRunningGif.setPickOnBounds(true); + shipsAttackingOrRunningGif.setPreserveRatio(true); + shipsAttackingOrRunningGif.setVisible(false); BorderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER); @@ -416,7 +419,7 @@ public class ShipWarfareGUI extends Player{ vBox0.getChildren().add(gunsLeftOrTaken); vBox0.getChildren().add(continueToFight); hBox0.getChildren().add(vBox0); - hBox0.getChildren().add(shipsAttackingGif); + hBox0.getChildren().add(shipsAttackingOrRunningGif); vBox.getChildren().add(hBox0); vBox.getChildren().add(continueButton); @@ -429,12 +432,17 @@ public class ShipWarfareGUI extends Player{ * @param event, once button is clicked, executes graphical information */ public void handle(ActionEvent event) { + try{ + shipsAttackingOrRunningGif.setImage(new Image(new FileInputStream("src/ShipsAttacking.gif"))); + }catch (FileNotFoundException e) { + e.printStackTrace(); + } counter++; chooseFightOrRun.setVisible(true); try { - shipsAttackingGif.setVisible(true); + shipsAttackingOrRunningGif.setVisible(true); if (destroyPeasantShipsOrEscape(stage)) { - shipsAttackingGif.setVisible(false); + shipsAttackingOrRunningGif.setVisible(false); setVisibilitiesAndTransition(stage); @@ -457,6 +465,12 @@ public class ShipWarfareGUI extends Player{ * @param event, once button is clicked, executes graphical information */ public void handle(ActionEvent event) { + shipsAttackingOrRunningGif.setVisible(true); + try{ + shipsAttackingOrRunningGif.setImage(new Image(new FileInputStream("src/ShipsRunning.gif"))); + }catch (FileNotFoundException e) { + e.printStackTrace(); + } chooseFightOrRun.setText("Ayy captain we will try to run!"); counter++; @@ -473,6 +487,7 @@ public class ShipWarfareGUI extends Player{ } } else { completeWipe(); + shipsAttackingOrRunningGif.setVisible(false); report.setText("Phew! Got away safely"); setVisibilitiesAndTransition(stage); diff --git a/src/ShipsRunning.gif b/src/ShipsRunning.gif new file mode 100644 index 0000000..2e74601 Binary files /dev/null and b/src/ShipsRunning.gif differ