Merge pull request #68 from LittleTealeaf/main

MapFiles/test_map.txt

@@ -7,7 +7,7 @@
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 7 1 1 1 1 1 1 1 1 1 1 1 1 1
 1 1 1 1 1 1 1 1 1 1 18 1 1 1 1 17 1 5 11 11 12 1 1 1 1 1 1 1 1 1 1 1 1 1
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 13 11 6 1 1 1 1 1 1 1 1 1 1 1
-1 1 1 1 1 8 8 8 1 1 1 1 1 1 9 1 1 1 1 1 7 1 1 1 1 1 1 18 1 1 1 1 1 1
+1 1 1 1 1 8 8 8 1 1 1 1 1 1 9 1 1 1 1 1 7 1 1 1 1 1 1 20 1 1 1 1 1 1
 1 1 1 1 1 8 8 8 1 1 1 1 1 0 0 0 0 1 1 1 7 1 1 1 1 1 1 1 1 1 1 1 1 1
 1 1 1 1 1 1 7 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1
 1 1 1 1 1 1 7 1 1 10 1 0 0 0 0 0 0 0 0 0 0 0 0 0 19 19 14 14 14 14 19 19 0 0

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

@@ -10,13 +10,13 @@
 
 |Step | Action | Expected Result | Pass/Fail     |
 |:---:| :---        |    :----  | :---: |
-|1| Run the game | The game successfully opens ||
-|2| Enter level 1 | The User will enter level 1 | |
-|3| Find new map tile next to water tile | User will find the new map tile, sand, next to water tiles in game | |
-|4| User will exit the game | The User will properly exit the game | |
+|1| Run the game | The game successfully opens |Passed|
+|2| Enter level 1 | The User will enter level 1 |Passed|
+|3| Find new map tile next to water tile | User will find the new map tile, sand, next to water tiles in game |Passed|
+|4| User will exit the game | The User will properly exit the game |Passed|
 
 
 ### Test Completion
-- **Tester**: [TESTER NAME]
-- **Date of Test**: DATE OF TEST
-- **Test Result**: TEST RESULT
+- **Tester**: Thomas Kwashnak
+- **Date of Test**: 11/29/2021
+- **Test Result**: Passed

src/Screens/OptionsScreen.java

@@ -4,6 +4,7 @@
 import Engine.GamePanel;
 import Engine.GraphicsHandler;
 import Engine.ImageLoader;
+import Game.GameState;
 import GameObject.SpriteSheet;
 import Maps.LevelSelectMap;
 import Menu.Direction;

src/Tilesets/CommonTileset.java

@@ -241,27 +241,28 @@ public ArrayList<MapTileBuilder> defineTiles() {
         mapTiles.add(floatingPlatformTile);
 
 
-        // solid floating block
-        Frame solidFloatingFrame = new FrameBuilder(getSubImage(3, 5), 0)
+        // Sand
+        Frame sandFrame = new FrameBuilder(getSubImage(4, 0), 0)
                 .withScale(tileScale)
-                .withBounds(0, 6, 16, 3)
                 .build();
 
-        MapTileBuilder solidFloatingTile = new MapTileBuilder(solidFloatingFrame)
+        MapTileBuilder sandTile = new MapTileBuilder(sandFrame)
                 .withTileType(TileType.NOT_PASSABLE);
 
-        mapTiles.add(solidFloatingTile);
+        mapTiles.add(sandTile);
 
 
-        // Sand
-        Frame sandFrame = new FrameBuilder(getSubImage(4, 0), 0)
+        // solid floating block
+        Frame solidFloatingFrame = new FrameBuilder(getSubImage(3, 5), 0)
                 .withScale(tileScale)
+                .withBounds(0, 6, 16, 3)
                 .build();
 
-        MapTileBuilder sandTile = new MapTileBuilder(sandFrame)
+        MapTileBuilder solidFloatingTile = new MapTileBuilder(solidFloatingFrame)
                 .withTileType(TileType.NOT_PASSABLE);
 
-        mapTiles.add(sandTile);
+        mapTiles.add(solidFloatingTile);
+
 
         return mapTiles;
     }