Merge branch 'main' into main

TowerForge/TowerForge.xcodeproj/project.pbxproj

@@ -85,6 +85,8 @@
 		523C29282BBCFD93004C6EAC /* Nosifer-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5240D0952BB04E57004F1486 /* Nosifer-Regular.ttf */; };
 		523C29302BBD0916004C6EAC /* GameWaitingRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523C292F2BBD0916004C6EAC /* GameWaitingRoomViewController.swift */; };
 		523E5C4C2BC53F70007444DA /* WaveSpawnEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523E5C4B2BC53F70007444DA /* WaveSpawnEvent.swift */; };
+		523E5C512BC60563007444DA /* SurvivalModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523E5C502BC60563007444DA /* SurvivalModeTests.swift */; };
+		523E5C532BC60A15007444DA /* DeathMatchModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523E5C522BC60A15007444DA /* DeathMatchModeTests.swift */; };
 		5240D08F2BAE6D0A004F1486 /* Point.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5240D08E2BAE6D0A004F1486 /* Point.swift */; };
 		5240D0912BAF3453004F1486 /* Life.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5240D0902BAF3453004F1486 /* Life.swift */; };
 		5240D0A02BB330B5004F1486 /* GameMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5240D09F2BB330B4004F1486 /* GameMode.swift */; };
@@ -112,7 +114,6 @@
 		527E3A242BA613F000FE1628 /* PlayerComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527E3A232BA613EF00FE1628 /* PlayerComponent.swift */; };
 		529190E32BBFB59B001D8821 /* StatePopupNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 529190E22BBFB59B001D8821 /* StatePopupNode.swift */; };
 		5295A2022BA9FBD9005018A8 /* SceneManagerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5295A2012BA9FBD9005018A8 /* SceneManagerDelegate.swift */; };
-		5295A2042BA9FED4005018A8 /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5295A2032BA9FED4005018A8 /* MenuScene.swift */; };
 		5295A2072BAA02FD005018A8 /* TFButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5295A2062BAA02FD005018A8 /* TFButtonNode.swift */; };
 		5295A20F2BAAE7CF005018A8 /* TeamController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5295A20E2BAAE7CF005018A8 /* TeamController.swift */; };
 		5295A2132BAAEA16005018A8 /* UnitNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5295A2122BAAEA16005018A8 /* UnitNode.swift */; };
@@ -298,6 +299,8 @@
 		523AA3BE2BB88FBF0041E60D /* WizardUnit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WizardUnit.swift; sourceTree = "<group>"; };
 		523C292F2BBD0916004C6EAC /* GameWaitingRoomViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameWaitingRoomViewController.swift; sourceTree = "<group>"; };
 		523E5C4B2BC53F70007444DA /* WaveSpawnEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaveSpawnEvent.swift; sourceTree = "<group>"; };
+		523E5C502BC60563007444DA /* SurvivalModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SurvivalModeTests.swift; sourceTree = "<group>"; };
+		523E5C522BC60A15007444DA /* DeathMatchModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeathMatchModeTests.swift; sourceTree = "<group>"; };
 		5240D08E2BAE6D0A004F1486 /* Point.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Point.swift; sourceTree = "<group>"; };
 		5240D0902BAF3453004F1486 /* Life.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Life.swift; sourceTree = "<group>"; };
 		5240D0952BB04E57004F1486 /* Nosifer-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Nosifer-Regular.ttf"; sourceTree = "<group>"; };
@@ -327,7 +330,6 @@
 		527E3A232BA613EF00FE1628 /* PlayerComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerComponent.swift; sourceTree = "<group>"; };
 		529190E22BBFB59B001D8821 /* StatePopupNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatePopupNode.swift; sourceTree = "<group>"; };
 		5295A2012BA9FBD9005018A8 /* SceneManagerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneManagerDelegate.swift; sourceTree = "<group>"; };
-		5295A2032BA9FED4005018A8 /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; };
 		5295A2062BAA02FD005018A8 /* TFButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TFButtonNode.swift; sourceTree = "<group>"; };
 		5295A20E2BAAE7CF005018A8 /* TeamController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamController.swift; sourceTree = "<group>"; };
 		5295A2122BAAEA16005018A8 /* UnitNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitNode.swift; sourceTree = "<group>"; };
@@ -579,6 +581,15 @@
 			path = GameComponents;
 			sourceTree = "<group>";
 		};
+		523E5C4F2BC6054F007444DA /* GameModeTests */ = {
+			isa = PBXGroup;
+			children = (
+				523E5C502BC60563007444DA /* SurvivalModeTests.swift */,
+				523E5C522BC60A15007444DA /* DeathMatchModeTests.swift */,
+			);
+			path = GameModeTests;
+			sourceTree = "<group>";
+		};
 		5240D0942BB04E2B004F1486 /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
