Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from main #73

Merged
merged 21 commits into from
Nov 30, 2021
Merged

Updates from main #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
66be104
Added SCp-60 Test Cases and implemented bug fix
hutch445 Nov 29, 2021
06e5de5
Added Test Cases and implemented Quit feature for SCP-51
hutch445 Nov 29, 2021
41d3958
Corrected Test Case Name and Objective
hutch445 Nov 29, 2021
0e8afee
Corrected Test Name
hutch445 Nov 29, 2021
07e5cbc
Corrected exit status
hutch445 Nov 29, 2021
2428ce9
added solid floating platform
hutch445 Nov 29, 2021
2150adb
Added floating block and corrected where cat interacts with block
hutch445 Nov 29, 2021
cb3eb5e
Added Test Case and Sand Tile and implemented into game
hutch445 Nov 29, 2021
a4334c8
Passed Test Case SCP-60
LittleTealeaf Nov 29, 2021
d98f6bc
Merge pull request #66 from LittleTealeaf/SCP-60
LittleTealeaf Nov 29, 2021
45e6a21
Passed Test Case SCP-51
LittleTealeaf Nov 29, 2021
3a39e2d
Merge pull request #67 from LittleTealeaf/SCP-51
LittleTealeaf Nov 29, 2021
e566e0c
Merging Main
LittleTealeaf Nov 29, 2021
7d2f901
Merge pull request #68 from LittleTealeaf/main
LittleTealeaf Nov 29, 2021
7b012cb
Fixing Merge
LittleTealeaf Nov 29, 2021
02ea089
Fixed Block ID in Map 1
LittleTealeaf Nov 29, 2021
36e0a03
Passed Test Case SCP-34
LittleTealeaf Nov 29, 2021
c2c551f
Merge pull request #69 from LittleTealeaf/SCP-34
LittleTealeaf Nov 29, 2021
55f7f42
Merge pull request #70 from LittleTealeaf/main
LittleTealeaf Nov 29, 2021
3dfdfe1
Passed Test Case SCP-47
LittleTealeaf Nov 29, 2021
6a2210f
Merge pull request #71 from LittleTealeaf/SCP-47
LittleTealeaf Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MapFiles/test_map.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
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 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 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 0 0 14 14 14 14 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 15 15 15 0 0 0 0
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
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19 15 15 15 15 19 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 16 2 2 2 2
4 changes: 2 additions & 2 deletions MapFiles/test_map3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
1 1 1 1 1 5 11 11 4 7 1 1 1 1 1 1 1 1 1 1 7 1 1 1 1 1 1 1 0 0 0 1 1 1
1 1 1 1 1 1 1 1 7 7 1 1 1 1 1 1 1 1 0 0 0 0 0 1 1 1 9 0 0 0 0 0 1 10
1 1 1 1 1 1 1 1 7 7 10 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 16 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
0 0 0 0 0 0 0 0 0 0 0 0 19 14 14 14 14 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 19 16 16 16 16 19 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
6 changes: 3 additions & 3 deletions MapFiles/test_map4.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
1 1 1 1 1 1 1 1 1 1 1 1 1 1 9 1 1 1 1 1 7 1 1 1 1 1 1 1 5 8 8 8 1 1
1 1 1 1 1 1 18 1 1 1 1 1 1 0 0 0 0 1 1 1 7 1 1 1 1 1 1 1 1 1 4 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 7 1 1 1
1 1 1 1 10 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 2 16 16 16 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 16 2 2 2 2
1 1 1 10 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 19 14 14 14 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 19 16 16 16 19 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 16 2 2 2 2
4 changes: 2 additions & 2 deletions MapFiles/test_map5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
1 1 1 1 5 11 7 1 1 1 1 1 1 0 0 0 0 0 1 1 7 1 1 1 1 1 1 1 1 5 11 11 13 1 1 1 1
1 1 1 1 1 1 7 1 1 1 1 1 0 0 0 0 0 0 0 1 7 1 1 1 1 1 1 1 1 1 1 1 7 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 1 1 1 1 1 1 1 1 1 1 1 7 1 1 1 1
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 0 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 2 2 2 2 2 2 2 2
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19 14 14 14 19 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 19 16 16 16 19 2 2 2 2 2 2 2
4 changes: 2 additions & 2 deletions MapFiles/test_map7.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 7 11 11 6 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 1 1 1 1 1 1 1 1 1 1 1 5 7 7 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 0 0 1 1 1 1 0 0 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 7 7 1 1 1 1 1 1 1 1 1 1 1 2 2 1 1 1 1 2 2 1 1 1 1 2 2 1 1 1 1 1 1 1
0 0 0 14 14 14 14 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 14 14 0 0 16 16 0 0 0 0 16 16 0 0 0 0 16 16 0 0 0 0 0 0 0
2 2 2 2 15 15 15 15 15 2 2 2 2 2 2 2 2 2 2 2 2 2 2 15 15 15 2 2 2 16 16 2 2 2 2 16 16 2 2 2 2 16 16 2 2 2 2 2 2 2
0 0 19 14 14 14 14 14 14 14 19 0 0 0 0 0 0 0 0 0 0 19 14 14 14 14 14 19 0 16 16 0 0 0 0 16 16 0 0 0 0 16 16 0 0 0 0 0 0 0
2 2 19 19 15 15 15 15 15 19 19 2 2 2 2 2 2 2 2 2 2 19 19 15 15 15 19 19 2 16 16 2 2 2 2 16 16 2 2 2 2 16 16 2 2 2 2 2 2 2
4 changes: 2 additions & 2 deletions MapFiles/test_map_2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
1 1 1 5 8 8 8 1 1 1 1 1 4 1 1 1 1 1 0 9 1 1 1 1 1 1 4 1 1 1 1 1 1 1
1 1 1 1 1 7 1 1 1 1 1 5 7 6 1 1 1 0 0 0 0 1 1 1 1 5 7 1 1 1 1 1 1 1
1 1 1 1 10 7 9 1 1 1 1 1 7 1 1 1 0 0 0 0 0 0 1 1 1 9 7 1 1 1 1 1 1 1
0 0 0 0 0 0 0 0 0 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 2 16 16 16 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
0 0 0 0 0 0 0 0 19 14 14 14 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2 2 2 2 2 2 2 2 19 16 16 16 19 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
6 changes: 3 additions & 3 deletions MapFiles/test_tutorial.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
1 1 1 1 1 8 8 8 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 8 8 8 1 1 1 1 1 1 9 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 7 1 1 1 1 1 0 0 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 7 1 1 10 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 15 15 0 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 16 16 16 2 2 2 2
1 1 1 1 1 1 7 1 1 10 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19 14 14 14 19 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19 15 15 15 19 0 0 0
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 19 16 16 16 19 2 2 2
Binary file modified Resources/CommonTileset.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Team A2/Test Cases/Test Case SCP-34.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
### Test Case Information
| TEST CASE ID | SCP-34|
| :--- | :--- |
| Owner of Test | Ty Hutchison |
| Test Name | Adding Map Tile |
| Date of Last Revision | 11/8/2021 |
| Test Objective | Adding another map tile to the game |

