Merge pull request #657 from UQcsse3200/Moral-polish-test

Moral polish test
UQcsse3200 · Oct 17, 2024 · 1ea74d1 · 1ea74d1
2 parents 95153f8 + 0445441
commit 1ea74d1
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 419 deletions.
diff --git a/source/core/src/main/com/csse3200/game/GdxGame.java b/source/core/src/main/com/csse3200/game/GdxGame.java
@@ -127,8 +127,6 @@ private Screen newScreen(ScreenType screenType) {
         return new SettingsScreen(this);
       case LOAD_GAME:
         return new LoadGameScreen(this);
-      case CUTSCENE:
-        return new CutsceneScreen(this, CutsceneType.MORAL_2);
       case MORAL_SCENE_1:
         return new CutsceneScreen(this, CutsceneType.MORAL_1);
       case MORAL_SCENE_2:

diff --git a/source/core/src/main/com/csse3200/game/components/maingame/MoralDisplayTemp.java b/source/core/src/main/com/csse3200/game/components/maingame/MoralDisplayTemp.java
diff --git a/source/core/src/main/com/csse3200/game/components/maingame/TextDisplay.java b/source/core/src/main/com/csse3200/game/components/maingame/TextDisplay.java
@@ -40,6 +40,8 @@ public class TextDisplay extends UIComponent {
     private long lastUpdate = 0L;
     private final long delay = 100L;
 
+    private InputListener inputListener;
+
     // Displaying variables
     private boolean visible;
     public Label label;
@@ -284,11 +286,9 @@ public void update() {
      * of the text or clear the textbox from the screen
      */
     private void setupInputListener() {
-        logger.info(TextDisplay.this.screen);
-        stage.addListener(new InputListener() {
+        inputListener = new InputListener() {
             @Override
             public boolean keyDown(InputEvent event, int keycode) {
-
                 if (TextDisplay.this.screen.equals("cutscene")) {
                     if (keycode == com.badlogic.gdx.Input.Keys.ENTER || keycode == com.badlogic.gdx.Input.Keys.SPACE) {
                         logger.info("we've pressed enter");
@@ -299,7 +299,7 @@ public boolean keyDown(InputEvent event, int keycode) {
                     return true;
                 } else if (TextDisplay.this.screen.equals("moralDecision")) {
                     Cutscene currentCutscene = ServiceLocator.getCurrentCutscene();
-                    Boolean atEnd = currentCutscene.isAtEnd();
+                    boolean atEnd = currentCutscene.isAtEnd();
                     if (keycode == com.badlogic.gdx.Input.Keys.ENTER || keycode == com.badlogic.gdx.Input.Keys.SPACE) {
                         logger.info("at moral in textDisplay");
                         if (!atEnd) {
@@ -308,13 +308,11 @@ public boolean keyDown(InputEvent event, int keycode) {
                             label.setText(currentCutscene.currentText);
                         }
                     } else if (keycode == Input.Keys.Y && atEnd) {
-                        logger.info("WE'RE ALMOST THERE");
                         currentCutscene = ServiceLocator.getCurrentCutscene();
                         currentCutscene.setTextForScene(currentCutscene.currentScene);
 
                         ServiceLocator.getDayNightService().getEvents().trigger("YesAtMoralDecision");
                     } else if (keycode == Input.Keys.N && atEnd) {
-                        logger.info("WE'RE ALMOST THERE NO");
                         currentCutscene = ServiceLocator.getCurrentCutscene();
                         currentCutscene.setTextForScene(currentCutscene.currentScene);
 
@@ -324,7 +322,6 @@ public boolean keyDown(InputEvent event, int keycode) {
                 } else if (TextDisplay.this.screen.equals("backstory")) {
                     // Handling for backstory cutscenes
                     Cutscene currentCutscene = ServiceLocator.getCurrentCutscene();
-                    Boolean atEnd = currentCutscene.isAtEnd();
 
                     // Check if the current text is "Press Enter to continue"
                     if (label.getText().toString().equals("Press Enter to continue")) {
@@ -339,11 +336,9 @@ public boolean keyDown(InputEvent event, int keycode) {
                         // Continue through the backstory cutscene normally
                         if (keycode == com.badlogic.gdx.Input.Keys.ENTER || keycode == com.badlogic.gdx.Input.Keys.SPACE) {
                             logger.info("at backstory in textDisplay");
-                            if (!atEnd) {
-                                logger.info("parsing through backstory");
-                                currentCutscene.setTextForScene(currentCutscene.currentScene);
-                                label.setText(currentCutscene.currentText);
-                            }
+                            logger.info("parsing through backstory");
+                            currentCutscene.setTextForScene(currentCutscene.currentScene);
+                            label.setText(currentCutscene.currentText);
                         }
                     }
                     return true;
@@ -367,10 +362,15 @@ public boolean keyDown(InputEvent event, int keycode) {
                 }
                 return false;
             }
-        });
+        };
+        stage.addListener(inputListener);
     }
 
 
+
+
+
+
     /**
      * Overrides the draw method from the Actor class.
      * This method is responsible for rendering the component.
@@ -448,5 +448,16 @@ private void setUpBackstoryLayout() {
         // Add stack to the table
         table.add(stack).padTop(100).size((int) (Gdx.graphics.getWidth() * 0.6), (int) (Gdx.graphics.getHeight() * 0.15));
     }
+
+    /**
+     * Class used in unit tests to simulate keypress
+     * @param keycode: keycode realting to the key pressed
+     * @return whether the key was pressed
+     */
+    public boolean simulateKeyPress(int keycode) {
+        InputEvent event = new InputEvent();  // Create a dummy InputEvent
+        event.setType(InputEvent.Type.keyDown);
+        return inputListener.keyDown(event, keycode);
+    }
 }