Update all prints to use logger

cs3217-2324 · Apr 20, 2024 · 21d3daf · 21d3daf
1 parent 1c410d2
commit 21d3daf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/TowerForge/TowerForge/Firebase/Authentication/AuthenticationManager.swift b/TowerForge/TowerForge/Firebase/Authentication/AuthenticationManager.swift
@@ -105,7 +105,7 @@ class AuthenticationManager: AuthenticationProtocol {
     func getUserData(completion: @escaping (AuthenticationData?, Error?) -> Void) {
         if let currentUser = Auth.auth().currentUser {
             // User is currently logged in, fetch user data
-            print(currentUser)
+            Logger.log(String(describing: currentUser), self)
             let userData = AuthenticationData(userId: currentUser.uid,
                                               email: currentUser.email ?? "",
                                               username: currentUser.displayName)

diff --git a/TowerForge/TowerForge/GameModule/Entities/SpawnableEntities/ArrowTower.swift b/TowerForge/TowerForge/GameModule/Entities/SpawnableEntities/ArrowTower.swift
@@ -42,7 +42,7 @@ class ArrowTower: BaseTower, PlayerSpawnable {
                                             range: ArrowTower.range,
                                             attackPower: ArrowTower.damage, shootingType: Bullet.self))
         self.addComponent(DamageComponent(attackRate: .unit,
-                                          attackPower: 1,
+                                          attackPower: .unit,
                                           temporary: false))
     }
 

diff --git a/TowerForge/TowerForge/GameViewController.swift b/TowerForge/TowerForge/GameViewController.swift
@@ -31,7 +31,7 @@ class GameViewController: UIViewController {
         let auth = AuthenticationProvider()
         if auth.isUserLoggedIn() {
             auth.getUserDetails { data, _ in
-                print(data)
+                Logger.log(String(describing: data), self)
                 self.playerData = data
             }
         }

diff --git a/TowerForge/TowerForge/Networking/RoomNetwork/GameRoom.swift b/TowerForge/TowerForge/Networking/RoomNetwork/GameRoom.swift
@@ -88,7 +88,7 @@ class GameRoom {
 
             let onAddCompleted = { (error: Error?, _: DatabaseReference) -> Void in
                 if let error = error {
-                    print("Error getting data: \(error.localizedDescription)")
+                    Logger.log("Error getting data: \(error.localizedDescription)", self)
                     completion(false)
                     return
                 }
@@ -110,7 +110,7 @@ class GameRoom {
 
     // Logic to start the game when players are ready
     func updatePlayerReady(completion: @escaping (RoomState) -> Void) {
-        print("Updating player start")
+        Logger.log("Updating player start", self)
         if self.roomState == .waitingForFinalConfirmation {
             self.updateRoomState(roomState: .gameOnGoing)
             completion(.gameOnGoing)
@@ -138,23 +138,23 @@ class GameRoom {
         }
         roomRef.child(roomName).removeValue { error, _ in
             if let error = error {
-                print("Error deleting room: \(error.localizedDescription)")
+                Logger.log("Error deleting room: \(error.localizedDescription)", self)
             } else {
-                print("Room deleted successfully.")
+                Logger.log("Room deleted successfully.", self)
             }
         }
     }
 
     // Updates the current room state in the class and database
     private func updateRoomState(roomState: RoomState) {
-        print("Updating room state from player")
+        Logger.log("Updating room state from player", self)
         let roomStateRef = FirebaseDatabaseReference(.Rooms).child(roomName).child("roomState")
         roomStateRef.setValue(roomState.rawValue) { error, _ in
             if let error = error {
-                print("Error updating room state: \(error.localizedDescription)")
+                Logger.log("Error updating room state: \(error.localizedDescription)", self)
             } else {
                 self.roomState = roomState
-                print("Room state updated successfully.")
+                Logger.log("Room state updated successfully.", self)
             }
         }
     }
@@ -211,7 +211,7 @@ class GameRoom {
         let playerRef = FirebaseDatabaseReference(.Rooms).child(roomName).child("players")
         playerRef.getData { error, snapshot in
             if let error = error {
-                print("Error getting data: \(error.localizedDescription)")
+                Logger.log("Error getting data: \(error.localizedDescription)", self)
                 completion(false)
                 return
             }
@@ -304,7 +304,7 @@ class GameRoom {
     private func attemptSetHost(player: GamePlayer) {
         let delegate = { (error: Error?, snapshot: DataSnapshot?) -> Void in
             if let error = error {
-                print("Error getting data: \(error.localizedDescription)")
+                Logger.log("Error getting data: \(error.localizedDescription)", self)
                 return
             }
 

diff --git a/TowerForge/TowerForge/ViewControllers/GameModeViewController.swift b/TowerForge/TowerForge/ViewControllers/GameModeViewController.swift
@@ -56,7 +56,7 @@ class GameModeViewController: UIViewController {
         if authenticationProvider.isUserLoggedIn() {
             authenticationProvider.logout { err in
                 if let err = err {
-                    print(err)
+                    Logger.log(err.localizedDescription, self)
                 }
             }
         } else {

diff --git a/TowerForge/TowerForge/ViewControllers/GameRoomViewController.swift b/TowerForge/TowerForge/ViewControllers/GameRoomViewController.swift
@@ -27,7 +27,7 @@ class GameRoomViewController: UIViewController {
         let playerOne = GamePlayer(userName: playerName)
         gameRoom = GameRoom(roomName: roomName) { success in
             if success {
-                print("Now joining the room \(success)")
+                Logger.log("Now joining the room \(success)", self)
                 self.joinRoom(player: playerOne)
             } else {
                 self.gameRoom = nil
@@ -39,11 +39,11 @@ class GameRoomViewController: UIViewController {
         // Create a game room
         gameRoom?.joinRoom(player: player, completion: { success in
             if success {
-                print("Successfully joined the room")
+                Logger.log("Successfully joined the room", self)
                 self.currentPlayer = player
                 self.performSegue(withIdentifier: "segueToWaitingRoom", sender: self)
             } else {
-                print("Failed to join room")
+                Logger.log("Failed to join room", self)
             }
         })
     }
@@ -54,7 +54,7 @@ class GameRoomViewController: UIViewController {
                 guard let currentPlayer = self.currentPlayer else {
                     return
                 }
-                print("Before segueing \(gameRoom?.playerOne)")
+                Logger.log("Before segueing \(String(describing: gameRoom?.playerOne))", self)
                 destinationVC.currentPlayer = currentPlayer
                 destinationVC.gameRoom = gameRoom
             }
@@ -73,7 +73,7 @@ class GameRoomViewController: UIViewController {
                 self.gameRoom = room
                 self.joinRoom(player: player)
             } else {
-                print("Room not found")
+                Logger.log("Room not found", self)
             }
         }
     }