From 7b9796f92cd91738cae3dd6e793e05cbaa497393 Mon Sep 17 00:00:00 2001 From: KahootChampion Date: Tue, 19 Mar 2019 23:49:36 -0600 Subject: [PATCH] Made the fight gif runnable by everyone hopefully --- .idea/workspace.xml | 343 ++++++++++++++++------------------------ src/ShipWarfareGUI.java | 4 +- 2 files changed, 136 insertions(+), 211 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 39cbc33..ce7685c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,14 +3,7 @@ - - - - - - - @@ -23,55 +16,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + @@ -80,38 +29,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -127,36 +48,36 @@ - hitco - game - numOf - mis - exitValue - getGuns - frustRat - counter++ - setMone - setNum - We survive - total of - int numOfShips - runFromShips() - dang it! - dang it - destroy - destroyPeas - cash - op - continue - cashTex - cashTe - loan - get loa warehouse warehouse\n + runfr + getGuns + approach + initialize + gif + shipsRemainingGIF + initial + initializeS + ship + shipWarfa + imageView + 20 + shipsAttackingGif.set + continueto + setprefwidth + setvisible(false) + chooseF + setPadd + setvisible + vbox.se + attacking + would + choosefightorrun.set + setpre run - player. - GUI() + setvisi + fightand + image HP @@ -165,10 +86,12 @@ shipWarfare.getHowMuchRun() shipWarfare.isUserAttacks() shipWarfare.getNumOfPeasantShips() - GUI(getPlayer()) + shipsApproachingGIF + attackImage + @@ -181,21 +104,16 @@ - - + + + + + - - + - + @@ -654,7 +584,7 @@ - + @@ -665,7 +595,7 @@ - + @@ -742,7 +672,6 @@ - @@ -766,8 +695,9 @@ - - @@ -813,18 +743,17 @@ - + + + + + + + - - - - - - - @@ -832,77 +761,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + @@ -949,7 +875,7 @@ - 1.8 + 1.8.0_201 diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java index d04764d..0048589 100644 --- a/src/ShipWarfareGUI.java +++ b/src/ShipWarfareGUI.java @@ -348,8 +348,8 @@ public class ShipWarfareGUI extends Player{ //Creating an image //Image image = new Image(new FileInputStream("/Users/harismuhammad/Desktop/ShipsAttacking.gif")); - - Image image = new Image(new FileInputStream("/Users/harismuhammad/Documents/TaipanClone/src/ShipsAttacking.gif")); + System.out.println(System.getProperty("user.dir")); + Image image = new Image(new FileInputStream("src/ShipsAttacking.gif")); //Setting the image view ImageView shipsAttackingGif = new ImageView(image);