Update from Main (Reversing so changes are made to SCP-49)

Team A2/Test Cases/Test Case SCP-49.md

@@ -0,0 +1,30 @@
+### Test Case Information
+| TEST CASE ID | SCP-49 |
+| :--- | :--- |
+| Owner of Test | Nicholas Tourony |
+| Test Name | Difficulty Test |
+| Date of Last Revision | 11/28/2021 |
+| Test Objective | Ensure that the difficulty settings change the amount of health the cat has and changes the movement speed of the enemies and their projectiles. |
+
+### Procedure
+
+|Step | Action | Expected Result | Pass/Fail     |
+|:---:| :---        |    :----  | :---: |
+|1| Run the game| The game successfully opens |P|
+|2| Select the difficulty menu. | The difficulty menu opens. | [RESULT] |
+|3| Select normal difficulty | The game lets you select normal difficulty and automatically puts you back to the main menu. | [RESULT] |
+|4| Start the game. | The cat is loaded into the first level with 3 health and the enemies and projectiles move at their slowest speed. | [RESULT] |
+|5| Take projectile damage until the character dies | The cat can take 3 projectile hits before dying. | [RESULT] |
+|6| Respawn and run into an enemy. | The cat instantly dies. | [RESULT] |
+|7| Select hard difficulty and start the game | The cat is loaded into the first level with 2 health and the enemies move faster. | [RESULT] |
+|8| Take projectile damage until the character dies | The cat can take 2 projectile hits before dying. | [RESULT] |
+|9| Respawn and run into an enemy. | The cat instantly dies. | [RESULT] |
+|10| Select hardcore difficulty and start the game.  | The cat is loaded into the first level with 1 health and the enemies move even faster. | [RESULT] |
+|11| Take damage. | The cat dies. | [RESULT] |
+|12| Press escape. | The player is returned to the main menu. | [RESULT] |
+|13| Load into level 6, die to any enemy, and press space. | The player is restarted at the tutorial level. | [RESULT] |
+
+### Test Completion
+- **Tester**: [TESTER NAME]
+- **Date of Test**: DATE OF TEST
+- **Test Result**: TEST RESULT

Team A2/Test Cases/Test Case SCP-52.md

@@ -0,0 +1,35 @@
+### Test Case Information
+| TEST CASE ID | SCP-52 |
+| :--- | :--- |
+| Owner of Test | Thomas Kwashnak |
+| Test Name | Test Speed-Running Enhancements |
+| Date of Last Revision | 11/23/2021 |
+| Test Objective |  Testing Additions and Functionality Changes of Speed-Running Enhancements |
+
+#### Tested Enhancements
+ - Stopwatch
+   - Top-Right of screen when playing
+   - Entering from main menu resets timer
+   - Stores time took to complete each level, displays current level's time, as well as total time for all previous times
+   - Some way to display the user's final result (breakdown of levels) after beating final boss
+   - Deaths are in some way detrimental to a user's level time (either make death animation slower, or make death screen longer)
+   - Pausing the game pauses the time
+ - Level Completed Screens display quicker (shorter time)
+
+### Procedure
+
+|Step | Action | Expected Result | Pass/Fail     |
+|:---:| :---        |    :----  | :---: |
+|1|Run the game|The game loads up. There is no timer on the main menu.||
+|2|Click Play|The tutorial level is loaded. On the top right is one timer that times the amount of elapsed time since the player started.||
+|3|Navigate and die in the tutorial level|The dead screen has a count-down displayed.||
+|4|While the death screen's countdown is counting down, try to hit space to respawn|The player is not able to respawn until the countdown timer is over||
+|5|Navigate through the level and die once again. Once the death screen is loaded, hit escape to go back to the main menu|The main menu is loaded and the timer no longer displays||
+|6|Hit "Play" again to go back into the main menu|The tutorial level is loaded, and the timer is reset back to 0||
+|7|Complete the tutorial level|The level completed screen is shown, but only for a brief second before the next level is loaded. On the top right is now two timers, one that displays the total time, and another that displays the elapsed time for the current level||
+|8|Hit `P/Escape` to pause the game|While the game is paused, timers are also paused||
+
+### Test Completion
+- **Tester**: [TESTER NAME]
+- **Date of Test**: DATE OF TEST
+- **Test Result**: TEST RESULT

Team A2/Test Cases/Test Case SCP-56.md