### Procedure

|Step | Action | Expected Result | Pass/Fail |
|:---:| :--- | :---- | :---: |
|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**: Thomas Kwashnak
- **Date of Test**: 11/29/2021
- **Test Result**: Passed
22 changes: 22 additions & 0 deletions Team A2/Test Cases/Test Case SCP-47.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
### Test Case Information
| TEST CASE ID | SCP-47|
| :--- | :--- |
| Owner of Test | Ty Hutchison|
| Test Name | Add Solid Floating Block |
| Date of Last Revision | 11/29/2021 |
| Test Objective | Add Solid Floating block for user to use |

### Procedure

|Step | Action | Expected Result | Pass/Fail |
|:---:| :--- | :---- | :---: |
|1| Run the game| The game successfully opens |Passed|
|2| Enter Level 1 | The User will enter level 1 |Passed|
|3| Go through the level and test implemented floating block | The User will go through the level completing it while using the floating block |Passed|
|4| Complete level 1 | The User will complete level 1 |Passed|
|5| Exit the game | The User will exit the game |Passed|

### Test Completion
- **Tester**: Thomas Kwashnak
- **Date of Test**: 11/29/2021 4:21 PM
- **Test Result**: Passed
21 changes: 21 additions & 0 deletions Team A2/Test Cases/Test Case SCP-51.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
### Test Case Information
| TEST CASE ID | SCP-51|
| :--- | :--- |
| Owner of Test | Ty Hutchison|
| Test Name | Implement Quit Option |
| Date of Last Revision | 11/29/2021 |
| Test Objective | Add Quit option in main menu |