@@ -628,7 +639,6 @@
 			isa = PBXGroup;
 			children = (
 				52DF5FAD2BA32B2300135367 /* GameScene.swift */,
-				5295A2032BA9FED4005018A8 /* MenuScene.swift */,
 				527A07852BB411FB00CD9D08 /* GameOverScene.swift */,
 				BAFFB9422BB0A79B00D8301F /* SpriteKitScenes */,
 				BAFFB9322BB0A10C00D8301F /* SceneDelegates */,
@@ -779,6 +789,7 @@
 		52DF5FC02BA32B2600135367 /* TowerForgeTests */ = {
 			isa = PBXGroup;
 			children = (
+				523E5C4F2BC6054F007444DA /* GameModeTests */,
 				BAFFB94C2BB12F7D00D8301F /* GameModuleTests */,
 				BA443D402BAD9872009F0FFB /* EventTests */,
 				52DF5FE22BA3386400135367 /* CoreUITests */,
@@ -1450,7 +1461,6 @@
 				5299D1412BC3AA3A003EF746 /* GameRankData.swift in Sources */,
 				9BD669682BAFDE5E00DC8C4C /* GridDelegate.swift in Sources */,
 				52DF5FEB2BA3400C00135367 /* TFAnimatableNode.swift in Sources */,
-				5295A2042BA9FED4005018A8 /* MenuScene.swift in Sources */,
 				3C3CBDFF2BB8708A0001B8A9 /* CGPoint+Extensions.swift in Sources */,
 				52DF5FEF2BA34EA000135367 /* TFEntity.swift in Sources */,
 				BAFFB95D2BB978E500D8301F /* StorageEnums.swift in Sources */,
@@ -1501,7 +1511,9 @@
 				3C07CB272BC2990E00207C38 /* TFComponentTests.swift in Sources */,
 				BAFFB9502BB12F9D00D8301F /* GameEngineTests.swift in Sources */,
 				BA443D4B2BB05F73009F0FFB /* RequestSpawnEventTests.swift in Sources */,
+				523E5C532BC60A15007444DA /* DeathMatchModeTests.swift in Sources */,
 				BA443D452BB05A3C009F0FFB /* SpawnEventTests.swift in Sources */,
+				523E5C512BC60563007444DA /* SurvivalModeTests.swift in Sources */,
 				3C07CB212BC287DD00207C38 /* GameModuleTestsUtils.swift in Sources */,
 				BA443D492BB05EF0009F0FFB /* RemoveEventTests.swift in Sources */,
 				BA443D422BAD9885009F0FFB /* DamageEventTests.swift in Sources */,

TowerForge/TowerForge/AppMain/Storyboards/Base.lproj/Main.storyboard

@@ -46,6 +46,9 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="9Rh-a0-sTy"/>
+                    <connections>
+                        <outlet property="gamePopupButton" destination="FRf-Sx-cuP" id="9ja-00-9KT"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="SZV-WD-TEh" sceneMemberID="firstResponder"/>
             </objects>
@@ -54,7 +57,7 @@
         <!--MainMenuViewController-->
         <scene sceneID="vFw-SO-Nq3">
             <objects>
-                <viewController storyboardIdentifier="MainMenuViewController" title="MainMenuViewController" id="NJ9-hN-4Nf" customClass="MainMenuViewController" customModule="TowerForge" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="MainMenuViewController" title="MainMenuViewController" modalPresentationStyle="fullScreen" useStoryboardIdentifierAsRestorationIdentifier="YES" id="NJ9-hN-4Nf" customClass="MainMenuViewController" customModule="TowerForge" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleAspectFill" id="QTh-pm-dcu">
                         <rect key="frame" x="0.0" y="0.0" width="1366" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

TowerForge/TowerForge/Commons/Constants/Constants.swift

@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 
 /// A class to encapsulate application wide constants to ensure a single source of truth
 /// across the entire application.
@@ -39,21 +40,32 @@ struct PositionConstants {
     static let CTF_POINT_OWN = CGPoint(x: 300, y: 50)
     static let CTF_POINT_OPP = CGPoint(x: 300, y: 110)
 
+    // Survival Mode Properties
+    static let SURVIVAL_POINT_OWN = CGPoint(x: 300, y: 100)
+
     static let SUBTITLE_LABEL_OFFSET = CGPoint(x: 0, y: -30)
 }
 
 struct SizeConstants {
+
     // Death Match Mode Properties Size
     static let DEATH_MATCH_POINT_SIZE = CGSize(width: 50, height: 50)
 
     // Capture the Flag Mode Properties Size
     static let CTF_POINT_SIZE = CGSize(width: 50, height: 50)
+
+    // Survival Mode Properties Size
+    static let SURVIVAL_POINT_SIZE = CGSize(width: 100, height: 100)
+
+    static let SCREEN_SIZE = CGSize(width: UIScreen.main.bounds.width,
+                                    height: UIScreen.main.bounds.height)
 }
 
 struct FontConstants {
     static let GAME_FONT_SIZE: CGFloat = 40.0
 }
 
 struct GameModeSettingsConstants {
-    // static let LEVEL_ONE_WAVE
+    // Survival Mode Settings
+
 }

TowerForge/TowerForge/Firebase/Authentication/AuthenticationManager.swift

@@ -46,7 +46,7 @@ class AuthenticationManager: AuthenticationProtocol {
         }
         Auth.auth().createUser(withEmail: email, password: password) { _, error in
             if error != nil {
-                print("Error in creating user \(error)")
+                onFinish(nil, error)
             } else {
                 Auth.auth().signIn(withEmail: email, password: password)
                 let user = Auth.auth().currentUser

TowerForge/TowerForge/GameModule/Entities/GameEntities/Life.swift

@@ -8,10 +8,10 @@
 import Foundation
 
 class Life: TFEntity {
-    init(initialLife: Int, position: CGPoint, player: Player) {
+    init(initialLife: Int, position: CGPoint, player: Player, size: CGSize) {
         super.init()
         let spriteComponent = SpriteComponent(textureNames: ["Life"],
-                                              size: SizeConstants.CTF_POINT_SIZE,
+                                              size: size,
                                               animatableKey: "life")
         self.addComponent(spriteComponent)
         self.addComponent(HomeComponent(initialLifeCount: Team.lifeCount, pointInterval: Team.pointsInterval))

TowerForge/TowerForge/GameModule/GameModes/CaptureTheFlagMode.swift

@@ -12,7 +12,7 @@ class CaptureTheFlagMode: GameMode {
     static let INITIAL_POINT = 5
 
     var modeName: String = "Capture The Flag"
-    var modeDescription: String = "Destroy the enemy base!"
+    static var modeDescription: String = "Destroy the enemy base!"
     var gameProps: [any GameProp] = [PointProp(initialPoint: 0)]
     var gameState = GameState.IDLE
     var currentOwnLife: Int
@@ -21,13 +21,16 @@ class CaptureTheFlagMode: GameMode {
     init(initialLife: Int, eventManager: EventManager) {
         self.gameProps.append(LifeProp(initialLife: initialLife,
                                        position: PositionConstants.CTF_POINT_OWN,
-                                       player: .ownPlayer))
+                                       player: .ownPlayer,
+                                       size: SizeConstants.CTF_POINT_SIZE))
         self.gameProps.append(LifeProp(initialLife: initialLife,
                                        position: PositionConstants.CTF_POINT_OPP,
-                                       player: .oppositePlayer))
+                                       player: .oppositePlayer,
+                                       size: SizeConstants.CTF_POINT_SIZE))
         self.currentOwnLife = initialLife
         self.currentOpponentLife = initialLife
         self.eventManager = eventManager
+        self.gameState = .PLAYING
         eventManager.registerHandler(forEvent: LifeEvent.self) { event in
             if let lifeEvent = event as? LifeEvent {
                 // Check if the event reduces life

TowerForge/TowerForge/GameModule/GameModes/DeathMatchMode.swift

@@ -8,24 +8,30 @@
 import Foundation
 
 class DeathMatchMode: GameMode {
+
+    static var modeDescription: String = "Kill as many units within the time limit"
+    static let DEATH_MATCH_MODE_TIMER = TimeInterval(120)
+
     var eventManager: EventManager
     var modeName: String = "Death Match Mode"
-    var modeDescription: String = "Kill as many units within the time limit"
     var gameProps: [any GameProp] = [DeathProp(position: PositionConstants.DEATH_MATCH_POINT_OWN,
                                                player: .ownPlayer),
                                      DeathProp(position: PositionConstants.DEATH_MATCH_POINT_OPP,
                                                player: .oppositePlayer),
                                      PointProp(initialPoint: 0)]
-    var timer = TimerProp(timeLength: TimeInterval(60))
+    var timer = TimerProp(timeLength: DeathMatchMode.DEATH_MATCH_MODE_TIMER)
     var gameState = GameState.IDLE
     var currentOwnKillCounter: Int
     var currentOpponentKillCounter: Int
+    var remainingTime: TimeInterval
 
     init(eventManager: EventManager) {
         self.currentOwnKillCounter = 0
         self.currentOpponentKillCounter = 0
         self.eventManager = eventManager
         self.gameProps.append(timer)
+        self.gameState = .PLAYING
+        self.remainingTime = timer.time
         eventManager.registerHandler(forEvent: KillEvent.self) { event in
             if let killEvent = event as? KillEvent {
                 // Check if the event reduces life
@@ -38,7 +44,8 @@ class DeathMatchMode: GameMode {
         }
     }
     func updateGame(deltaTime: TimeInterval) {
-        if timer.time < 0 {
+        self.remainingTime = timer.time
+        if remainingTime <= 0 {
             if currentOwnKillCounter > currentOpponentKillCounter {
                 gameState = .WIN
             } else if currentOwnKillCounter < currentOpponentKillCounter {

TowerForge/TowerForge/GameModule/GameModes/GameMode.swift

@@ -14,7 +14,7 @@ struct GameResult {
 
 protocol GameMode {
     var modeName: String { get }
-    var modeDescription: String { get }
+    static var modeDescription: String { get }
     var gameProps: [any GameProp] { get }
     var gameState: GameState { get set }
     var eventManager: EventManager { get set }

TowerForge/TowerForge/GameModule/GameModes/SurvivalGameMode.swift

@@ -2,18 +2,25 @@
 //  SurvivalGameMode.swift
 //  TowerForge
 //
-//  Created by MacBook Pro on 09/04/24.
+//  Created by Vanessa Mae on 09/04/24.
 //
 
 import Foundation
 import UIKit
 
 class SurvivalGameMode: GameMode {
+
+    static let WAVE_TIME_INTERVAL = TimeInterval(50)
+
     var modeName: String = "Survival Game Mode"
 
-    var modeDescription: String = "Don't let the enemy invade your base!"
+    static var modeDescription: String = "Don't let the enemy invade your base!"
 
-    var gameProps: [any GameProp] = [PointProp(initialPoint: 0)]
+    var gameProps: [any GameProp] = [PointProp(initialPoint: 0),
+                                     LifeProp(initialLife: 1,
+                                              position: PositionConstants.SURVIVAL_POINT_OWN,
+                                              player: .ownPlayer,
+                                              size: SizeConstants.SURVIVAL_POINT_SIZE)]
 
     var gameState = GameState.IDLE
 
@@ -24,12 +31,13 @@ class SurvivalGameMode: GameMode {
     private var currentLevel: Int = 1
     private var maxLevel: Int
 
-    private var nextWaveTime = TimeInterval(50)
-    private var waveTimeInterval = TimeInterval(50)
+    private var nextWaveTime = SurvivalGameMode.WAVE_TIME_INTERVAL
+    private var waveTimeInterval = SurvivalGameMode.WAVE_TIME_INTERVAL
 
     init(eventManager: EventManager, maxLevel: Int) {
         self.eventManager = eventManager
         self.maxLevel = maxLevel
+        self.gameState = .PLAYING
 
         let timer = TimerProp(timeLength: waveTimeInterval * Double(maxLevel))
         self.gameProps.append(timer)
@@ -38,7 +46,6 @@ class SurvivalGameMode: GameMode {
             if let lifeEvent = event as? LifeEvent {
                 // Check if the event reduces life
                 if  lifeEvent.player == .oppositePlayer && lifeEvent.lifeDecrease > 0 {
-                    print("Triggered?")
                     self.currentOwnLife -= lifeEvent.lifeDecrease
                 }
             }
@@ -47,7 +54,7 @@ class SurvivalGameMode: GameMode {
 
     func updateGame(deltaTime: TimeInterval) {
         nextWaveTime -= deltaTime
-        if nextWaveTime < 0 && self.currentLevel <= self.maxLevel {
+        if nextWaveTime <= 0 && self.currentLevel <= self.maxLevel {
             nextWaveTime = waveTimeInterval
             self.currentLevel += 1
             self.generateWaveSpawns(enemyCount: 5 * self.currentLevel)
@@ -61,7 +68,7 @@ class SurvivalGameMode: GameMode {
     }
 
     func getGameResults() -> [GameResult] {
-        [GameResult(variable: "Finished Waves", value: String(currentLevel))]
+        [GameResult(variable: "Finished Waves", value: String(currentLevel - 1))]
     }
 
     private func generateWaveSpawns(enemyCount: Int) {

TowerForge/TowerForge/GameModule/GameProps/LifeProp.swift

@@ -10,7 +10,10 @@ import Foundation
 class LifeProp: GameProp {
     var renderableEntity: Life
 
-    init(initialLife: Int, position: CGPoint, player: Player) {
-        self.renderableEntity = Life(initialLife: initialLife, position: position, player: player)
+    init(initialLife: Int, position: CGPoint, player: Player, size: CGSize) {
+        self.renderableEntity = Life(initialLife: initialLife,
+                                     position: position,
+                                     player: player,
+                                     size: size)
     }
 }

TowerForge/TowerForge/GameViewController.swift

@@ -14,6 +14,7 @@ class GameViewController: UIViewController {
     var gameRoom: GameRoom?
     var currentPlayer: GamePlayer?
 
+    @IBOutlet var gamePopupButton: UIButton!
     @IBAction private func onStatePressed(_ sender: Any) {
         isPaused = true
         gameWorld?.presentStatePopup()
@@ -65,16 +66,21 @@ extension GameViewController: SceneUpdateDelegate {
 
 extension GameViewController: SceneManagerDelegate {
     func showMenuScene() {
-        let menuScene = MenuScene()
-        menuScene.sceneManagerDelegate = self
-        showScene(scene: menuScene)
+        guard let mainMenuViewController =
+                self.storyboard?.instantiateViewController(withIdentifier: "MainMenuViewController")
+                as? MainMenuViewController else {
+                    return
+                }
+
+        self.present(mainMenuViewController, animated: true, completion: nil)
     }
     func showLevelScene() {
         // TODO : to implement after Keith is done
     }
     func showGameOverScene(isWin: Bool, results: [GameResult]) {
         let gameOverScene = GameOverScene(win: isWin, results: results)
         gameOverScene.sceneManagerDelegate = self
+        gamePopupButton.isHidden = true
         showScene(scene: gameOverScene)
     }
     func showGameLevelScene(level: Int) {