hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize team in Base model with default nil

Browse Source
This commit is contained in:
Marcel Schwarz 2020-05-02 20:13:31 +02:00
parent c1bb6a47de
commit ffd4e0dfe0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GoldWars/GoldWars/Entities/Base.swift
View File

@ -12,7 +12,7 @@ import GameplayKit
class Base : GKEntity{ class Base : GKEntity{
var unitCount:Int var unitCount:Int
init(team: Team?, position: CGPoint ) { init(position: CGPoint, team: Team! = nil) {
self.unitCount = 0 self.unitCount = 0
super.init() super.init()
addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: position)) addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: position))

10
GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift
View File

@ -27,8 +27,8 @@ class TwoPlayerDefaultTestMap: MapProtocoll {
func create() { func create() {
// Player one (leftest base) // Player one (leftest base)
let basePlayerOne = Base( let basePlayerOne = Base(
team: .team1 , position: CGPoint(x: self.size.width * 0.1, y: self.size.height / 2),
position: CGPoint(x: self.size.width * 0.1, y: self.size.height / 2) team: .team1
) )
entityManager.add(basePlayerOne) entityManager.add(basePlayerOne)
@ -49,13 +49,13 @@ class TwoPlayerDefaultTestMap: MapProtocoll {
genericBasePositions.append(CGPoint(x: self.size.width * 0.75, y: self.size.height * 0.75)) genericBasePositions.append(CGPoint(x: self.size.width * 0.75, y: self.size.height * 0.75))
for pos in genericBasePositions { for pos in genericBasePositions {
entityManager.add(Base(team: nil, position: pos)) entityManager.add(Base(position: pos))
} }
// Player two (rightest base) // Player two (rightest base)
let basePlayerTwo = Base( let basePlayerTwo = Base(
team: .team2 , position: CGPoint(x: self.size.width * 0.9, y: self.size.height / 2),
position: CGPoint(x: self.size.width * 0.9, y: self.size.height / 2) team: .team2
) )
entityManager.add(basePlayerTwo) entityManager.add(basePlayerTwo)
} }