Merge pull request #665 from UQcsse3200/backstory-p2

Backstory Cutscene Fix
UQcsse3200 · Oct 17, 2024 · 96a1ba6 · 96a1ba6
2 parents 9647251 + c048856
commit 96a1ba6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 93 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java b/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java
@@ -79,12 +79,12 @@ protected void setupScenes() {
         scenes.add(scene2);
 
 
-        Scene scene3 = new Scene(foodCriticBackground);
+        Scene scene3 = new Scene("images/Cutscenes/Food_Critic_Background.png");
         scene3.setSceneText(scene3Text);
         scene3.setDuration(3.0f);
         scenes.add(scene3);
 
-        Scene scene4 = new Scene(foodCriticBackground);
+        Scene scene4 = new Scene("images/Cutscenes/Food_Critic_Background.png");
         scene4.setSceneText(scene4Text);
         scene4.setDuration(3.0f);
         scenes.add(scene4);
@@ -141,7 +141,7 @@ protected void loadAssets() {
          textures = new String[] {
                 "images/Cutscenes/Brooklyn_Bistro_Background.png",
                 "images/Cutscenes/Kitchen_Background.png",
-                foodCriticBackground,
+                "images/Cutscenes/Food_Critic_Background.png",
                 "images/Cutscenes/Animals_in_Kitchen_Background.png",
                 "images/Cutscenes/Farm_Background.png",
                 "images/Cutscenes/graveyard_mafia.png",

diff --git a/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java b/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java
@@ -88,7 +88,7 @@ public void testLoadAssets() {
         verify(resourceService, times(1)).loadTextures(new String[]{
                 "images/Cutscenes/Brooklyn_Bistro_Background.png",
                 "images/Cutscenes/Kitchen_Background.png",
-                null,
+                "images/Cutscenes/Food_Critic_Background.png",
                 "images/Cutscenes/Animals_in_Kitchen_Background.png",
                 "images/Cutscenes/Farm_Background.png",
                 "images/Cutscenes/graveyard_mafia.png",
@@ -177,7 +177,7 @@ public void testDisposeUnloadsAssets() {
         verify(resourceService, times(1)).unloadAssets(new String[]{
                 "images/Cutscenes/Brooklyn_Bistro_Background.png",
                 "images/Cutscenes/Kitchen_Background.png",
-                null,
+                "images/Cutscenes/Food_Critic_Background.png",
                 "images/Cutscenes/Animals_in_Kitchen_Background.png",
                 "images/Cutscenes/Farm_Background.png",
                 "images/Cutscenes/graveyard_mafia.png",

diff --git a/source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java b/source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java