diff --git a/source/core/assets/images/inventory_ui/chop_key.png b/source/core/assets/images/inventory_ui/chop_key.png index 276e6d1ef..c2f1fc7f9 100644 Binary files a/source/core/assets/images/inventory_ui/chop_key.png and b/source/core/assets/images/inventory_ui/chop_key.png differ diff --git a/source/core/assets/images/inventory_ui/combine_key.png b/source/core/assets/images/inventory_ui/combine_key.png index de79127f9..d276d95c6 100644 Binary files a/source/core/assets/images/inventory_ui/combine_key.png and b/source/core/assets/images/inventory_ui/combine_key.png differ diff --git a/source/core/assets/images/inventory_ui/cook_key.png b/source/core/assets/images/inventory_ui/cook_key.png new file mode 100644 index 000000000..2c7e7a35c Binary files /dev/null and b/source/core/assets/images/inventory_ui/cook_key.png differ diff --git a/source/core/assets/images/inventory_ui/dispose_key.png b/source/core/assets/images/inventory_ui/dispose_key.png new file mode 100644 index 000000000..14309e7a1 Binary files /dev/null and b/source/core/assets/images/inventory_ui/dispose_key.png differ diff --git a/source/core/assets/images/inventory_ui/place_key.png b/source/core/assets/images/inventory_ui/place_key.png new file mode 100644 index 000000000..ad756f000 Binary files /dev/null and b/source/core/assets/images/inventory_ui/place_key.png differ diff --git a/source/core/assets/images/inventory_ui/rotate_key.png b/source/core/assets/images/inventory_ui/rotate_key.png index 90dddcb34..dd85a82c2 100644 Binary files a/source/core/assets/images/inventory_ui/rotate_key.png and b/source/core/assets/images/inventory_ui/rotate_key.png differ diff --git a/source/core/assets/images/inventory_ui/submit_key.png b/source/core/assets/images/inventory_ui/submit_key.png new file mode 100644 index 000000000..f465f8c93 Binary files /dev/null and b/source/core/assets/images/inventory_ui/submit_key.png differ diff --git a/source/core/assets/images/inventory_ui/take_key.png b/source/core/assets/images/inventory_ui/take_key.png new file mode 100644 index 000000000..1dca360f9 Binary files /dev/null and b/source/core/assets/images/inventory_ui/take_key.png differ diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java index 25d4efb5a..eacd802e9 100644 --- a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java +++ b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java @@ -144,6 +144,15 @@ public class ForestGameArea extends GameArea { "images/platecomponent/stackedplates/5plates.png", "images/inventory_ui/slot.png", "images/inventory_ui/null_image.png", + "images/inventory_ui/interact_key.png", + "images/inventory_ui/combine_key.png", + "images/inventory_ui/rotate_key.png", + "images/inventory_ui/chop_key.png", + "images/inventory_ui/place_key.png", + "images/inventory_ui/take_key.png", + "images/inventory_ui/submit_key.png", + "images/inventory_ui/dispose_key.png", + "images/inventory_ui/cook_key.png" }; private static final String[] forestTextureAtlases = { "images/Cutscenes/cutscene_badEnd.atlas", diff --git a/source/core/src/main/com/csse3200/game/components/cutscenes/Cutscene.java b/source/core/src/main/com/csse3200/game/components/cutscenes/Cutscene.java index 0495ef5d6..4bd21320d 100644 --- a/source/core/src/main/com/csse3200/game/components/cutscenes/Cutscene.java +++ b/source/core/src/main/com/csse3200/game/components/cutscenes/Cutscene.java @@ -2,6 +2,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; +import com.csse3200.game.GdxGame; import com.csse3200.game.components.Component; import com.csse3200.game.components.cutscenes.scenes.AnimatedScene; import com.csse3200.game.components.cutscenes.scenes.Scene; @@ -127,6 +128,7 @@ protected void nextCutscene() { loadScene(currentSceneIndex); } else { logger.info("Cutscene finished. Triggering next event."); + ServiceLocator.getLevelService().setCurrLevel(GdxGame.LevelType.LEVEL_1); ServiceLocator.getCutsceneScreen().getCutsceneScreenDisplay().getEntity().getEvents().trigger("cutsceneEnded"); } } diff --git a/source/core/src/main/com/csse3200/game/components/cutscenes/CutsceneScreenDisplay.java b/source/core/src/main/com/csse3200/game/components/cutscenes/CutsceneScreenDisplay.java index c7475b201..ee8ae79dc 100644 --- a/source/core/src/main/com/csse3200/game/components/cutscenes/CutsceneScreenDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/cutscenes/CutsceneScreenDisplay.java @@ -8,6 +8,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; +import com.csse3200.game.GdxGame; +import com.csse3200.game.services.ServiceLocator; import com.csse3200.game.ui.UIComponent; import com.csse3200.game.components.maingame.TextDisplay; import org.slf4j.Logger; @@ -67,6 +69,7 @@ private void setupUI() { @Override public void changed(ChangeEvent changeEvent, Actor actor) { logger.info("Backstory skipped."); + ServiceLocator.getLevelService().setCurrLevel(GdxGame.LevelType.LEVEL_1); entity.getEvents().trigger("cutsceneEnded"); // Trigger skip } }); @@ -118,7 +121,7 @@ public void dispose() { super.dispose(); if (table != null) { - table.clear(); // Clear the table safely + table.clear(); } if (textDisplay != null && textDisplay.getTable() != null) { textDisplay.getTable().clear(); // Clear the text display table diff --git a/source/core/src/main/com/csse3200/game/components/levels/LevelComponent.java b/source/core/src/main/com/csse3200/game/components/levels/LevelComponent.java index 221eabff3..bb4e6da52 100644 --- a/source/core/src/main/com/csse3200/game/components/levels/LevelComponent.java +++ b/source/core/src/main/com/csse3200/game/components/levels/LevelComponent.java @@ -56,6 +56,7 @@ public void initialiseAcceptableCustomers() { levelFive.add("LEWIS"); acceptableCustomers = new HashMap<>(); + acceptableCustomers.put(GdxGame.LevelType.LEVEL_0, levelOne); acceptableCustomers.put(GdxGame.LevelType.LEVEL_1, levelOne); acceptableCustomers.put(GdxGame.LevelType.LEVEL_2, levelTwo); acceptableCustomers.put(GdxGame.LevelType.LEVEL_3, levelThree); diff --git a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuBackground.java b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuBackground.java index 849511c63..6f07393a1 100644 --- a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuBackground.java +++ b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuBackground.java @@ -1,76 +1,70 @@ package com.csse3200.game.components.mainmenu; - -import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Table; -import com.csse3200.game.components.maingame.PauseMenuDisplay; import com.csse3200.game.services.ServiceLocator; import com.csse3200.game.ui.UIComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class MainMenuBackground extends UIComponent{ - - private Table table; - private static final Logger logger = LoggerFactory.getLogger(PauseMenuDisplay.class); - private static final String[] backgroundTextures = {"images/Cutscenes/bg.png"}; - - private float screenWidth = Gdx.graphics.getWidth(); - private float screenHeight = Gdx.graphics.getHeight(); - private String image; - - public MainMenuBackground() { - super(); - } - - @Override - public void create() { - super.create(); - table = new Table(); - table.setFillParent(true); - table.setVisible(true); - stage.addActor(table); - ServiceLocator.getResourceService().loadTextures(backgroundTextures); - - setupBackground(); - } - - public void setupBackground() { - Texture texture = ServiceLocator.getResourceService().getAsset("images/Cutscenes/bg.png", - Texture.class); - Image image = new Image(texture); - image.setFillParent(true); - setImage("images/Cutscenes/bg.png"); - table.add(image); - } - - @Override - protected void draw(SpriteBatch batch) { - } - - @Override - public void setStage(Stage mock) { - } - - public void setTable(Table table) { - this.table = table; - } - - public void setImage(String image){ - this.image = image; - } - - public String getImage(){ - return this.image; - } - - public String getImage(Table table){ - return table.getChildren().get(0).toString(); - } - - +public class MainMenuBackground extends UIComponent { + + private Table table; + private static final Logger logger = LoggerFactory.getLogger(MainMenuBackground.class); // Updated to use MainMenuBackground.class + private static final String BACKGROUND_IMAGE_PATH = "images/Cutscenes/bg.png"; // Defined constant for repeated string + private static final String[] backgroundTextures = {BACKGROUND_IMAGE_PATH}; + + private String image; + + public MainMenuBackground() { + super(); + } + + @Override + public void create() { + super.create(); + table = new Table(); + table.setFillParent(true); + table.setVisible(true); + stage.addActor(table); + ServiceLocator.getResourceService().loadTextures(backgroundTextures); + + setupBackground(); + } + + public void setupBackground() { + Texture texture = ServiceLocator.getResourceService().getAsset(BACKGROUND_IMAGE_PATH, Texture.class); // Used constant for image path + Image bgImage = new Image(texture); // Renamed local variable to avoid conflict with the field 'image' + bgImage.setFillParent(true); + setImage(BACKGROUND_IMAGE_PATH); + table.add(bgImage); + } + + @Override + protected void draw(SpriteBatch batch) { + // Method intentionally left empty (addressed empty method warning) + } + + @Override + public void setStage(Stage mock) { + // Method intentionally left empty (addressed empty method warning) + } + + public void setTable(Table table) { + this.table = table; + } + + public void setImage(String image) { + this.image = image; + } + + public String getImage() { + return this.image; + } + + public String getImage(Table table) { + return table.getChildren().get(0).toString(); + } } - diff --git a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java index a60190071..af6a5ba73 100644 --- a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuDisplay.java @@ -17,272 +17,244 @@ import com.csse3200.game.ui.UIComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Random; +import java.util.Random; /** * An ui component for displaying the Main menu. */ public class MainMenuDisplay extends UIComponent { - private static final Logger logger = LoggerFactory.getLogger(MainMenuDisplay.class); - private static final float Z_INDEX = 2f; - private Table table; - private Table logo; - - private float scale_of_button = 1.5f; - - // Animation variables - private float startX=0,startY=0,endX=500,endY=500,duration=8,degrees=1000,rotate_duration=10; - - - private int number_of_animals=10; - private Image animals[]=new Image[number_of_animals]; - // List of animals to be displayed - private String list_of_animals[]={"thegoat","goos","gorill","monki","wolf","raw_acai","raw_banana","chopped_strawb","chopped_chocolate","salad"}; - private int animal_on_screen=2; - // private int animal_on_screen=5; - private float width_of_screen =Gdx.graphics.getWidth(),height_of_screen=Gdx.graphics.getHeight(); - - private Timer.Task animalMoveTask,clearstage; - - private static final String backgroundMusic = "sounds/Main_Menu_BGM.mp3"; - - private static final String[] screenMusic = {backgroundMusic}; - - private Music myMusic; - - @Override - public void create() { - - ServiceLocator.getResourceService().loadMusic(screenMusic); - ServiceLocator.getResourceService().loadAll(); - ServiceLocator.registerMainMenuDisplay(this); - super.create(); - animalMoveTask = new Timer.Task() { - public void run() { - background(); - addActors(); - } - }; - Timer.schedule(animalMoveTask,0,2); - clearstage = new Timer.Task() { - public void run() { - Array actors=stage.getActors(); - for (Actor actor : actors) { - if(actor.getX()<-230 || actor.getX()>width_of_screen+230 || actor.getY()<-230 || actor.getY()>height_of_screen+230){ - actor.remove(); - } + private static final Logger logger = LoggerFactory.getLogger(MainMenuDisplay.class); + private static final float Z_INDEX = 2f; + private Table table; + + private float scaleOfButton = 1.5f; + + // Animation variables + private float startX = 0; + private float startY = 0; + private float endX = 500; + private float endY = 500; + private float duration = 8; + private float degrees = 1000; + private float rotateDuration = 10; + + private int numberOfAnimals = 10; + private String[] listOfAnimals = {"thegoat", "goos", "gorill", "monki", "wolf", "raw_acai", "raw_banana", "chopped_strawb", "chopped_chocolate", "salad"}; + + private int animalOnScreen = 2; + + private float widthOfScreen = Gdx.graphics.getWidth(); + private float heightOfScreen = Gdx.graphics.getHeight(); + + private Timer.Task animalMoveTask; + private Timer.Task clearStage; + + private static final String BACKGROUND_MUSIC = "sounds/Main_Menu_BGM.mp3"; + private static final String[] SCREEN_MUSIC = {BACKGROUND_MUSIC}; + + private Random rand = new Random(); // Reuse the Random instance as suggested + + @Override + public void create() { + ServiceLocator.getResourceService().loadMusic(SCREEN_MUSIC); + ServiceLocator.getResourceService().loadAll(); + ServiceLocator.registerMainMenuDisplay(this); + super.create(); + + animalMoveTask = new Timer.Task() { + public void run() { + background(); + addActors(); + } + }; + Timer.schedule(animalMoveTask, 0, 2); + + clearStage = new Timer.Task() { + public void run() { + Array actors = stage.getActors(); + for (Actor actor : actors) { + if (actor.getX() < -230 || actor.getX() > widthOfScreen + 230 || actor.getY() < -230 || actor.getY() > heightOfScreen + 230) { + actor.remove(); + } + } + } + }; + Timer.schedule(clearStage, 0, 6); + playMusic(); + } + + public int randomGenerator(int min, int max) { + return rand.nextInt(max - min + 1) + min; + } + + public void background() { + for (int x = 1; x <= animalOnScreen; x++) { + int random = randomGenerator(0, 3); + if (random == 0) { + startX = -250; + startY = randomGenerator(0, (int) heightOfScreen); + endX = widthOfScreen + 250; + endY = randomGenerator(0, (int) heightOfScreen); + } else if (random == 1) { + startX = randomGenerator(0, (int) widthOfScreen); + startY = -250; + endX = randomGenerator(0, (int) widthOfScreen); + endY = heightOfScreen + 250; + } else if (random == 2) { + startX = widthOfScreen + 250; + startY = randomGenerator(0, (int) heightOfScreen); + endX = -250; + endY = randomGenerator(0, (int) heightOfScreen); + } else if (random == 3) { + startX = randomGenerator(0, (int) widthOfScreen); + startY = heightOfScreen + 250; + endX = randomGenerator(0, (int) widthOfScreen); + endY = -250; + } + + random = randomGenerator(1, numberOfAnimals) - 1; + Image actor = new Image(ServiceLocator.getResourceService().getAsset("images/main_menu_animals/" + listOfAnimals[random] + ".png", Texture.class)); + actor.addAction(Actions.parallel(Actions.moveTo(endX, endY, duration), Actions.rotateBy(degrees, rotateDuration))); + actor.setPosition(startX, startY); + float height = actor.getHeight(); + float width = actor.getWidth(); + actor.setOrigin(width / 2, height / 2); + actor.setScale((float) (widthOfScreen * 2.6 / 10000 + 0.17), (float) (heightOfScreen * 4.16 / 10000 + 0.17)); + actor.toBack(); + stage.addActor(actor); } - } - }; - Timer.schedule(clearstage,0,6); - playMusic(); - } - - public int randomGenerator(int min,int max) { - Random rand = new Random(); - return rand.nextInt(max-min+1)+min; - } - /** - * Creates the background of the main menu. - * This function adds the animals to the screen by randomly selecting a start and end position and - * animating the animal to move from the start to the end position. - * The animal will also rotate as it moves. - * */ - - public void background(){ - - float height,width; - for(int x=1;x<=animal_on_screen;x++) { - //random start and end position - int random=randomGenerator(0,3); - if(random==0) // start from left - { - startX=-250; - startY=randomGenerator(0,(int)height_of_screen); - endX=width_of_screen+250; - endY=randomGenerator(0,(int)height_of_screen); - } - else if(random==1) // start from bottom - { - startX=randomGenerator(0,(int)width_of_screen); - startY=-250; - endX=randomGenerator(0,(int)width_of_screen); - endY=height_of_screen+250; - } - else if(random==2) // start from right - { - startX=width_of_screen+250; - startY=randomGenerator(0,(int)height_of_screen); - endX=-250; - endY=randomGenerator(0,(int)height_of_screen); - } - else if(random==3) // start from top - { - startX=randomGenerator(0,(int)width_of_screen); - startY=height_of_screen+250; - endX=randomGenerator(0,(int)width_of_screen); - endY=-250; - } - - random=randomGenerator(1,number_of_animals)-1; - Image actor=new Image(ServiceLocator.getResourceService().getAsset("images/main_menu_animals/"+list_of_animals[random]+".png",Texture.class)); - actor.addAction(Actions.parallel(Actions.moveTo(endX,endY,duration),Actions.rotateBy(degrees,rotate_duration))); - actor.setPosition(startX,startY); - height=actor.getHeight(); - width=actor.getWidth(); - actor.setOrigin(width/2,height/2); - actor.setScale((float)(width_of_screen*2.6/10000 + 0.17), (float)(height_of_screen*4.16/10000 + 0.17)); - actor.toBack(); - stage.addActor(actor); + stage.act(); + } + + private void addActors() { + Table logo = new Table(); + logo.setFillParent(true); + + table = new Table(); + table.setFillParent(true); + + Image title = new Image(ServiceLocator.getResourceService().getAsset("images/Logo.png", Texture.class)); + + ImageTextButton startBtn = new ImageTextButton("Start", skin); + ImageTextButton loadBtn = new ImageTextButton("Load", skin); + ImageTextButton settingsBtn = new ImageTextButton("Settings", skin); + ImageTextButton exitBtn = new ImageTextButton("Exit", skin); + //ImageTextButton tutBtn = new ImageTextButton("Tutorial", skin); + ImageTextButton cutsceneBtn = new ImageTextButton("Cutscene Temp", skin); + + startBtn.setTransform(true); + startBtn.setScale(scaleOfButton); + loadBtn.setTransform(true); + loadBtn.setScale(scaleOfButton); + settingsBtn.setTransform(true); + settingsBtn.setScale(scaleOfButton); + exitBtn.setTransform(true); + exitBtn.setScale(scaleOfButton); + cutsceneBtn.setTransform(true); + cutsceneBtn.setScale(scaleOfButton); + + startBtn.addListener( + new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + logger.debug("Start button clicked"); + animalMoveTask.cancel(); + entity.getEvents().trigger("start"); + } + }); + + loadBtn.addListener( + new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + logger.debug("Load button clicked"); + animalMoveTask.cancel(); + entity.getEvents().trigger("load"); + } + }); + + settingsBtn.addListener( + new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + logger.debug("Settings button clicked"); + animalMoveTask.cancel(); + entity.getEvents().trigger("settings"); + } + }); + + exitBtn.addListener( + new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + logger.debug("Exit button clicked"); + animalMoveTask.cancel(); + entity.getEvents().trigger("exit"); + } + }); + + cutsceneBtn.addListener( + new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + logger.debug("Cutscene button clicked"); + entity.getEvents().trigger("cutscene"); + } + }); + + logo.add(title).pad(0, 0, 250, 0); + + table.add(startBtn).pad(600, 0, 0, 0).height(60); + table.add(loadBtn).pad(600, 95, 0, 0).height(60); + table.add(settingsBtn).pad(600, 90, 0, 0).height(60); + table.add(exitBtn).pad(600, 120, 0, 0).height(60); + //table.add(tutBtn).pad(600, 80, 0, 0).height(60); + table.add(cutsceneBtn).pad(800, 0, 0, 0).height(60); + + table.center(); + + stage.addActor(logo); + stage.addActor(table); + } + + private void playMusic() { + Music music = ServiceLocator.getResourceService().getAsset(BACKGROUND_MUSIC, Music.class); + music.setLooping(true); + music.setVolume(0.05f); + music.play(); } - stage.act(); - } - - /** - * Adds the main title screen elements and buttons. - * */ - private void addActors() { - logo = new Table(); - - - logo.setFillParent(true); - - table = new Table(); - table.setFillParent(true); - - Image title = - new Image( - ServiceLocator.getResourceService() - .getAsset("images/Logo.png", Texture.class)); - - ImageTextButton startBtn = new ImageTextButton("Start", skin); - ImageTextButton loadBtn = new ImageTextButton("Load", skin); - ImageTextButton settingsBtn = new ImageTextButton("Settings", skin); - ImageTextButton exitBtn = new ImageTextButton("Exit", skin); - //ImageTextButton tutBtn = new ImageTextButton("Tutorial", skin); - ImageTextButton cutsceneBtn = new ImageTextButton("Cutscene Temp", skin); - - startBtn.setTransform(true); - startBtn.setScale(scale_of_button); - loadBtn.setTransform(true); - loadBtn.setScale(scale_of_button); - settingsBtn.setTransform(true); - settingsBtn.setScale(scale_of_button); - exitBtn.setTransform(true); - exitBtn.setScale(scale_of_button); - - cutsceneBtn.setTransform((true)); - cutsceneBtn.setScale(scale_of_button); - // Triggers an event when the button is pressed - startBtn.addListener( - new ChangeListener() { - @Override - public void changed(ChangeEvent changeEvent, Actor actor) { - logger.debug("Start button clicked"); - animalMoveTask.cancel(); - entity.getEvents().trigger("start"); - } - }); - - loadBtn.addListener( - new ChangeListener() { - @Override - public void changed(ChangeEvent changeEvent, Actor actor) { - logger.debug("Load button clicked"); - animalMoveTask.cancel(); - entity.getEvents().trigger("load"); - } - }); - - settingsBtn.addListener( - new ChangeListener() { - @Override - public void changed(ChangeEvent changeEvent, Actor actor) { - logger.debug("Settings button clicked"); - animalMoveTask.cancel(); - entity.getEvents().trigger("settings"); - } - }); - - exitBtn.addListener( - new ChangeListener() { - @Override - public void changed(ChangeEvent changeEvent, Actor actor) { - logger.debug("Exit button clicked"); - animalMoveTask.cancel(); - entity.getEvents().trigger("exit"); - } - }); - cutsceneBtn.addListener( - new ChangeListener() { - @Override - public void changed(ChangeEvent changeEvent, Actor actor) { - logger.debug("Cutscene button clicked"); - entity.getEvents().trigger("cutscene"); - } - }); - - // Add logo and buttons - logo.add(title).pad(0,0,250,0); - - table.add(startBtn).pad(600, 0, 0, 0).height(60); - table.add(loadBtn).pad(600, 95, 0, 0).height(60); - table.add(settingsBtn).pad(600, 90, 0, 0).height(60); - table.add(exitBtn).pad(600, 120, 0, 0).height(60); -// table.add(tutBtn).pad(600, 80, 0, 0).height(60); - table.add(cutsceneBtn).pad(800, 0, 0, 0).height(60); - - table.center(); - - // Render logo and buttons - stage.addActor(logo); - stage.addActor(table); - } - - /** - * Plays the background music - */ - private void playMusic() { - Music music = ServiceLocator.getResourceService().getAsset(backgroundMusic, Music.class); - this.myMusic = music; - music.setLooping(true); - music.setVolume(0.05f); - music.play(); - } - - @Override - public void draw(SpriteBatch batch) { - // draw is handled by the stage - } - - @Override - public float getZIndex() { - return Z_INDEX; - } @Override - public void setStage(Stage mock) { + public void draw(SpriteBatch batch) { + } + @Override + public float getZIndex() { + return Z_INDEX; } - public void stopBackgroundTasks() { - ServiceLocator.getResourceService().getAsset(backgroundMusic, Music.class).stop(); - ServiceLocator.getResourceService().unloadAssets(screenMusic); + @Override + public void setStage(Stage mock) { + } + + public void stopBackgroundTasks() { + ServiceLocator.getResourceService().getAsset(BACKGROUND_MUSIC, Music.class).stop(); + ServiceLocator.getResourceService().unloadAssets(SCREEN_MUSIC); - if (animalMoveTask != null) { - animalMoveTask.cancel(); - } - if (clearstage != null) { - clearstage.cancel(); - } + if (animalMoveTask != null) { + animalMoveTask.cancel(); + } + if (clearStage != null) { + clearStage.cancel(); + } } @Override - public void dispose() { - super.dispose(); - table.clear(); - ServiceLocator.getResourceService().getAsset(backgroundMusic, Music.class).stop(); - ServiceLocator.getResourceService().unloadAssets(screenMusic); - } + public void dispose() { + super.dispose(); + table.clear(); + ServiceLocator.getResourceService().getAsset(BACKGROUND_MUSIC, Music.class).stop(); + ServiceLocator.getResourceService().unloadAssets(SCREEN_MUSIC); + } } diff --git a/source/core/src/main/com/csse3200/game/components/ordersystem/MainGameOrderTicketDisplay.java b/source/core/src/main/com/csse3200/game/components/ordersystem/MainGameOrderTicketDisplay.java index 16255a090..17099a89f 100644 --- a/source/core/src/main/com/csse3200/game/components/ordersystem/MainGameOrderTicketDisplay.java +++ b/source/core/src/main/com/csse3200/game/components/ordersystem/MainGameOrderTicketDisplay.java @@ -47,7 +47,7 @@ public class MainGameOrderTicketDisplay extends UIComponent { private static final ArrayList backgroundArrayList = new ArrayList<>(); private static final ArrayList