diff --git a/src/main/java/event/Event06.java b/src/main/java/event/Event06.java index ddb4d8a..d5283f1 100644 --- a/src/main/java/event/Event06.java +++ b/src/main/java/event/Event06.java @@ -58,7 +58,7 @@ public void restBrandon() { gm.ui.messageText.setText("(Your life is full)"); gm.playSE(gm.cannotSound); if (denzel == null){ - denzel = gm.ui.createObjectAndReturn(6, 450, 110, 200, 250, "denzel.png", + denzel = gm.ui.createObjectAndReturn(6, 450, 110, 200, 250, "Character/denzel.png", "Look", "Talk", "Play", "lookDenzel2", "talkDenzel2", "playDenzel"); denzel.setVisible(true); } diff --git a/src/main/java/main/GameManager.java b/src/main/java/main/GameManager.java index cd88b9e..9f98d58 100644 --- a/src/main/java/main/GameManager.java +++ b/src/main/java/main/GameManager.java @@ -42,22 +42,22 @@ public class GameManager extends Application { SoundEffect se = new SoundEffect(); //SOUND - public URL mainTheme = getClass().getClassLoader().getResource("mainTheme.wav"); - public URL monsterTheme = getClass().getClassLoader().getResource("monsterTheme.wav"); - public URL casinoMusic = getClass().getClassLoader().getResource("casinoMusic.wav"); - public URL slotWin = getClass().getClassLoader().getResource("slotWin.wav"); - public URL monsterHit = getClass().getClassLoader().getResource("monsterHit.wav"); - public URL monsterRoar = getClass().getClassLoader().getResource("monsterRoar.wav"); + public URL mainTheme = getClass().getClassLoader().getResource("GeneralStuff/mainTheme.wav"); + public URL monsterTheme = getClass().getClassLoader().getResource("Monsters/monsterTheme.wav"); + public URL casinoMusic = getClass().getClassLoader().getResource("Background/casinoMusic.wav"); + public URL slotWin = getClass().getClassLoader().getResource("Background/slotWin.wav"); + public URL monsterHit = getClass().getClassLoader().getResource("Monsters/monsterHit.wav"); + public URL monsterRoar = getClass().getClassLoader().getResource("Monsters/monsterRoar.wav"); public URL ak47shots = getClass().getClassLoader().getResource("ak47shots.wav"); - public URL pistolShot = getClass().getClassLoader().getResource("pistolShot.wav"); - public URL reload = getClass().getClassLoader().getResource("reload.wav"); - public URL flashlightSwitch = getClass().getClassLoader().getResource("flashlightSwitch.wav"); - public URL heal = getClass().getClassLoader().getResource("heal.wav"); - public URL awSound = getClass().getClassLoader().getResource("awSound.wav"); - public URL gameOverSound = getClass().getClassLoader().getResource("gameOverSound.wav"); - public URL gameOverVoice = getClass().getClassLoader().getResource("gameOverVoice.wav"); - public URL cannotSound = getClass().getClassLoader().getResource("cannotSound.wav"); - public URL engineNoise = getClass().getClassLoader().getResource("engineNoise.wav"); + public URL pistolShot = getClass().getClassLoader().getResource("Weapon/pistolShot.wav"); + public URL reload = getClass().getClassLoader().getResource("Weapon/reload.wav"); + public URL flashlightSwitch = getClass().getClassLoader().getResource("Flashlight/flashlightSwitch.wav"); + public URL heal = getClass().getClassLoader().getResource("Character/heal.wav"); + public URL awSound = getClass().getClassLoader().getResource("Weapon/awSound.wav"); + public URL gameOverSound = getClass().getClassLoader().getResource("GeneralStuff/gameOverSound.wav"); + public URL gameOverVoice = getClass().getClassLoader().getResource("GeneralStuff/gameOverVoice.wav"); + public URL cannotSound = getClass().getClassLoader().getResource("GeneralStuff/cannotSound.wav"); + public URL engineNoise = getClass().getClassLoader().getResource("GeneralStuff/engineNoise.wav"); public URL currentMusic; public static void main(String[] args) { diff --git a/src/main/java/main/SceneChanger.java b/src/main/java/main/SceneChanger.java index b1d5043..50e5371 100644 --- a/src/main/java/main/SceneChanger.java +++ b/src/main/java/main/SceneChanger.java @@ -2,16 +2,27 @@ /** * This class handles the transition of scenes + * * It manages the visibility of background panes, updates game messages, + * * and controls the background music for each scene. */ public class SceneChanger { + // Reference to the GameManager instance GameManager gm; + /** + * Constructor for the SceneChanger class. + * @param gm the GameManager instance that handles game operations. + */ public SceneChanger(GameManager gm) { this.gm = gm; } + /** + * Displays Scene 1: The player's room. + * Updates the background, message text, and music for the scene. + */ public void showScene1(){ gm.ui.bgPane[1].setVisible(true); @@ -26,6 +37,11 @@ public void showScene1(){ gm.currentMusic = gm.mainTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 2: Outside the player's house. + * Updates the background and message text. + */ public void showScene2(){ gm.ui.bgPane[1].setVisible(false); @@ -36,6 +52,11 @@ public void showScene2(){ gm.ui.bgPane[6].setVisible(false); gm.ui.messageText.setText("You are outside your house"); } + + /** + * Displays Scene 3: The woods. + * Updates the background, message text, and plays the monster theme music. + */ public void showScene3(){ gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -49,6 +70,11 @@ public void showScene3(){ gm.currentMusic = gm.monsterTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 4: Encounter with a mysterious character. + * Updates the background, message text, and music for the scene. + */ public void showScene4() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -62,6 +88,11 @@ public void showScene4() { gm.currentMusic = gm.mainTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 5: Near the casino, with monsters blocking the way. + * Updates the background, message text, and plays the monster theme music. + */ public void showScene5() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -75,6 +106,11 @@ public void showScene5() { gm.currentMusic = gm.monsterTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 6: Approaching the casino. + * Updates the background, message text, and music for the scene. + */ public void showScene6() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -88,6 +124,11 @@ public void showScene6() { gm.currentMusic = gm.mainTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 7: Entering the casino. + * Updates the background, message text, and plays casino music. + */ public void showScene7() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -102,6 +143,11 @@ public void showScene7() { gm.currentMusic = gm.casinoMusic; gm.playMusic(gm.currentMusic); } + + /** + * Displays Scene 8: Confronting the monster. + * Updates the background, message text, and plays monster theme music. + */ public void showScene8() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -117,6 +163,11 @@ public void showScene8() { gm.currentMusic = gm.monsterTheme; gm.playMusic(gm.currentMusic); } + + /** + * Displays the leaderboard screen. + * Updates the background, message text, and shows leaderboard information. + */ public void viewLeaderboard() { gm.ui.bgPane[1].setVisible(false); gm.ui.bgPane[2].setVisible(false); @@ -149,6 +200,11 @@ public void showGameOverScreen(int currentBgNum){ gm.playSE(gm.gameOverSound); gm.playSE(gm.gameOverVoice); } + + /** + * Displays the Game Over screen. + * currentBgNum The current background number to hide before showing the Game Over screen. + */ public void exitGameOverScreen(){ gm.ui.titleLabel.setVisible(false); diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index be2b253..5fd6056 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -60,7 +60,7 @@ public void createTitleScreen(Stage primaryStage) { // Background Image ImageView backgroundImage = new ImageView( - new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("titleScreen.png"))) + new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("Background/titleScreen.png"))) ); backgroundImage.setFitWidth(800); backgroundImage.setFitHeight(600); @@ -252,7 +252,7 @@ public void createPlayerField() { background.setFill(Color.BLACK); // Set background color to blue // Load the life icon image - Image lifeImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("heart.png"))); + Image lifeImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("GeneralStuff/heart.png"))); // Loop to create and add life icons to the lifePanel for (int i = 0; i < 5; i++) { // 5 life icons @@ -271,21 +271,21 @@ public void createPlayerField() { inventoryPanel.setStyle("-fx-background-color: black;"); // Initialize and assign flashlightLabel - Image flashlightImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("flashlightIcon.png"))); + Image flashlightImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("Flashlight/flashlightIcon.png"))); flashlightLabel = new Label(); // Assign to flashlightLabel flashlightLabel.setGraphic(new ImageView(flashlightImage)); flashlightLabel.setVisible(false); // Hide initially inventoryPanel.getChildren().add(flashlightLabel); // Initialize and assign pistolLabel - Image pistolImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("pistol.png"))); + Image pistolImage = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("Weapon/pistol.png"))); pistolLabel = new Label(); // Assign to pistolLabel pistolLabel.setGraphic(new ImageView(pistolImage)); pistolLabel.setVisible(false); // Hide initially inventoryPanel.getChildren().add(pistolLabel); // Initialize and assign ak47Label - Image ak47Image = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("ak47.png"))); + Image ak47Image = new Image(Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("Weapon/ak47.png"))); ak47Label = new Label(); // Assign to ak47Label ak47Label.setGraphic(new ImageView(ak47Image)); ak47Label.setVisible(false); // Hide initially @@ -339,61 +339,61 @@ public void displayLeaderboard(List leaderboard) { public void generateScene() { // SCENE 1 - createBackground(1, "bedroom.png"); - createObject(1, 100, 100, 200, 250, "jeramiah.png", + createBackground(1, "Background/bedroom.png"); + createObject(1, 100, 100, 200, 250, "Character/jeramiah.png", "Look", "Talk", "Rest", "lookJeramiah", "talkJeramiah", "restJeramiah"); - createObject(1, 500, 230, 50, 50, "flashlight.png", + createObject(1, 500, 230, 50, 50, "Flashlight/flashlight.png", "Look", "Grab", "Rest", "lookFlashlight", "grabFlashlight", "restFlashlight"); - createArrowButton(1, 650, 150, 50, 50, "rightArrow50x50.png", "goScene2"); + createArrowButton(1, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene2"); // SCENE 2 - createBackground(2, "driveway700x350.png"); - createObject(2, 350, 230, 200, 151, "honda200x151.png", + createBackground(2, "Background/driveway700x350.png"); + createObject(2, 350, 230, 200, 151, "GeneralStuff/honda200x151.png", "Search Inside", "Search hood", "Rest", "search1Honda", "search2Honda", "restHonda"); // SCENE 3 - createBackground(3,"woods.png"); + createBackground(3, "Background/woods.png"); gm.hondaur.addToScene(); gm.engineStealerMonster.addToScene3(); - createArrowButton(3, 650, 150, 50, 50, "rightArrow50x50.png", "goScene4"); + createArrowButton(3, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene4"); // SCENE 4 - createBackground(4,"campfire.png"); - createObject(4, 100,100, 200,250,"denzel.png" + createBackground(4, "Background/campfire.png"); + createObject(4, 100,100, 200,250, "Character/denzel.png" , "Look", "Talk","Rest","lookDenzel", "talkDenzel","restDenzel"); - createArrowButton(4, 650, 150, 50, 50, "rightArrow50x50.png", "goScene5"); + createArrowButton(4, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene5"); // SCENE 5 - createBackground(5,"woods2.png"); - createObject(5, 250,150, 200,200,"hondaTrunk.png" + createBackground(5, "Background/woods2.png"); + createObject(5, 250,150, 200,200, "Monsters/hondaTrunk.png" , "Look", "Talk","Kill","lookHondaTrunk", "talkHondaTrunk","killHondaTrunk"); - createArrowButton(5, 650, 150, 50, 50, "rightArrow50x50.png", "goScene6"); + createArrowButton(5, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene6"); gm.theodoor.addToScene(); gm.wheeler.addToScene(); // SCENE 6 - createBackground(6, "casinoEntrance.png"); - createObject(6, 80, 140, 200, 250, "brandon.png", + createBackground(6, "Background/casinoEntrance.png"); + createObject(6, 80, 140, 200, 250, "Character/brandon.png", "Look", "Talk", "Rest", "lookBrandon", "talkBrandon", "restBrandon"); - createArrowButton(6, 650, 150, 50, 50, "rightArrow50x50.png", "goScene7"); + createArrowButton(6, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene7"); // SCENE 7 - createBackground(7, "casino.png"); - createObject(7, 200, 130, 200, 224, "julian.png", + createBackground(7, "Background/casino.png"); + createObject(7, 200, 130, 200, 224, "Character/julian.png", "Look", "Talk", "Hold", "lookJulian", "talkJulian", "holdJulian"); - createObject(7, 350, 30, 300, 354, "slotMachine.png", + createObject(7, 350, 30, 300, 354, "Background/slotMachine.png", "Look", "Talk", "Spin", "lookSlotMachine", "talkSlotMachine", "spinSlotMachine"); - createObject(7, 80, 50, 225, 300, "adrian.png", + createObject(7, 80, 50, 225, 300, "Character/adrian.png", "Look", "Talk", "Thank", "lookAdrian", "talkAdrian", "thankAdrian"); - createArrowButton(7, 650, 150, 50, 50, "rightArrow50x50.png", "goScene8"); + createArrowButton(7, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goScene8"); // SCENE 8 - createBackground(8, "cityStreet.png"); + createBackground(8, "Background/cityStreet.png"); gm.engineStealerMonster.addToScene8(); - createArrowButton(8, 650, 150, 50, 50, "rightArrow50x50.png", "goLeaderboard"); + createArrowButton(8, 650, 150, 50, 50, "GeneralStuff/rightArrow50x50.png", "goLeaderboard"); // LEADERBOARD SCREEN - createBackground(9,"bedroom.png"); + createBackground(9, "Background/bedroom.png"); } } \ No newline at end of file diff --git a/src/main/java/monsters/EngineStealerMonster.java b/src/main/java/monsters/EngineStealerMonster.java index 7ae0240..615d016 100644 --- a/src/main/java/monsters/EngineStealerMonster.java +++ b/src/main/java/monsters/EngineStealerMonster.java @@ -12,12 +12,12 @@ public EngineStealerMonster(GameManager gm) { } public void addToScene3() { - gm.ui.createObject(2, 600,250,50,38,"sponge.png", + gm.ui.createObject(2, 600,250,50,38, "Monsters/sponge.png", "Look","Talk", "Follow", "lookSponge", "talkSponge", "followSponge"); } public void addToScene8() { - gm.ui.createObject(8,200,100,350, 263,"spongeFinalBoss.png", + gm.ui.createObject(8,200,100,350, 263, "Monsters/spongeFinalBoss.png", "Talk","Attack","Let Live","talkSponge2","attackSponge", "letLiveSponge"); } @@ -72,7 +72,7 @@ public void attackSponge(){ if(currentLife == 0){ if (blood == null) { - blood = gm.ui.createObjectAndReturn(8, 200, 100, 200, 233, "blood.png", "", "", "", "", "", ""); + blood = gm.ui.createObjectAndReturn(8, 200, 100, 200, 233, "Monsters/blood.png", "", "", "", "", "", ""); } // Make them visible diff --git a/src/main/java/monsters/Hondaur.java b/src/main/java/monsters/Hondaur.java index 84afd64..a528cfc 100644 --- a/src/main/java/monsters/Hondaur.java +++ b/src/main/java/monsters/Hondaur.java @@ -13,7 +13,7 @@ public Hondaur(GameManager gm) { } public void addToScene() { - gm.ui.createObject(3, 300,100,200,283,"Hondaur_2.png", + gm.ui.createObject(3, 300,100,200,283, "Monsters/Hondaur_2.png", "Look","Talk", "Attack", "lookHondaur", "talkHondaur", "attackHondaur"); } @@ -59,10 +59,10 @@ public void attackHondaur() { if(currentLife == 0){ if (blood == null) { - blood = gm.ui.createObjectAndReturn(3, 340, 100, 200, 233, "blood.png", "", "", "", "", "", ""); + blood = gm.ui.createObjectAndReturn(3, 340, 100, 200, 233, "Monsters/blood.png", "", "", "", "", "", ""); } if (anthony == null) { - anthony = gm.ui.createObjectAndReturn(3, 100, 100, 200, 250, "anthony.png", + anthony = gm.ui.createObjectAndReturn(3, 100, 100, 200, 250, "Character/anthony.png", "Look", "Talk", "Touch", "lookAnthony", "talkAnthony", "touchAnthony"); } diff --git a/src/main/java/monsters/Theodoor.java b/src/main/java/monsters/Theodoor.java index ee83726..9d30317 100644 --- a/src/main/java/monsters/Theodoor.java +++ b/src/main/java/monsters/Theodoor.java @@ -12,7 +12,7 @@ public Theodoor(GameManager gm) { } public void addToScene() { - gm.ui.createObject(5, 450,95,200,283,"theodoor.png", + gm.ui.createObject(5, 450,95,200,283, "Monsters/theodoor.png", "Look","Talk", "Attack", "lookTheodoor", "talkTheodoor", "attackTheodoor"); } @@ -61,7 +61,7 @@ public void attackTheodoor() { if(currentLife == 0){ if (blood == null) { - blood = gm.ui.createObjectAndReturn(5, 450, 95, 200, 233, "blood.png", "", "", "", "", "", ""); + blood = gm.ui.createObjectAndReturn(5, 450, 95, 200, 233, "Monsters/blood.png", "", "", "", "", "", ""); } // Make them visible diff --git a/src/main/java/monsters/Wheeler.java b/src/main/java/monsters/Wheeler.java index f13aa07..1704d76 100644 --- a/src/main/java/monsters/Wheeler.java +++ b/src/main/java/monsters/Wheeler.java @@ -12,7 +12,7 @@ public Wheeler(GameManager gm) { } public void addToScene() { - gm.ui.createObject(5, 50,95,200,283,"wheel.png", + gm.ui.createObject(5, 50,95,200,283, "Monsters/wheel.png", "Look","Talk", "Attack", "lookWheeler", "talkWheeler", "attackWheeler"); } @@ -61,7 +61,7 @@ public void attackWheeler() { if(currentLife == 0){ if (blood == null) { - blood = gm.ui.createObjectAndReturn(5, 50, 95, 200, 233, "blood.png", "", "", "", "", "", ""); + blood = gm.ui.createObjectAndReturn(5, 50, 95, 200, 233, "Monsters/blood.png", "", "", "", "", "", ""); } // Make them visible diff --git a/src/main/resources/Empty.png b/src/main/resources/Background/Empty.png similarity index 100% rename from src/main/resources/Empty.png rename to src/main/resources/Background/Empty.png diff --git a/src/main/resources/bedroom.png b/src/main/resources/Background/bedroom.png similarity index 100% rename from src/main/resources/bedroom.png rename to src/main/resources/Background/bedroom.png diff --git a/src/main/resources/bedroom_bg.png b/src/main/resources/Background/bedroom_bg.png similarity index 100% rename from src/main/resources/bedroom_bg.png rename to src/main/resources/Background/bedroom_bg.png diff --git a/src/main/resources/campfire.png b/src/main/resources/Background/campfire.png similarity index 100% rename from src/main/resources/campfire.png rename to src/main/resources/Background/campfire.png diff --git a/src/main/resources/casino.png b/src/main/resources/Background/casino.png similarity index 100% rename from src/main/resources/casino.png rename to src/main/resources/Background/casino.png diff --git a/src/main/resources/casinoEntrance.png b/src/main/resources/Background/casinoEntrance.png similarity index 100% rename from src/main/resources/casinoEntrance.png rename to src/main/resources/Background/casinoEntrance.png diff --git a/src/main/resources/casinoMusic.wav b/src/main/resources/Background/casinoMusic.wav similarity index 100% rename from src/main/resources/casinoMusic.wav rename to src/main/resources/Background/casinoMusic.wav diff --git a/src/main/resources/cityStreet.png b/src/main/resources/Background/cityStreet.png similarity index 100% rename from src/main/resources/cityStreet.png rename to src/main/resources/Background/cityStreet.png diff --git a/src/main/resources/driveway700x350(1).png b/src/main/resources/Background/driveway700x350(1).png similarity index 100% rename from src/main/resources/driveway700x350(1).png rename to src/main/resources/Background/driveway700x350(1).png diff --git a/src/main/resources/driveway700x350.png b/src/main/resources/Background/driveway700x350.png similarity index 100% rename from src/main/resources/driveway700x350.png rename to src/main/resources/Background/driveway700x350.png diff --git a/src/main/resources/slotMachine.png b/src/main/resources/Background/slotMachine.png similarity index 100% rename from src/main/resources/slotMachine.png rename to src/main/resources/Background/slotMachine.png diff --git a/src/main/resources/slotWin.wav b/src/main/resources/Background/slotWin.wav similarity index 100% rename from src/main/resources/slotWin.wav rename to src/main/resources/Background/slotWin.wav diff --git a/src/main/resources/titleScreen.png b/src/main/resources/Background/titleScreen.png similarity index 100% rename from src/main/resources/titleScreen.png rename to src/main/resources/Background/titleScreen.png diff --git a/src/main/resources/title_screen3.png b/src/main/resources/Background/title_screen3.png similarity index 100% rename from src/main/resources/title_screen3.png rename to src/main/resources/Background/title_screen3.png diff --git a/src/main/resources/woods.png b/src/main/resources/Background/woods.png similarity index 100% rename from src/main/resources/woods.png rename to src/main/resources/Background/woods.png diff --git a/src/main/resources/woods2.png b/src/main/resources/Background/woods2.png similarity index 100% rename from src/main/resources/woods2.png rename to src/main/resources/Background/woods2.png diff --git a/src/main/resources/woods_bg.png b/src/main/resources/Background/woods_bg.png similarity index 100% rename from src/main/resources/woods_bg.png rename to src/main/resources/Background/woods_bg.png diff --git a/src/main/resources/adrian.png b/src/main/resources/Character/adrian.png similarity index 100% rename from src/main/resources/adrian.png rename to src/main/resources/Character/adrian.png diff --git a/src/main/resources/anthony.png b/src/main/resources/Character/anthony.png similarity index 100% rename from src/main/resources/anthony.png rename to src/main/resources/Character/anthony.png diff --git a/src/main/resources/brandon.png b/src/main/resources/Character/brandon.png similarity index 100% rename from src/main/resources/brandon.png rename to src/main/resources/Character/brandon.png diff --git a/src/main/resources/brandon2.png b/src/main/resources/Character/brandon2.png similarity index 100% rename from src/main/resources/brandon2.png rename to src/main/resources/Character/brandon2.png diff --git a/src/main/resources/denzel.png b/src/main/resources/Character/denzel.png similarity index 100% rename from src/main/resources/denzel.png rename to src/main/resources/Character/denzel.png diff --git a/src/main/resources/heal.wav b/src/main/resources/Character/heal.wav similarity index 100% rename from src/main/resources/heal.wav rename to src/main/resources/Character/heal.wav diff --git a/src/main/resources/jeramiah.png b/src/main/resources/Character/jeramiah.png similarity index 100% rename from src/main/resources/jeramiah.png rename to src/main/resources/Character/jeramiah.png diff --git a/src/main/resources/julian.png b/src/main/resources/Character/julian.png similarity index 100% rename from src/main/resources/julian.png rename to src/main/resources/Character/julian.png diff --git a/src/main/resources/kevin.png b/src/main/resources/Character/kevin.png similarity index 100% rename from src/main/resources/kevin.png rename to src/main/resources/Character/kevin.png diff --git a/src/main/resources/flashlight.png b/src/main/resources/Flashlight/flashlight.png similarity index 100% rename from src/main/resources/flashlight.png rename to src/main/resources/Flashlight/flashlight.png diff --git a/src/main/resources/flashlightIcon.png b/src/main/resources/Flashlight/flashlightIcon.png similarity index 100% rename from src/main/resources/flashlightIcon.png rename to src/main/resources/Flashlight/flashlightIcon.png diff --git a/src/main/resources/flashlightSwitch.wav b/src/main/resources/Flashlight/flashlightSwitch.wav similarity index 100% rename from src/main/resources/flashlightSwitch.wav rename to src/main/resources/Flashlight/flashlightSwitch.wav diff --git a/src/main/resources/cannotSound.wav b/src/main/resources/GeneralStuff/cannotSound.wav similarity index 100% rename from src/main/resources/cannotSound.wav rename to src/main/resources/GeneralStuff/cannotSound.wav diff --git a/src/main/resources/engineNoise.wav b/src/main/resources/GeneralStuff/engineNoise.wav similarity index 100% rename from src/main/resources/engineNoise.wav rename to src/main/resources/GeneralStuff/engineNoise.wav diff --git a/src/main/resources/gameOverSound.wav b/src/main/resources/GeneralStuff/gameOverSound.wav similarity index 100% rename from src/main/resources/gameOverSound.wav rename to src/main/resources/GeneralStuff/gameOverSound.wav diff --git a/src/main/resources/gameOverVoice.wav b/src/main/resources/GeneralStuff/gameOverVoice.wav similarity index 100% rename from src/main/resources/gameOverVoice.wav rename to src/main/resources/GeneralStuff/gameOverVoice.wav diff --git a/src/main/resources/heart.png b/src/main/resources/GeneralStuff/heart.png similarity index 100% rename from src/main/resources/heart.png rename to src/main/resources/GeneralStuff/heart.png diff --git a/src/main/resources/honda200x151.png b/src/main/resources/GeneralStuff/honda200x151.png similarity index 100% rename from src/main/resources/honda200x151.png rename to src/main/resources/GeneralStuff/honda200x151.png diff --git a/src/main/resources/mainTheme.wav b/src/main/resources/GeneralStuff/mainTheme.wav similarity index 100% rename from src/main/resources/mainTheme.wav rename to src/main/resources/GeneralStuff/mainTheme.wav diff --git a/src/main/resources/rightArrow50x50.png b/src/main/resources/GeneralStuff/rightArrow50x50.png similarity index 100% rename from src/main/resources/rightArrow50x50.png rename to src/main/resources/GeneralStuff/rightArrow50x50.png diff --git a/src/main/resources/Hondaur_2.png b/src/main/resources/Monsters/Hondaur_2.png similarity index 100% rename from src/main/resources/Hondaur_2.png rename to src/main/resources/Monsters/Hondaur_2.png diff --git a/src/main/resources/blood.png b/src/main/resources/Monsters/blood.png similarity index 100% rename from src/main/resources/blood.png rename to src/main/resources/Monsters/blood.png diff --git a/src/main/resources/hondaTrunk.png b/src/main/resources/Monsters/hondaTrunk.png similarity index 100% rename from src/main/resources/hondaTrunk.png rename to src/main/resources/Monsters/hondaTrunk.png diff --git a/src/main/resources/monsterHit.wav b/src/main/resources/Monsters/monsterHit.wav similarity index 100% rename from src/main/resources/monsterHit.wav rename to src/main/resources/Monsters/monsterHit.wav diff --git a/src/main/resources/monsterRoar.wav b/src/main/resources/Monsters/monsterRoar.wav similarity index 100% rename from src/main/resources/monsterRoar.wav rename to src/main/resources/Monsters/monsterRoar.wav diff --git a/src/main/resources/monsterTheme.wav b/src/main/resources/Monsters/monsterTheme.wav similarity index 100% rename from src/main/resources/monsterTheme.wav rename to src/main/resources/Monsters/monsterTheme.wav diff --git a/src/main/resources/sponge.png b/src/main/resources/Monsters/sponge.png similarity index 100% rename from src/main/resources/sponge.png rename to src/main/resources/Monsters/sponge.png diff --git a/src/main/resources/spongeFinalBoss.png b/src/main/resources/Monsters/spongeFinalBoss.png similarity index 100% rename from src/main/resources/spongeFinalBoss.png rename to src/main/resources/Monsters/spongeFinalBoss.png diff --git a/src/main/resources/theodoor.png b/src/main/resources/Monsters/theodoor.png similarity index 100% rename from src/main/resources/theodoor.png rename to src/main/resources/Monsters/theodoor.png diff --git a/src/main/resources/wheel.png b/src/main/resources/Monsters/wheel.png similarity index 100% rename from src/main/resources/wheel.png rename to src/main/resources/Monsters/wheel.png diff --git a/src/main/resources/ak47.png b/src/main/resources/Weapon/ak47.png similarity index 100% rename from src/main/resources/ak47.png rename to src/main/resources/Weapon/ak47.png diff --git a/src/main/resources/ak47Shots.wav b/src/main/resources/Weapon/ak47Shots.wav similarity index 100% rename from src/main/resources/ak47Shots.wav rename to src/main/resources/Weapon/ak47Shots.wav diff --git a/src/main/resources/awSound.wav b/src/main/resources/Weapon/awSound.wav similarity index 100% rename from src/main/resources/awSound.wav rename to src/main/resources/Weapon/awSound.wav diff --git a/src/main/resources/pistol.png b/src/main/resources/Weapon/pistol.png similarity index 100% rename from src/main/resources/pistol.png rename to src/main/resources/Weapon/pistol.png diff --git a/src/main/resources/pistolShot.wav b/src/main/resources/Weapon/pistolShot.wav similarity index 100% rename from src/main/resources/pistolShot.wav rename to src/main/resources/Weapon/pistolShot.wav diff --git a/src/main/resources/reload.wav b/src/main/resources/Weapon/reload.wav similarity index 100% rename from src/main/resources/reload.wav rename to src/main/resources/Weapon/reload.wav