From e87e489e9eab1d692b925d78449bf54ca95a5c23 Mon Sep 17 00:00:00 2001 From: Aldin Duraki Date: Fri, 15 May 2020 09:10:51 +0000 Subject: [PATCH] Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" This reverts merge request !60 --- .../GoldWars/Components/TeamComponent.swift | 2 -- GoldWars/GoldWars/Entities/Base.swift | 4 ++-- .../GoldWars/Entities/EntityManager.swift | 1 - GoldWars/GoldWars/Entities/Modal.swift | 2 -- .../Map/TwoPlayerDefaultTestMap.swift | 2 -- GoldWars/GoldWars/MatchmakingHelper.swift | 5 +++++ GoldWars/GoldWars/Scenes/GameScene.swift | 21 +++++++++---------- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/GoldWars/GoldWars/Components/TeamComponent.swift b/GoldWars/GoldWars/Components/TeamComponent.swift index c5efa70..379a1cc 100644 --- a/GoldWars/GoldWars/Components/TeamComponent.swift +++ b/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() } diff --git a/GoldWars/GoldWars/Entities/Base.swift b/GoldWars/GoldWars/Entities/Base.swift index 1e43e87..70fe75d 100644 --- a/GoldWars/GoldWars/Entities/Base.swift +++ b/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 } } diff --git a/GoldWars/GoldWars/Entities/EntityManager.swift b/GoldWars/GoldWars/Entities/EntityManager.swift index 5d798b2..38ef9a1 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -8,7 +8,6 @@ import SpriteKit import GameplayKit -import GameKit class EntityManager { diff --git a/GoldWars/GoldWars/Entities/Modal.swift b/GoldWars/GoldWars/Entities/Modal.swift index 954f795..516efb0 100644 --- a/GoldWars/GoldWars/Entities/Modal.swift +++ b/GoldWars/GoldWars/Entities/Modal.swift @@ -9,8 +9,6 @@ import GameplayKit class Modal: GKEntity{ - - var unitCount:Int var unitCount:Int diff --git a/GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift b/GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift index 412be97..beff433 100644 --- a/GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift +++ b/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 ) diff --git a/GoldWars/GoldWars/MatchmakingHelper.swift b/GoldWars/GoldWars/MatchmakingHelper.swift index 26ff022..48628ce 100644 --- a/GoldWars/GoldWars/MatchmakingHelper.swift +++ b/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)) }) diff --git a/GoldWars/GoldWars/Scenes/GameScene.swift b/GoldWars/GoldWars/Scenes/GameScene.swift index 8df4c6d..bb47730 100644 --- a/GoldWars/GoldWars/Scenes/GameScene.swift +++ b/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, 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, 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 {