@@ -0,0 +1,46 @@
+### Test Case Information
+| TEST CASE ID | SCP-56 |
+| :--- | :--- |
+| Owner of Test | Thomas Kwashnak |
+| Test Name | Test Game Speed |
+| Date of Last Revision | 11/16/2021 |
+| Test Objective | Ensure that the game runs consistently through multiple distributions |
+| Test Notes| Due to the nature of this test case, multiple runs of the test must be conducted on various machines of different make and models. Measurements will be taken using a recording software, and should not be expected to be perfect|
+|Software Requirement|**Screen recording software:** Needs to be able to record the screen such that the tester can go back and accurately measure the time between events. *Suggested:* OBS|
+|Prerequisites|Test Case SCP-57 must be completed prior to this merge|
+
+
+### Procedure
+
+|Step | Action | Expected Result | Measurement Field |
+|:---:| :---        |    :----  | :----:|
+|1|Run the game|The game successfully opens||
+|2|Begin recording|A screen recorder is started that records the game||
+|3|Click *Play Game*|The tutorial level is successfully opened||
+|4|Walk to the left-most edge of the level|The cat is at the left most bound of the tutorial level||
+|5|Hold `D/Right Arrow` until the cat is blocked from moving by the tree|The cat moves from the edge of the map into the tree|**Measurement 1:** The time it takes starting when the cat begins moving to when the cat finishes moving|
+|6|Hold `Shift`, then hold `A/Left Arrow` until the cat stops moving at the left edge of the map|The player sprints to the left-most edge of the map|**Measurement 2:** The time it takes for the cat to move starting when the cat begins moving to when the cat is stopped by the map edge|
+|7|Hold `Space/W/Up Arrow` until the cat reaches the ground again|The cat jumps and lands back on the ground|**Measurement 3:** The time it takes starting when the cat begins jumping to when the cat hits the ground again|
+|8|Hold `e` until the player shoots a reasonable amount of fireballs|The cat shoots multiple fireballs|**Measurement 4:** The time between two consecutive fireballs spawning (multiple attempts can be averaged if needed)|\
+|9|Complete the tutorial level|When the tutorial level is completed, the `level complete` is shown, and after a few seconds the player is loaded into the next level|**Measurement 5:** The time that the `level complete` screen is shown
+
+### Test Execution
+Instances of tests are listed in table below (template provided). Measurements listed in instructions above are listed below for test completer to evaluate.
+
+**Overall Test Completion** indicates whether all steps were completed and no errors / inability to follow instructions occurred.
+
+
+|Date|Name|Device Information | Measure 1|Measure 2|Measure 3|Measure 5|Measure 4|Pass/Fail|
+|:---:|:---|:---|:---:|:---:|:---:|:---:|:---:|:---:|
+|[DATE]|[TESTER_NAME]|[CONFIG]|[MEASURE 1]|[MEASURE 2]|[MEASURE 3]|[MEASURE 4]|[MEASURE 5]|[PASS/FAIL]|
+|11/29/2021 10:41 AM|Thomas Kwashnak|Kubuntu 21.10 Laptop, Intel i7 CPU, NVIDIA MX330 GPU|\~ 2 seconds|\~1 second|\~1 second|\~1-2 seconds|~3 seconds|Pass. Game runs at expected speed|
+
+[comment]: <> (Add test rows to end here ^^)
+
+### Completion Criteria
+ - There are no outliers on all measurements
+
+### Test Completion
+- **Tester**: [TEST REVIEWER NAME]
+- **Date of Test**: [TEST COMPLETION DATE]
+- **Test Result**: [TEST RESULT]

Team A2/Test Cases/Test Case SCP-57.md

