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

Minor code cleanup

Browse Source
This commit is contained in:
Aldin Duraki 2020-05-05 11:16:27 -07:00
parent bf88e1af83
commit 3b417cbe0e
20 changed files with 44 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GoldWars/GoldWars/Components/AtkBoostSkillComponent.swift
View File

@ -24,7 +24,6 @@ class AtkBoostSkillComponent: GKComponent{
shapeNode.fillColor = SKColor.gray
}
super.init()
}
required init?(coder: NSCoder) {

6
GoldWars/GoldWars/Components/AttackActionComponent.swift
View File

@ -6,17 +6,13 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
class AttackActionComponent: GKComponent {
init(unitCount: Int, adjacencyList: Array<Base>, position: CGPoint) {
super.init()
}
required init?(coder: NSCoder) {
@ -25,7 +21,7 @@ class AttackActionComponent : GKComponent {
func action() {
// Not implemented yet
}
}

3
GoldWars/GoldWars/Components/BackgroundComponent.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
class BackgroundComponent: GKComponent{
@ -36,8 +35,6 @@ class BackgroundComponent: GKComponent{
}
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

3
GoldWars/GoldWars/Components/BaseNode.swift
View File

@ -6,10 +6,8 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import SpriteKit
class BaseNode: SKSpriteNode{
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
@ -22,7 +20,6 @@ class BaseNode: SKSpriteNode{
]
)
)
}
override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {

1
GoldWars/GoldWars/Components/ButtonComponent.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
class ButtonComponent: GKComponent {

14
GoldWars/GoldWars/Components/ButtonNode.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import SpriteKit
class ButtonNode: SKSpriteNode {
@ -33,42 +32,39 @@ class ButtonNode : SKSpriteNode {
self.position = position
let label = SKLabelNode(fontNamed: "Courier-Bold")
label.fontSize = 30
label.fontColor = SKColor.black
label.zPosition = 1
label.verticalAlignmentMode = .center
label.text = text
label.name = "label"
if !iconName.isEmpty {
if iconName.isEmpty {
label.position = CGPoint(x: 0, y: 0)
} else {
label.position = CGPoint(x: size.width * 0.25, y: 0)
let icon = SKSpriteNode(imageNamed: iconName)
icon.position = CGPoint(x: -size.width * 0.25, y: 0)
icon.zPosition = 1
self.addChild(icon)
} else {
label.position = CGPoint(x: 0, y: 0)
}
self.addChild(label)
isUserInteractionEnabled = true
}
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
if isEnabled {
let action = SKAction.sequence(
[
SKAction.scale(by: (3/4), duration: 0.3),
SKAction.scale(by: (4/3), duration: 0.3),
])
]
)
self.childNode(withName: "label")?.run(action)
self.run(action)
onButtonPress()
}
}

1
GoldWars/GoldWars/Components/DefBoostSkillComponent.swift
View File

@ -24,7 +24,6 @@ class DefBoostSkillComponent: GKComponent{
shapeNode.fillColor = SKColor.gray
}
super.init()
}
required init?(coder: NSCoder) {

1
GoldWars/GoldWars/Components/DefaultBaseComponent.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
import SpriteKit

1
GoldWars/GoldWars/Components/ModalBackgroundComponent.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
import SpriteKit

1
GoldWars/GoldWars/Components/ModalContentComponent.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
import SpriteKit

1
GoldWars/GoldWars/Components/SpySkillComponent.swift
View File

@ -24,7 +24,6 @@ class SpySkillComponent: GKComponent{
shapeNode.fillColor = SKColor.gray
}
super.init()
}
required init?(coder: NSCoder) {

1
GoldWars/GoldWars/Components/TeamComponent.swift
View File

@ -20,6 +20,7 @@ class TeamComponent: GKComponent {
fire.name = "fire"
fire.particleColorSequence = nil
fire.particleColorBlendFactor = 1.0
switch team {
case .team1: fire.particleColor = SKColor.red
case .team2: fire.particleColor = SKColor.purple

5
GoldWars/GoldWars/Entities/Background.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
class Background: GKEntity {
@ -16,7 +15,6 @@ class Background: GKEntity {
addComponent(BackgroundComponent(size: size))
}
override func update(deltaTime seconds: TimeInterval) {
component(ofType: BackgroundComponent.self)?.update()
}
@ -24,7 +22,4 @@ class Background: GKEntity {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

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

@ -10,6 +10,7 @@ import SpriteKit
import GameplayKit
class Base: GKEntity {
var unitCount: Int
var adjacencyList: Array<Base>

6
GoldWars/GoldWars/Entities/Button.swift
View File

@ -6,10 +6,10 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameKit
class Button: GKEntity{
let name: String
var isEnabled = true
@ -19,11 +19,7 @@ class Button : GKEntity{
self.addComponent(ButtonComponent(iconName: iconName, text: text, position: position, isEnabled: isEnabled, onButtonPress: onButtonPress))
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

4
GoldWars/GoldWars/Entities/EntityManager.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import SpriteKit
import GameplayKit
@ -58,9 +57,8 @@ class EntityManager {
scene.addChild(node)
}
}
}
func remove(_ entity: GKEntity) {
if let spriteNode = entity.component(ofType: DefaultBaseComponent.self)?.spriteNode {
spriteNode.removeFromParent()

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

@ -6,12 +6,10 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
import GameplayKit
class Modal: GKEntity{
init(modaltype: ModalType, base: Base, anchorPoint: CGPoint) {
super.init()

2
GoldWars/GoldWars/Enums/ModalType.swift
View File

@ -6,8 +6,6 @@
// Copyright © 2020 SP2. All rights reserved.
//
import Foundation
enum ModalType: String{
case BaseDetails
case BaseAttack

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

@ -28,7 +28,6 @@ class GameScene: SKScene{
}
override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
guard let touch = touches.first else {
return
}
@ -36,9 +35,7 @@ class GameScene: SKScene{
let touchLocation = touch.location(in: self)
if !isMoveTouch {
for entity in entityManager.entities {
let spriteNode = entity.component(ofType: DefaultBaseComponent.self)?.spriteNode
if entityManager.isModal && entity.isMember(of: Modal.self) {
@ -48,7 +45,6 @@ class GameScene: SKScene{
child.alpha = 1
}
}
}
if atPoint(touchLocation) == spriteNode && !entityManager.isModal {
@ -58,7 +54,6 @@ class GameScene: SKScene{
if(child.name != "fire"){
child.alpha = 0.3
}
}
entityManager.add(Modal(modaltype: .BaseDetails,
base: entity as! Base,