### Procedure

|Step | Action | Expected Result | Pass/Fail |
|:---:| :--- | :---- | :---: |
|1| Run the game| The game successfully opens |Pass|
|2| Hit Quit Option | The User will select the quit option in the main menu |Pass|
|3| The game will close | The game will close |Pass|


### Test Completion
- **Tester**: Thomas Kwashnak
- **Date of Test**: 11/29/2021 3:59 PM
- **Test Result**: Passed
21 changes: 21 additions & 0 deletions Team A2/Test Cases/Test Case SCP-60.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
### Test Case Information
| TEST CASE ID | SCP-60|
| :--- | :--- |
| Owner of Test | Ty Hutchison|
| Test Name | Fix back-to-menu not working |
| Date of Last Revision | 11/29/2021 |
| Test Objective | Fix bug preventing back to menu option not working in options menu |

### Procedure

|Step | Action | Expected Result | Pass/Fail |
|:---:| :--- | :---- | :---: |
|1| Run the game| The game successfully opens |Pass|
|2| Enter Options Menu | The User will enter option menu|Pass|
|3| Use the back to main menu button at bottom | The User will exit the options screen using the back to menu feature at the bottom |Pass|
|4| Enter Main Menu Screen | The User will enter the Main Menu screen |Pass|

### Test Completion
- **Tester**: Thomas Kwashnak
- **Date of Test**: 11/29/2021 3:57 PM
- **Test Result**: Passed
2 changes: 2 additions & 0 deletions src/Screens/MenuScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public MenuScreen() {
}, {
new MenuOption("INSTRUCTIONS", 80, 300, () -> GamePanel.getScreenCoordinator().setGameState(GameState.INSTRUCTIONS)),
new MenuOption("OPTIONS", 350, 300, () -> GamePanel.getScreenCoordinator().setGameState(GameState.OPTIONS))
}, {
new MenuOption("QUIT", 80, 400, () -> System.exit(0))
}
});
setBackground(new TitleScreenMap());
Expand Down
3 changes: 2 additions & 1 deletion src/Screens/OptionsScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -40,7 +41,7 @@ public OptionsScreen() {
new MenuOption("Blue",500,300, () -> Config.playerAvatar = Avatar.CAT_BLUE),
new MenuOption("Green",630,300, () -> Config.playerAvatar = Avatar.CAT_GREEN)
},{
new MenuOption("Hit [Escape] to go back to main menu",100,450)
new MenuOption("Hit [Escape] to go back to main menu",100,450, () -> GamePanel.getScreenCoordinator().setGameState(GameState.MENU))
}
};
setMenuItemsAsGrid(items);
Expand Down
30 changes: 27 additions & 3 deletions src/Tilesets/CommonTileset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ public ArrayList<MapTileBuilder> defineTiles() {
.withTileType(TileType.LETHAL);

mapTiles.add(lethalSpikeTile);
// middle branch

// middle branch
Frame floatingPlatformFrame = new FrameBuilder(getSubImage(3, 4), 0)
.withScale(tileScale)
.withBounds(0, 6, 16, 4)
Expand All @@ -239,7 +239,31 @@ public ArrayList<MapTileBuilder> defineTiles() {
.withTileType(TileType.JUMP_THROUGH_PLATFORM);

mapTiles.add(floatingPlatformTile);



// Sand
Frame sandFrame = new FrameBuilder(getSubImage(4, 0), 0)
.withScale(tileScale)
.build();

MapTileBuilder sandTile = new MapTileBuilder(sandFrame)
.withTileType(TileType.NOT_PASSABLE);

mapTiles.add(sandTile);


// solid floating block
Frame solidFloatingFrame = new FrameBuilder(getSubImage(3, 5), 0)
.withScale(tileScale)
.withBounds(0, 6, 16, 3)
.build();

MapTileBuilder solidFloatingTile = new MapTileBuilder(solidFloatingFrame)
.withTileType(TileType.NOT_PASSABLE);

mapTiles.add(solidFloatingTile);


return mapTiles;
}
}