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

Extract default test map, add map protocol to game scene

Browse Source
This commit is contained in:
Marcel Schwarz 2020-05-02 18:48:23 +02:00
parent df58c822a1
commit ffc4c05a46
3 changed files with 159 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GoldWars/GoldWars/Map/MapProtocoll.swift
View File

@ -7,9 +7,13 @@
// //
import Foundation import Foundation
import SpriteKit
protocol MapProtocoll { protocol MapProtocoll {
var size: CGSize! {get set}
func create()
func adjacent(base: Base) -> Array<Base> func adjacent(base: Base) -> Array<Base>
} }

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

@ -7,13 +7,78 @@
// //
import Foundation import Foundation
import SpriteKit
class TwoPlayerDefaultTestMap: MapProtocoll { class TwoPlayerDefaultTestMap: MapProtocoll {
var entityManager: EntityManager!
var size: CGSize!
var adjacencyList: Dictionary<Base, Array<Base>>!
func adjacent(base: Base) -> Array<Base> { init(scene: SKScene, entityManager: EntityManager) {
return Array() self.entityManager = entityManager;
self.size = scene.size
} }
func adjacent(base: Base) -> Array<Base> {
return adjacencyList[base]!
}
func create() {
createNodes()
createNeighbourMapping()
}
func createNodes() {
for i in 0...7 {
let base: Base
var position = CGPoint(x: 0, y: 0)
switch i {
case 0...2:
let width = self.size.width * 0.25
if i == 0 {
position = CGPoint(x: width, y: self.size.height * 0.25)
}
if i == 1 {
position = CGPoint(x: width, y: self.size.height * 0.5)
}
if i == 2 {
position = CGPoint(x: width, y: self.size.height * 0.75)
}
case 3...4:
let width = self.size.width * 0.5
if i == 3 {
position = CGPoint(x: width, y: self.size.height * 0.333)
}
if i == 4 {
position = CGPoint(x: width, y: self.size.height * 0.666)
}
case 5...7:
let width = self.size.width * 0.75
if i == 5 {
position = CGPoint(x: width, y: self.size.height * 0.25)
}
if i == 6 {
position = CGPoint(x: width, y: self.size.height * 0.5)
}
if i == 7 {
position = CGPoint(x: width, y: self.size.height * 0.75)
}
default:
break
}
base = Base(textureName: "Base", team: nil, position: position)
entityManager.add(base)
}
}
func createNeighbourMapping() {
}
} }

185
GoldWars/GoldWars/Scenes/GameScene.swift
View File

@ -11,139 +11,90 @@ import GameplayKit
class GameScene: SKScene{ class GameScene: SKScene{
var entityManager: EntityManager! var entityManager: EntityManager!
var map: MapProtocoll!
override func sceneDidLoad() { override func sceneDidLoad() {
entityManager = EntityManager(scene: self) entityManager = EntityManager(scene: self)
entityManager.add(Base(textureName: "Base", entityManager.add(Base(textureName: "Base",
team: .team1 , 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)))
entityManager.add(Base(textureName: "Base", entityManager.add(Base(textureName: "Base",
team: .team2 , 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)))
entityManager.add(HUD(size: self.size)) entityManager.add(HUD(size: self.size))
initMap() initMap()
createBackground() createBackground()
} }
func createBackground() { func createBackground() {
for i in 0...2 { for i in 0...2 {
let sky = SKSpriteNode(imageNamed: "SkyBackground") let sky = SKSpriteNode(imageNamed: "SkyBackground")
sky.name = "clouds" sky.name = "clouds"
sky.zPosition = -1 sky.zPosition = -1
sky.size = CGSize(width: (self.scene?.size.width)!, height: (self.scene?.size.height)!) sky.size = CGSize(width: (self.scene?.size.width)!, height: (self.scene?.size.height)!)
sky.position = CGPoint(x: CGFloat(i) * sky.size.width , y: (self.frame.size.height / 2)) sky.position = CGPoint(x: CGFloat(i) * sky.size.width , y: (self.frame.size.height / 2))
self.addChild(sky) self.addChild(sky)
} }
} }
// TODO: Issue #24 create Map generation Service // TODO: Issue #24 create Map generation Service
func initMap() { func initMap() {
self.map = TwoPlayerDefaultTestMap(scene: self, entityManager: self.entityManager)
createVirginBases() self.map.create()
} }
func createVirginBases() {
for i in 0...7 {
let base:Base
var position = CGPoint(x: 0, y: 0)
switch i {
case 0...2:
let width = self.size.width * 0.25
if i == 0 {
position = CGPoint(x: width, y: self.size.height * 0.25)
}
if i == 1 {
position = CGPoint(x: width, y: self.size.height * 0.5)
}
if i == 2{
position = CGPoint(x: width, y: self.size.height * 0.75)
}
case 3...4:
let width = self.size.width * 0.5
if i == 3{
position = CGPoint(x: width, y: self.size.height * 0.333)
}
if i == 4{
position = CGPoint(x: width, y: self.size.height * 0.666)
}
case 5...7:
let width = self.size.width * 0.75
if i == 5{
position = CGPoint(x: width, y: self.size.height * 0.25)
}
if i == 6{
position = CGPoint(x: width, y: self.size.height * 0.5)
}
if i == 7{
position = CGPoint(x: width, y: self.size.height * 0.75)
}
default:
break
}
base = Base(textureName: "Base", team: nil, position: position)
entityManager.add(base)
}
} override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
guard let touch = touches.first else {
return
}
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { let touchLocation = touch.location(in: self)
guard let touch = touches.first else {
return
}
let touchLocation = touch.location(in: self) for entity in entityManager.entities {
for entity in entityManager.entities { let spriteNode = entity.component(ofType: DefaultBaseComponent.self)?.spriteNode
let spriteNode = entity.component(ofType: DefaultBaseComponent.self)?.spriteNode if entityManager.isModal && entity.isMember(of: Modal.self) {
entityManager.remove(entity)
for child in self.children {
if(child.name != "fire"){
child.alpha = 1
}
}
if entityManager.isModal && entity.isMember(of: Modal.self) { }
entityManager.remove(entity)
for child in self.children {
if(child.name != "fire"){
child.alpha = 1
}
}
} if atPoint(touchLocation) == spriteNode && !entityManager.isModal {
spriteNode?.touchesBegan(touches, with: event)
if !entityManager.isModal {
for child in self.children {
if(child.name != "fire"){
child.alpha = 0.3
}
if atPoint(touchLocation) == spriteNode && !entityManager.isModal { }
spriteNode?.touchesBegan(touches, with: event) entityManager.add(Modal(modaltype: .BaseDetails,
if !entityManager.isModal { base: entity as! Base,
for child in self.children { anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2)))
if(child.name != "fire"){ }
child.alpha = 0.3 }
} }
}
}
entityManager.add(Modal(modaltype: .BaseDetails,
base: entity as! Base,
anchorPoint: CGPoint(x: self.size.width / 2 , y: self.size.height / 2)))
}
}
}
}
override func update(_ currentTime: TimeInterval) { override func update(_ currentTime: TimeInterval) {
self.enumerateChildNodes(withName: "clouds", using: ({ self.enumerateChildNodes(withName: "clouds", using: ({
(node, error) in (node, error) in
node.position.x -= 2 node.position.x -= 2
if node.position.x < -(self.scene?.size.width)! { if node.position.x < -(self.scene?.size.width)! {
node.position.x += (self.scene?.size.width)! * 3 node.position.x += (self.scene?.size.width)! * 3
} }
})) }))
} }
} }