From 6f8487e16e8134bae34156cafaf438d25238d63d Mon Sep 17 00:00:00 2001 From: Aldin Duraki <62dual1bif@hft-stuttgart.de> Date: Wed, 22 Apr 2020 16:43:58 +0200 Subject: [PATCH] Refactor Unit class --- GoldWars/GoldWars.xcodeproj/project.pbxproj | 12 ++++++++++++ .../GoldWars/{Base/Units.swift => Unit/Unit.swift} | 6 +----- 2 files changed, 13 insertions(+), 5 deletions(-) rename GoldWars/GoldWars/{Base/Units.swift => Unit/Unit.swift} (89%) diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index d04b888..837e018 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 110360F9244B101B008610AF /* GoldWarsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360F8244B101B008610AF /* GoldWarsUITests.swift */; }; 11036111244B3D6A008610AF /* MenuScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 11036110244B3D6A008610AF /* MenuScene.sks */; }; 11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; }; + 11738A3B24508F68004426F1 /* Unit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11738A3A24508F68004426F1 /* Unit.swift */; }; ABA03DA0244BD54F00A66916 /* Base.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA03D9F244BD54F00A66916 /* Base.swift */; }; /* End PBXBuildFile section */ @@ -56,6 +57,7 @@ 110360FA244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 11036110244B3D6A008610AF /* MenuScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = MenuScene.sks; sourceTree = ""; }; 11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = ""; }; + 11738A3A24508F68004426F1 /* Unit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Unit.swift; sourceTree = ""; }; ABA03D9F244BD54F00A66916 /* Base.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -107,6 +109,7 @@ 110360D1244B101A008610AF /* GoldWars */ = { isa = PBXGroup; children = ( + 11738A3C24508F8C004426F1 /* Unit */, ABA03D9E244BD53D00A66916 /* Base */, 11036114244B3E8A008610AF /* Menu */, 1103610F244B3D48008610AF /* Game */, @@ -156,6 +159,14 @@ path = Menu; sourceTree = ""; }; + 11738A3C24508F8C004426F1 /* Unit */ = { + isa = PBXGroup; + children = ( + 11738A3A24508F68004426F1 /* Unit.swift */, + ); + path = Unit; + sourceTree = ""; + }; ABA03D9E244BD53D00A66916 /* Base */ = { isa = PBXGroup; children = ( @@ -298,6 +309,7 @@ buildActionMask = 2147483647; files = ( 110360D9244B101A008610AF /* GameScene.swift in Sources */, + 11738A3B24508F68004426F1 /* Unit.swift in Sources */, 11036113244B3E30008610AF /* MenuScene.swift in Sources */, ABA03DA0244BD54F00A66916 /* Base.swift in Sources */, 110360DB244B101A008610AF /* GameViewController.swift in Sources */, diff --git a/GoldWars/GoldWars/Base/Units.swift b/GoldWars/GoldWars/Unit/Unit.swift similarity index 89% rename from GoldWars/GoldWars/Base/Units.swift rename to GoldWars/GoldWars/Unit/Unit.swift index adae86a..f01eba3 100644 --- a/GoldWars/GoldWars/Base/Units.swift +++ b/GoldWars/GoldWars/Unit/Unit.swift @@ -6,12 +6,8 @@ // Copyright © 2020 SP2. All rights reserved. // - - -struct Units{ - +struct Unit{ var strength: Float var health: Float var defence: Float - }