@@ -0,0 +1,56 @@
+### Test Case Information
+| TEST CASE ID | SCP-57 |
+| :--- | :--- |
+| Owner of Test | Thomas Kwashnak |
+| Test Name | Test Player Functionality |
+| Date of Last Revision | 11/16/2021 |
+| Test Objective | Ensure that all current functionalities of the player is implemented in new Player class and still functional |
+
+Functionality of `Player.java` tested:
+ - Movement, and movement animations
+ - Jumping, including gravity and hitting floor
+ - Animation while jumping
+ - Collision with enemies
+ - Shooting, including animations while standing still and moving
+ - Collision with map boundaries and map walls
+ - Ability to complete all levels with physics
+
+### Procedure
+
+|Step | Action | Expected Result | Pass/Fail     |
+|:---:| :---        |    :----  | :---: |
+|0a| **Evaluated on Each Step:** | Player Animation changes as expected |`N/A`|
+|1| Run the game| The game successfully opens ||
+|2| Click "*Play*" |The tutorial level is entered, game does not crash. 3 hearts are displayed on the top of the screen.||
+|3| Hold `A/Left Arrow` |The player moves to the left. The player does not fall off the map and is instead stopped at the edge||
+|4| Hold `D/Right Arrow`|The player moves to the right. The player is stopped once they hit the tree||
+|5| Hold both `A/Left Arrow` and `D/Right Arrow`|The player stands still||
+|6| Tap `Space/W/Up Arrow` | The player short-jumps. The player then falls back down after the button is let go and lands on the ground||
+|7|Hold `Space/W/Up Arrow` | The player high-jumps. The player falls back down after a certain height and and falls back down to the ground||
+|8|Hold `Shift` and repeat steps 3-5|The player moves in the same ways as stated above, but faster||
+|9|Hold `ctrl`|The player crouches||
+|10|Tap `A/Left Arrow`, then hit `Space/W/Up Arrow` quickly followed by `D/Right Arrow`|The player faces left, then switches to facing right while in the air||
+|11|Tap `D/Right Arrow`, then hit `Space/W/Up Arrow` quickly followed by `A/Left Arrow`|The player faces right, then switches to facing left while in the air||
+|12|Tap `A/Left Arrow`, then tap `e` (*Attack Button*)|The player faces to the left, and attacks, sending a projectile to the left||
+|13|Hold `A/Left Arrow`, then tap `e` |The player moves to the left, and attacks while moving||
+|14|Tap `Space/W/Up Arrow`, then tap `e`  while in the air|The player jumps while facing left, and then shoots a projectile while in the air||
+|15|Tap `D/Right Arrow`, then tap `e` |The player faces to the right, and attacks, sending a projectile to the right||
+|16|Hold `D/Right Arrow`, then tap `e` |The player moves to the right, and attacks while moving||
+|17|Tap `Space/W/Up Arrow`, then tap `e` while in the air|The player jumps while facing right, and then shoots a projectile while in the air||
+|18|Hold `e`|The player shoots once, then cannot shoot for a specified duration of time||
+|19|Navigate and run into enemy|The player's health is set to 0 and the player dies. Death animation is played and player falls down to the ground||
+|20|Restart the game|The level is loaded again, and the player's health is back to full||
+|21|Navigate and run into a projectile from an enemy|The player's health is now 2 (reduced by 1)||
+|22|Navigate and attempt to run off the right-most edge of the map (*without hitting the gold level-complete box*)|The player is stopped and cannot run off of the map||
+|23|Hit the complete-level gold box|The level is completed and the player walks off to the right of the screen||
+|24|Hit Escape, go back to main menu|The main menu is displayed||
+|25|Hit "Play Game"|The first level is loaded||
+|26|Play all levels of the game|Each level is completable||
+
+
+
+
+### Test Completion
+- **Tester**: [TESTER NAME]
+- **Date of Test**: DATE OF TEST
+- **Test Result**: TEST RESULT

src/Enemies/BugEnemy.java

@@ -1,13 +1,13 @@
 package Enemies;
 
 import Builders.FrameBuilder;
+import Engine.GamePanel;
 import Engine.ImageLoader;
 import GameObject.Frame;
 import GameObject.ImageEffect;
 import GameObject.SpriteSheet;
 import Level.Enemy;
 import Level.Player;
-import Utils.AirGroundState;
 import Utils.Direction;
 import Utils.Point;
 
