Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'

Resolve "Basisownership anhand des GKPlayers"

Closes #33

See merge request marcel.schwarz/software-projekt-2!68

GoldWars/GoldWars/Components/TeamComponent.swift

@@ -8,12 +8,14 @@
 
 import SpriteKit
 import GameplayKit
+import GameKit
 
 class TeamComponent: GKComponent {
     let team: Team
 	let fire: SKEmitterNode
+    let player: GKPlayer
 
-	init(team: Team, position: CGPoint) {
+    init(team: Team, player: GKPlayer, position: CGPoint) {
 		fire = SKEmitterNode(fileNamed: "Fire")!
 		fire.zPosition = -1
 		fire.position = position
@@ -29,6 +31,7 @@ class TeamComponent: GKComponent {
 		}
 
         self.team = team
+        self.player = player
         super.init()
     }
 

GoldWars/GoldWars/Entities/Base.swift

@@ -8,28 +8,32 @@
 
 import SpriteKit
 import GameplayKit
+import GameKit
 
 class Base: GKEntity {
     
     var unitCount: Int
     var adjacencyList: Array<Base>
-	var changeOwnerShip: Bool
+    var changeOwnership: Bool
+    var ownershipPlayer: GKPlayer?
     
-    init(position: CGPoint, team: Team! = nil) {
+    init(position: CGPoint, player: GKPlayer! = nil, team: Team! = nil) {
         self.unitCount = 0
         self.adjacencyList = [Base]()
-		self.changeOwnerShip = false
+        self.changeOwnership = false
+        self.ownershipPlayer = player
         super.init()
         
         addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: position))
-        if(team != nil){
+        if(team != nil && player != nil){
-            addComponent(TeamComponent(team: team!, position: position))
+            addComponent(TeamComponent(team: team!, player: player!, position: position))
             self.unitCount = 500
         }
     }
     
     func attackBase(base: Base, units:Int) -> [GKEntity]{
-			base.changeOwnerShip = true
+        base.changeOwnership = true
+        base.ownershipPlayer = self.ownershipPlayer
         self.unitCount -= units
         base.unitCount += units
         return [self, base]

GoldWars/GoldWars/Entities/EntityManager.swift

@@ -8,6 +8,7 @@
 
 import SpriteKit
 import GameplayKit
+import GameKit
 
 class EntityManager {
     
@@ -97,14 +98,32 @@ class EntityManager {
             self.entities.update(with: entity)
             let base = (entity as! Base)
             
-			if base.changeOwnerShip {
+            if base.changeOwnership {
-				base.addComponent(TeamComponent(team: (entities[0] as! Base).component(ofType: TeamComponent.self)!.team, position: (base.component(ofType: DefaultBaseComponent.self)?.spriteNode.position)!))
+                base.addComponent(TeamComponent(
-				base.changeOwnerShip = false
+                        team: (entities[0] as! Base).component(ofType: TeamComponent.self)!.team,
+                        player: (entities[0] as! Base).component(ofType: TeamComponent.self)!.player,
+                        position: (base.component(ofType: DefaultBaseComponent.self)?.spriteNode.position)!
+                    )
+                )
+                base.changeOwnership = false
                 scene.addChild(base.component(ofType: TeamComponent.self)!.fire)
             }
         }
         
     }
+    
+    func getBaseByPlayer(for player: GKPlayer) -> GKEntity? {
+        for entity in entities {
+            if let teamComponent = entity.component(ofType: TeamComponent.self),
+                let _ = entity.component(ofType: DefaultBaseComponent.self) {
+                if teamComponent.player == player {
+                    return entity
+                }
+            }
+        }
+        return nil
+    }
+    
     func getBaseByTeam(for team: Team) -> GKEntity? {
         for entity in entities {
             if let teamComponent = entity.component(ofType: TeamComponent.self),
@@ -121,6 +140,10 @@ class EntityManager {
         return entities.filter{$0 is Base && ($0 as! Base).component(ofType: TeamComponent.self)?.team == team } as! Set<Base>
     }
     
+    func getBasesByPlayer(for player: GKPlayer) -> Set<Base> {
+        return entities.filter{$0 is Base && ($0 as! Base).component(ofType: TeamComponent.self)?.player == player } as! Set<Base>
+    }
+    
     func getTeamByBase(base: Base) -> Team? {
         for entity in entities {
             if entity is Base && entity == base{

GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import SpriteKit
+import GameKit
 
 class TwoPlayerDefaultTestMap: MapProtocol {
     
@@ -24,6 +25,7 @@ class TwoPlayerDefaultTestMap: MapProtocol {
         // Create Bases
         let basePlayerOne = Base(
             position: CGPoint(x: self.size.width * 0.1, y: self.size.height / 2),
+            player: (MatchmakingHelper.sharedInstance.isServer) ? GKLocalPlayer.local : MatchmakingHelper.sharedInstance.mpMatch?.players[0],
             team: .team1
         )
         
@@ -46,6 +48,7 @@ class TwoPlayerDefaultTestMap: MapProtocol {
         
         let basePlayerTwo = Base(
             position: CGPoint(x: self.size.width * 0.9, y: self.size.height / 2),
+            player: (!MatchmakingHelper.sharedInstance.isServer) ? GKLocalPlayer.local : MatchmakingHelper.sharedInstance.mpMatch?.players[0],
             team: .team2
         )
         

GoldWars/GoldWars/MatchmakingHelper.swift

@@ -33,8 +33,6 @@ class MatchmakingHelper: NSObject, GKMatchmakerViewControllerDelegate, GKMatchDe
     var viewController: UIViewController?
     var mpMatchStarted: Bool
     var isServer: Bool
-    var spieler1: GKPlayer?
-    var nameSpieler1 = ""
     var menusc: MenuScene?
     let localPlayer: GKLocalPlayer = GKLocalPlayer.local
     
@@ -154,9 +152,6 @@ class MatchmakingHelper: NSObject, GKMatchmakerViewControllerDelegate, GKMatchDe
 
             if player == GKLocalPlayer.local {
                 self.isServer = true
-                self.spieler1 = player
-                self.nameSpieler1 = self.spieler1!.displayName
-                
             } else {
                 self.isServer = false
             }

GoldWars/GoldWars/Scenes/GameScene.swift

@@ -8,6 +8,7 @@
 
 import SpriteKit
 import GameplayKit
+import GameKit
 
 class GameScene: SKScene{
     
@@ -46,12 +47,14 @@ class GameScene: SKScene{
                     if !(entityManager.getTeamByBase(base: currentDraggedBase!) == entityManager.getTeamByBase(base: base)){
                         entityManager.add(Modal(modaltype: .BaseAttack,
                                                 base: currentDraggedBase!,
-                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2), entityManager: entityManager, gameScene: self))
+                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2),
+                                                entityManager: entityManager, gameScene: self))
                         entityManager.update((currentDraggedBase?.attackBase(base: base, units: 100))!)
                     }else {
                         entityManager.add(Modal(modaltype: .BaseAttack,
                                                 base: currentDraggedBase!,
-                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2), entityManager: entityManager, gameScene: self))
+                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2),
+                                                entityManager: entityManager, gameScene: self))
                     }
                     
                 }
@@ -71,7 +74,8 @@ class GameScene: SKScene{
                         }
                         entityManager.add(Modal(modaltype: .BaseDetails,
                                                 base: entity as! Base,
-                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2), entityManager: entityManager, gameScene: self))
+                                                anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2),
+                                                entityManager: entityManager, gameScene: self))
                     }
                 }
             }
@@ -96,7 +100,7 @@ class GameScene: SKScene{
                 body.text = "Schicke \(  ((e.component(ofType: SliderComponent.self)?.sliderNode.getValue ?? 0) * CGFloat((e as! Modal).unitCount)).rounded(.up)) Einheiten "
             }		}
         
-        let bases = entityManager.getBasesByTeam(for: .team1)
+        let bases = entityManager.getBasesByPlayer(for: GKLocalPlayer.local)
         
         for base in bases {
             if atPoint(touchLocation) == base.component(ofType: DefaultBaseComponent.self)?.spriteNode{