Merge branch 'revert-d595cb42' into 'development'

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

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

GoldWars/GoldWars/Components/TeamComponent.swift

@@ -8,7 +8,6 @@
 
 import SpriteKit
 import GameplayKit
-import GameKit
 
 class TeamComponent: GKComponent {
     let team: Team
@@ -30,7 +29,6 @@ class TeamComponent: GKComponent {
 		}
 
         self.team = team
-        self.player = player
         super.init()
     }
 

GoldWars/GoldWars/Entities/Base.swift

@@ -22,8 +22,8 @@ class Base: GKEntity {
         super.init()
         
         addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: position))
-        if(team != nil && player != nil){
-            addComponent(TeamComponent(team: team!, position: position, player: player!))
+        if(team != nil){
+            addComponent(TeamComponent(team: team!, position: position))
             self.unitCount = 500
         }
     }

GoldWars/GoldWars/Entities/EntityManager.swift

@@ -8,7 +8,6 @@
 
 import SpriteKit
 import GameplayKit
-import GameKit
 
 class EntityManager {
     

GoldWars/GoldWars/Entities/Modal.swift

@@ -9,8 +9,6 @@
 import GameplayKit
 
 class Modal: GKEntity{
-
-	var unitCount:Int
     
     var unitCount:Int
     

GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift

@@ -21,7 +21,6 @@ class TwoPlayerDefaultTestMap: MapProtocol {
     
     func load() {
         
-        
         // Create Bases
         let basePlayerOne = Base(
             position: CGPoint(x: self.size.width * 0.1, y: self.size.height / 2),
@@ -47,7 +46,6 @@ 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,6 +33,7 @@ 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
@@ -153,9 +154,13 @@ class MatchmakingHelper: NSObject, GKMatchmakerViewControllerDelegate, GKMatchDe
 
             if player == GKLocalPlayer.local {
                 self.isServer = true
+                self.spieler1 = player
+                self.nameSpieler1 = self.spieler1!.displayName
+                
             } else {
                 self.isServer = false
             }
+            
             self.delegate?.matchStarted()
             self.menusc!.loadScene(scene: GameScene(size: self.menusc!.size))
         })

GoldWars/GoldWars/Scenes/GameScene.swift

@@ -8,7 +8,6 @@
 
 import SpriteKit
 import GameplayKit
-import GameKit
 
 class GameScene: SKScene{
     
@@ -23,20 +22,20 @@ class GameScene: SKScene{
         entityManager.add(Background(size: self.size))
         initMap()
     }
-
+    
     func initMap() {
         MapFactory(scene: self, entityManager: self.entityManager).loadMap(playerCount: 2)
     }
-
+    
     override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         guard let touch = touches.first else {
             return
         }
-
+        
         let touchLocation = touch.location(in: self)
-
-		if isMoveTouch{
-			isMoveTouch = false
+        
+        if isMoveTouch{
+            isMoveTouch = false
             currentDraggedBase!.component(ofType: DefaultBaseComponent.self)?.spriteNode.position = currentDraggedBasePos
             currentDraggedBase!.component(ofType: TeamComponent.self)?.fire.position = currentDraggedBasePos
             
@@ -77,9 +76,9 @@ class GameScene: SKScene{
                 }
             }
         }
-
+        
     }
-
+    
     override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
         guard let touch = touches.first else {
             return
@@ -97,7 +96,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.getBaseByPlayer(for: GKLocalPlayer.local)
+        let bases = entityManager.getBasesByTeam(for: .team1)
         
         for base in bases {
             if atPoint(touchLocation) == base.component(ofType: DefaultBaseComponent.self)?.spriteNode{
@@ -106,7 +105,7 @@ class GameScene: SKScene{
                     currentDraggedBase = base
                 }
                 isMoveTouch = true
-
+                
                 base.component(ofType: DefaultBaseComponent.self)?.spriteNode.position = touchLocation
                 base.component(ofType: TeamComponent.self)?.fire.position = touchLocation
                 for adjacencyBase in base.adjacencyList {