@@ -19,10 +19,14 @@
 public class BugEnemy extends Enemy {
 
     private float gravity = .5f;
-    private float movementSpeed = .5f;
+
+    // different speeds depending on the difficulty
+    private static final float NORMAL_SPEED = 0.5f, HARD_SPEED = 0.7f, HARDCORE_SPEED = 0.9f;
+    float movementSpeed = NORMAL_SPEED;
+
     private Direction startFacingDirection;
     private Direction facingDirection;
-    private AirGroundState airGroundState;
+    private boolean isInAir;
 
     public BugEnemy(Point location, Direction facingDirection) {
         super(location.x, location.y, new SpriteSheet(ImageLoader.load("BugEnemy.png"), 24, 15), "WALK_LEFT");
@@ -39,19 +43,29 @@ public void initialize() {
         } else if (facingDirection == Direction.LEFT) {
             currentAnimationName = "WALK_LEFT";
         }
-        airGroundState = AirGroundState.GROUND;
+        isInAir = false;
     }
 
     @Override
     public void update(Player player) {
         float moveAmountX = 0;
         float moveAmountY = 0;
 
+        // set the movement speed of the enemy depending on what difficulty it selected
+        if (GamePanel.getDifficultyHolder().getDifficulty() == 2)
+        {
+        	movementSpeed = HARD_SPEED;
+        }
+        else if (GamePanel.getDifficultyHolder().getDifficulty() == 1)
+        {
+        	movementSpeed = HARDCORE_SPEED;
+        }
+
         // add gravity (if in air, this will cause bug to fall)
         moveAmountY += gravity;
 
         // if on ground, walk forward based on facing direction
-        if (airGroundState == AirGroundState.GROUND) {
+        if (!isInAir) {
             if (facingDirection == Direction.RIGHT) {
                 moveAmountX += movementSpeed;
             } else {
@@ -86,11 +100,7 @@ public void onEndCollisionCheckY(boolean hasCollided, Direction direction) {
         // if bug is colliding with the ground, change its air ground state to GROUND
         // if it is not colliding with the ground, it means that it's currently in the air, so its air ground state is changed to AIR
         if (direction == Direction.DOWN) {
-            if (hasCollided) {
-                airGroundState = AirGroundState.GROUND;
-            } else {
-                airGroundState = AirGroundState.AIR;
-            }
+            isInAir = !hasCollided;
         }
     }
 

src/Enemies/CyborgEnemy.java

@@ -1,20 +1,19 @@
 package Enemies;
 
 import Builders.FrameBuilder;
+import Engine.GamePanel;
 import Engine.ImageLoader;
 import GameObject.Frame;
 import GameObject.ImageEffect;
 import GameObject.SpriteSheet;
 import Level.Enemy;
 import Level.Player;
 import Projectiles.LazerBeam;
-import Utils.AirGroundState;
 import Utils.Direction;
 import Utils.Point;
 import Utils.Stopwatch;
 
 import java.util.HashMap;
-import java.util.Timer;
 
 // This class is for the cyborg
 // It walks back and forth between two set points (startLocation and endLocation)
@@ -29,10 +28,14 @@ public class CyborgEnemy extends Enemy {
     // Whether or not the game is waiting for LazerBeams to launch
     private boolean wait = false;
 
-    protected float movementSpeed = 0.5f;
+    // different speeds depending on the difficulty
+    private static final float NORMAL_SPEED = 0.5f, HARD_SPEED = 0.7f, HARDCORE_SPEED = 0.9f;
+    float movementSpeed = NORMAL_SPEED;
+    private static final float NORMAL_LAZER_SPEED = 1.5f, HARD_LAZER_SPEED = 1.7f, HARDCORE_LAZER_SPEED = 1.9f;
+
     private Direction startFacingDirection;
     protected Direction facingDirection;
-    protected AirGroundState airGroundState;
+    protected boolean isInAir;
 
     // timer is used to determine when a lazer is to be shot out
     protected Stopwatch shootTimer = new Stopwatch();
@@ -62,7 +65,7 @@ public void initialize() {
         } else if (facingDirection == Direction.LEFT) {
             currentAnimationName = "WALK_LEFT";
         }
-        airGroundState = AirGroundState.GROUND;
+        isInAir = false;
 
         // every 2 seconds, the lazer will be shot out
         shootTimer.setWaitTime(2000);
@@ -72,7 +75,20 @@ public void initialize() {
     public void update(Player player) {
         float startBound = startLocation.x;
         float endBound = endLocation.x;
+        float lazerMovementSpeed = NORMAL_LAZER_SPEED;
 
+        // set the movement speed of the enemy and lazer attack depending on what difficulty it selected
+        if (GamePanel.getDifficultyHolder().getDifficulty() == 2)
+        {
+        	movementSpeed = HARD_SPEED;
+        	lazerMovementSpeed = HARD_LAZER_SPEED;
+        }
+        else if (GamePanel.getDifficultyHolder().getDifficulty() == 1)
+        {
+        	movementSpeed = HARDCORE_SPEED;
+        	lazerMovementSpeed = HARDCORE_LAZER_SPEED;
+        }
+
         // if shoot timer is up and cyborg is not currently shooting, set its state to SHOOT
         if (shootTimer.isTimeUp() && cyborgState != cyborgState.SHOOT) {
             cyborgState = cyborgState.SHOOT;
@@ -114,16 +130,14 @@ public void update(Player player) {
                 // define where LazerBeam will spawn on map (x location) relative to cyborg enemy's location
                 // and define its movement speed
                 int LazerBeamX;
-                float movementSpeed;
                 LazerBeamX = Math.round(getX());
-                movementSpeed = 1.5f;
 
                 // define where LazerBeam will spawn on the map (y location) relative to cyborg enemy's location
                 int LazerBeamY = Math.round(getY() + 15);
 
                 // create LazerBeam enemy
-                LazerBeam LazerBeam = new LazerBeam(new Point(LazerBeamX + 20, LazerBeamY), movementSpeed, 1000);
-                LazerBeam LazerBeam2 = new LazerBeam(new Point(LazerBeamX - 10, LazerBeamY), -movementSpeed, 1000);
+                LazerBeam LazerBeam = new LazerBeam(new Point(LazerBeamX + 20, LazerBeamY), lazerMovementSpeed, 1000);
+                LazerBeam LazerBeam2 = new LazerBeam(new Point(LazerBeamX - 10, LazerBeamY), -lazerMovementSpeed, 1000);
 
                 // add LazerBeam enemy to the map for it to offically spawn in the level
                 map.addProjectile(LazerBeam);