bucsspring2024 · github-classroom · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024 · Apr 15, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.REPL.enableREPLSmartSend": false
+}
diff --git a/README.md b/README.md
@@ -1,18 +1,17 @@
+[![Open in Visual Studio Code](https://classroom.github.com/assets/open-in-vscode-718a45dd9cf7e7f842a935f5ebbe5719a5e09af4491e668f4dbf3b35d5cca122.svg)](https://classroom.github.com/online_ide?assignment_repo_id=14588448&assignment_repo_type=AssignmentRepo)
 
-:warning: Everything between << >> needs to be replaced (remove << >> after replacing)
-
-# << Project Title >>
-## CS110 Final Project  << Semester, Year >>
+# Enter Valorant
+## CS110 Final Project Spring, 2024
 
 ## Team Members
 
-<< List team member names >>
+none
 
 ***
 
 ## Project Description
 
-<< Give an overview of your project >>
+I want to make a Enter the Gungeon style game where the character you pick are from Valorant. You will play as Jett and be able to use her basic abilities as well has have the art style of Enter the Gungeon.
 
 ***    
 
@@ -30,20 +29,76 @@
 
 ### Features
 
-1. << Feature 1 >>
-2. << Feature 2 >>
-3. << Feature 3 >>
-4. << Feature 4 >>
-5. << Feature 5 >>
+1. Agent Selection - where you pick the agent (Jett)
+2. Moveable Character - The agent(Jett) can be controlled to move left right and at an angle
+3. Shoot - You would be able to shoot a gun at the direction you click
+4. Changing Backgrounds - you are able to move between screens
+5. Game Completed Screen - when you complete the level, the game ends with a screen
 
 ### Classes
 
-- << You should have a list of each of your classes with a description >>
+- Class Controller: controls what game state the game is in from Menu, Agent Selection, Game, and Gameover mode. In each of the game states you can do certain things and can go between the states.
+- Class Jett: initializes Jett's attributes like her speed, animation, gun, size and abilities. Additionally, it is also where her movement controls, shooting mechanics, abilities and animations are.
+- Class Classic: initializes the gun Classic's attributes like its shooting speed and sprites.
+- Class Bullet: initializes the bullet's attributes of the Classic gun like the speed and size. It also controlls the direction that the bulllets shoots and where it comes out of from the gun sprite.
+- Class Room: initializes the background, boundaries, obstacles and componenets of the rooms.
+- Class gameController: initializes the room backrounds themselves as well as control room changes. Also create the components of the rooms like the signs, dummies and how Jett interact with the rooms.
 
 ## ATP
 
-| Step                 |Procedure             |Expected Results                   |
-|----------------------|:--------------------:|----------------------------------:|
-|  1                   | Run Counter Program  |GUI window appears with count = 0  |
-|  2                   | click count button   | display changes to count = 1      |
-etc...
+Test Case 1: Player Movement
+-----------------------------
+- Test Description: Verify that the player can move in all directions including diagonals
+- Test Steps:
+    1. Start game by pressing SPACE
+    2. Move left and right with A and D respectively
+    3. Move up and down with W and S respectively
+    4. Move diagonals with A+W, D+W, A+S, and D+S
+- Expected Outcome: The players moves in the appropriate direction and changes sprite thats corresponds with the directions
+
+Test Case 2: Dash Ability
+---------------------------
+- Test Description: Verify that the player can use her dash ability
+- Test Steps:
+    1. Start game by pressing SPACE
+    2. To use her dash ability press E
+    3. The direction of the dash corresponds with the WASD keys
+    4. Verify that the player moves in a specific direction quickly
+    5. Verify that the sprite changes with dash
+    6. Ensure that there is a slight cooldown between dashes
+    7. Verify that the player can go in all 8 directions
+- Expected Outcome: When utilizing her ability, the player should move very quickly towards the direction they are moving towards
+
+Test Case 3: Updraft Ability
+-----------------------------
+- Test Description: Verify that the player can use her updraft ability
+- Test Steps:
+    1. Start game by pressing SPACE
+    2. To use her updraft ability press Q
+    3. Verify that she moves up and comes back down
+    4. Verify that she becomes slightly transparent
+    5. Verify the updraft sprite plays
+    6. Ensure that there is a slight cooldown between updrafts
+- Expected Outcome: When utilizing her updraft ability, she moves up and then down while being transparent and changes sprite.
+
+Test Case 4: Smoke Ball Ability
+--------------------------------
+- Test Description: Verify that the player can throw smoke ball towards a certain direction
+- Test Steps:
+    1. Start game by pressing SPACE
+    2. To use her smoke ball ability press C
+    3. Verify that the player throws smoke balls towards the direction of the mouse
+    4. Verify that smoke travels a fixed distance before stopping
+    5. The smoke ball expands after stopping
+- Expected Outcome: When utilizing the smoke ball ability, she throws a smoke ball towards the direction of the mouse before stopping and expanding before disappearing after 3-4 seconds
+
+Test Case 5: Gun Play
+---------------------
+- Test Description: Verify that the player can switch between gun and hand and shoot with the gun
+- Test Steps:
+    1. Start the game by pressing SPACE
+    2. To switch to gun press 2 and switch to hand press 3
+    3. Aim with your mouse and click to shoot
+    4. Verify that the bullet travels to the mouse and keeps going until hitting an obstacle
+- Expected Outcome: The player switches to their gun and shoot a bullet at the direction the mouse is. The bullet will travel until either it exits the screen or hit an obstacle
+
diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc
diff --git a/assets/agentSelection.png b/assets/agentSelection.png
diff --git a/assets/background.png b/assets/background.png
diff --git a/assets/dummy.png b/assets/dummy.png
diff --git a/assets/finalgui.jpg b/assets/finalgui.jpg
diff --git a/assets/gui.jpg b/assets/gui.jpg
diff --git a/assets/gun/classic/classicLeft.png b/assets/gun/classic/classicLeft.png
diff --git a/assets/gun/classic/classicRight.png b/assets/gun/classic/classicRight.png
diff --git a/assets/jettDashing/JettDashBack.png b/assets/jettDashing/JettDashBack.png
diff --git a/assets/jettDashing/JettDashBackLeft.png b/assets/jettDashing/JettDashBackLeft.png
diff --git a/assets/jettDashing/JettDashBackRight.png b/assets/jettDashing/JettDashBackRight.png
diff --git a/assets/jettDashing/JettDashFront.png b/assets/jettDashing/JettDashFront.png
diff --git a/assets/jettDashing/JettDashLeft.png b/assets/jettDashing/JettDashLeft.png
diff --git a/assets/jettDashing/JettDashRight.png b/assets/jettDashing/JettDashRight.png
diff --git a/assets/jettSmoke/JettSmokeBack.png b/assets/jettSmoke/JettSmokeBack.png
diff --git a/assets/jettSmoke/JettSmokeBackLeft.png b/assets/jettSmoke/JettSmokeBackLeft.png
diff --git a/assets/jettSmoke/JettSmokeBackRight.png b/assets/jettSmoke/JettSmokeBackRight.png
diff --git a/assets/jettSmoke/JettSmokeFront.png b/assets/jettSmoke/JettSmokeFront.png
diff --git a/assets/jettSmoke/JettSmokeLeft.png b/assets/jettSmoke/JettSmokeLeft.png
diff --git a/assets/jettSmoke/JettSmokeRight.png b/assets/jettSmoke/JettSmokeRight.png
diff --git a/assets/jettSmoke/SmokeBall.png b/assets/jettSmoke/SmokeBall.png
diff --git a/assets/jettStanding/JettBack.png b/assets/jettStanding/JettBack.png
diff --git a/assets/jettStanding/JettBackLeft.png b/assets/jettStanding/JettBackLeft.png
diff --git a/assets/jettStanding/JettBackRight.png b/assets/jettStanding/JettBackRight.png
diff --git a/assets/jettStanding/JettFront.png b/assets/jettStanding/JettFront.png
diff --git a/assets/jettStanding/JettLeft.png b/assets/jettStanding/JettLeft.png
diff --git a/assets/jettStanding/JettRight.png b/assets/jettStanding/JettRight.png
diff --git a/assets/jettStandingGun/JettBackGun.png b/assets/jettStandingGun/JettBackGun.png
diff --git a/assets/jettStandingGun/JettBackLeftGun.png b/assets/jettStandingGun/JettBackLeftGun.png
diff --git a/assets/jettStandingGun/JettBackRightGun.png b/assets/jettStandingGun/JettBackRightGun.png
diff --git a/assets/jettStandingGun/JettFrontGun.png b/assets/jettStandingGun/JettFrontGun.png
diff --git a/assets/jettStandingGun/JettLeftGun.png b/assets/jettStandingGun/JettLeftGun.png
diff --git a/assets/jettStandingGun/JettRightGun.png b/assets/jettStandingGun/JettRightGun.png
diff --git a/assets/jettUpdraft/JettUpdraftLeft.png b/assets/jettUpdraft/JettUpdraftLeft.png
diff --git a/assets/jettUpdraft/JettUpdraftRight.png b/assets/jettUpdraft/JettUpdraftRight.png
diff --git a/assets/jettWalking/back left/JettBackLeftWalking1.png b/assets/jettWalking/back left/JettBackLeftWalking1.png
diff --git a/assets/jettWalking/back left/JettBackLeftWalking2.png b/assets/jettWalking/back left/JettBackLeftWalking2.png
diff --git a/assets/jettWalking/back left/JettBackLeftWalking3.png b/assets/jettWalking/back left/JettBackLeftWalking3.png
diff --git a/assets/jettWalking/back right/JettBackRightWalking1.png b/assets/jettWalking/back right/JettBackRightWalking1.png
diff --git a/assets/jettWalking/back right/JettBackRightWalking2.png b/assets/jettWalking/back right/JettBackRightWalking2.png
diff --git a/assets/jettWalking/back right/JettBackRightWalking3.png b/assets/jettWalking/back right/JettBackRightWalking3.png
diff --git a/assets/jettWalking/back/JettBackWalking1.png b/assets/jettWalking/back/JettBackWalking1.png
diff --git a/assets/jettWalking/back/JettBackWalking2.png b/assets/jettWalking/back/JettBackWalking2.png
diff --git a/assets/jettWalking/back/JettBackWalking3.png b/assets/jettWalking/back/JettBackWalking3.png
diff --git a/assets/jettWalking/front/JettFrontWalking1.png b/assets/jettWalking/front/JettFrontWalking1.png
diff --git a/assets/jettWalking/front/JettFrontWalking2.png b/assets/jettWalking/front/JettFrontWalking2.png
diff --git a/assets/jettWalking/front/JettFrontWalking3.png b/assets/jettWalking/front/JettFrontWalking3.png
diff --git a/assets/jettWalking/left/JettLeftWalking1.png b/assets/jettWalking/left/JettLeftWalking1.png
diff --git a/assets/jettWalking/left/JettLeftWalking2.png b/assets/jettWalking/left/JettLeftWalking2.png
diff --git a/assets/jettWalking/left/JettLeftWalking3.png b/assets/jettWalking/left/JettLeftWalking3.png
diff --git a/assets/jettWalking/right/JettRightWalking1.png b/assets/jettWalking/right/JettRightWalking1.png
diff --git a/assets/jettWalking/right/JettRightWalking2.png b/assets/jettWalking/right/JettRightWalking2.png
diff --git a/assets/jettWalking/right/JettRightWalking3.png b/assets/jettWalking/right/JettRightWalking3.png
diff --git a/assets/jettWalkingGun/back left/JettBackLeftWalkingGun1.png b/assets/jettWalkingGun/back left/JettBackLeftWalkingGun1.png
diff --git a/assets/jettWalkingGun/back left/JettBackLeftWalkingGun2.png b/assets/jettWalkingGun/back left/JettBackLeftWalkingGun2.png
diff --git a/assets/jettWalkingGun/back left/JettBackLeftWalkingGun3.png b/assets/jettWalkingGun/back left/JettBackLeftWalkingGun3.png
diff --git a/assets/jettWalkingGun/back right/JettBackRightWalkingGun1.png b/assets/jettWalkingGun/back right/JettBackRightWalkingGun1.png
diff --git a/assets/jettWalkingGun/back right/JettBackRightWalkingGun2.png b/assets/jettWalkingGun/back right/JettBackRightWalkingGun2.png
diff --git a/assets/jettWalkingGun/back right/JettBackRightWalkingGun3.png b/assets/jettWalkingGun/back right/JettBackRightWalkingGun3.png
diff --git a/assets/jettWalkingGun/back/JettBackWalkingGun1.png b/assets/jettWalkingGun/back/JettBackWalkingGun1.png
diff --git a/assets/jettWalkingGun/back/JettBackWalkingGun2.png b/assets/jettWalkingGun/back/JettBackWalkingGun2.png
diff --git a/assets/jettWalkingGun/back/JettBackWalkingGun3.png b/assets/jettWalkingGun/back/JettBackWalkingGun3.png
diff --git a/assets/jettWalkingGun/front/JettFrontWalkingGun1.png b/assets/jettWalkingGun/front/JettFrontWalkingGun1.png
diff --git a/assets/jettWalkingGun/front/JettFrontWalkingGun2.png b/assets/jettWalkingGun/front/JettFrontWalkingGun2.png
diff --git a/assets/jettWalkingGun/front/JettFrontWalkingGun3.png b/assets/jettWalkingGun/front/JettFrontWalkingGun3.png
diff --git a/assets/jettWalkingGun/left/JettLeftWalkingGun1.png b/assets/jettWalkingGun/left/JettLeftWalkingGun1.png
diff --git a/assets/jettWalkingGun/left/JettLeftWalkingGun2.png b/assets/jettWalkingGun/left/JettLeftWalkingGun2.png
diff --git a/assets/jettWalkingGun/left/JettLeftWalkingGun3.png b/assets/jettWalkingGun/left/JettLeftWalkingGun3.png
diff --git a/assets/jettWalkingGun/right/JettRightWalkingGun1.png b/assets/jettWalkingGun/right/JettRightWalkingGun1.png
diff --git a/assets/jettWalkingGun/right/JettRightWalkingGun2.png b/assets/jettWalkingGun/right/JettRightWalkingGun2.png
diff --git a/assets/jettWalkingGun/right/JettRightWalkingGun3.png b/assets/jettWalkingGun/right/JettRightWalkingGun3.png
diff --git a/assets/room/backgroundRoom1.png b/assets/room/backgroundRoom1.png
diff --git a/assets/room/backgroundRoom2.png b/assets/room/backgroundRoom2.png
diff --git a/assets/room/backgroundRoom3.png b/assets/room/backgroundRoom3.png
diff --git a/assets/room/backgroundRoom4.png b/assets/room/backgroundRoom4.png
diff --git a/assets/room/backgroundRoom5.png b/assets/room/backgroundRoom5.png
diff --git a/assets/room/sign.png b/assets/room/sign.png
diff --git a/assets/text/agentSelectionJett.png b/assets/text/agentSelectionJett.png
diff --git a/assets/text/agentSelectionText.png b/assets/text/agentSelectionText.png
diff --git a/assets/text/room1Text.png b/assets/text/room1Text.png
diff --git a/assets/text/room2Text.png b/assets/text/room2Text.png
diff --git a/assets/text/room3Text.png b/assets/text/room3Text.png
diff --git a/assets/text/room4Text.png b/assets/text/room4Text.png
diff --git a/assets/text/room5Text.png b/assets/text/room5Text.png
diff --git a/main.py b/main.py
@@ -1,13 +1,10 @@
 import pygame
-#import your controller
+from src.controller import Controller
 
 def main():
     pygame.init()
-    #Create an instance on your controller object
-    #Call your mainloop
-
-    ###### NOTHING ELSE SHOULD GO IN main(), JUST THE ABOVE 3 LINES OF CODE ######
-
-# https://codefather.tech/blog/if-name-main-python/
+    game_controller = Controller()
+    game_controller.mainloop()
 if __name__ == '__main__':
     main()
+    main()
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/__pycache__/controller.cpython-310.pyc b/src/__pycache__/controller.cpython-310.pyc
diff --git a/src/__pycache__/gun.cpython-310.pyc b/src/__pycache__/gun.cpython-310.pyc
diff --git a/src/__pycache__/jett.cpython-310.pyc b/src/__pycache__/jett.cpython-310.pyc
diff --git a/src/__pycache__/room.cpython-310.pyc b/src/__pycache__/room.cpython-310.pyc