Merge branch 'Sprint_5_delivery' into 'master'

Sprint 5 delivery

See merge request marcel.schwarz/software-projekt-2!144

GoldWars/GoldWars.xcodeproj/project.pbxproj

@@ -11,19 +11,26 @@
 		110360D9244B101A008610AF /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360D8244B101A008610AF /* GameScene.swift */; };
 		110360DB244B101A008610AF /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360DA244B101A008610AF /* GameViewController.swift */; };
 		110360DE244B101A008610AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 110360DC244B101A008610AF /* Main.storyboard */; };
-		110360E0244B101B008610AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 110360DF244B101B008610AF /* Assets.xcassets */; };
+		110360E0244B101B008610AF /* GoldWarsAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 110360DF244B101B008610AF /* GoldWarsAssets.xcassets */; };
 		110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 110360E1244B101B008610AF /* LaunchScreen.storyboard */; };
 		110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; };
 		11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; };
 		116060F7245C57D2004E5A36 /* EntityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116060F6245C57D2004E5A36 /* EntityManager.swift */; };
+		20F1990724A4FAC1004B7A30 /* new_round.wav in Resources */ = {isa = PBXBuildFile; fileRef = 20F1990424A4FAC1004B7A30 /* new_round.wav */; };
+		20F1990824A4FAC1004B7A30 /* use_boost.wav in Resources */ = {isa = PBXBuildFile; fileRef = 20F1990524A4FAC1004B7A30 /* use_boost.wav */; };
+		20F1990924A4FAC1004B7A30 /* attack_base.wav in Resources */ = {isa = PBXBuildFile; fileRef = 20F1990624A4FAC1004B7A30 /* attack_base.wav */; };
 		3E67854024728368007B9DE4 /* CElements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E67853F24728368007B9DE4 /* CElements.swift */; };
 		3E6785422472CBEC007B9DE4 /* Way.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785412472CBEC007B9DE4 /* Way.swift */; };
-		3E6785442472CC27007B9DE4 /* DefaultWayComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785432472CC27007B9DE4 /* DefaultWayComponent.swift */; };
 		3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EAD889424801B6A0048A10A /* RoundTimer.swift */; };
 		3EBD242E245D9332003CECE7 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD242D245D9332003CECE7 /* Team.swift */; };
-		3F745DF0246F48FC00CE7375 /* PlayerMoveType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F745DEF246F48FC00CE7375 /* PlayerMoveType.swift */; };
+		3F37551824A5490B00F9E331 /* SnapshotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551724A5490B00F9E331 /* SnapshotModel.swift */; };
+		3F37551A24A5497300F9E331 /* RoundDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551924A5497300F9E331 /* RoundDataModel.swift */; };
+		3F37551C24A5498C00F9E331 /* NotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551B24A5498C00F9E331 /* NotificationModel.swift */; };
+		3F37551E24A54A1100F9E331 /* HeartbeatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */; };
 		3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */ = {isa = PBXBuildFile; fileRef = 3F79FFDF2486F7CD003F79C3 /* Explosion.sks */; };
 		3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */; };
+		3FF5DA5D24A546B600ED668F /* ModalType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF5DA5C24A546B600ED668F /* ModalType.swift */; };
+		8B9CA5F1249A3C2E00561704 /* SkillButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */; };
 		8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */; };
 		9E0E459724796262009817A6 /* GameCenterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E0E459624796262009817A6 /* GameCenterManager.swift */; };
 		9E11FF79245CD81100EED3BE /* Fire.sks in Resources */ = {isa = PBXBuildFile; fileRef = 9E11FF77245CD81100EED3BE /* Fire.sks */; };
@@ -32,20 +39,22 @@
 		9E174C86245DD91500209FF0 /* ButtonComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E174C85245DD91500209FF0 /* ButtonComponent.swift */; };
 		9E174C88245DF1FF00209FF0 /* BackgroundComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E174C87245DF1FF00209FF0 /* BackgroundComponent.swift */; };
 		9E174C8A245E1A0A00209FF0 /* Background.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E174C89245E1A0A00209FF0 /* Background.swift */; };
+		9E61EAC4249BAC9100334DDE /* LoserFire.sks in Resources */ = {isa = PBXBuildFile; fileRef = 9E61EAC2249BAC9100334DDE /* LoserFire.sks */; };
+		9E61EAC7249BB61A00334DDE /* SpinningLogo3DNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E61EAC6249BB61A00334DDE /* SpinningLogo3DNode.swift */; };
 		9E78ACB6245C9A5300526FF7 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E78ACB5245C9A5300526FF7 /* GameKit.framework */; };
 		9E78ACB8245CB75B00526FF7 /* TeamComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */; };
 		9E78ACBA245CBDAF00526FF7 /* HUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E78ACB9245CBDAF00526FF7 /* HUD.swift */; };
 		9EA3ABE9245C6DAA006BC61D /* DefaultBaseComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */; };
 		9EA3ABEB245C6DFA006BC61D /* BaseNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */; };
 		9EC239E1246878A900952F74 /* MultiplayerNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */; };
-		9EC2FBA72476B1EC00ABF11F /* PlayerInfoComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */; };
 		9EC7E48B2461FBF700396BCD /* SliderNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC7E48A2461FBF700396BCD /* SliderNode.swift */; };
 		9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC86B9E245C88A300796EF3 /* Modal.swift */; };
 		9EEDE02D246FCD770096C735 /* SpinningLogoEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EEDE02C246FCD770096C735 /* SpinningLogoEntity.swift */; };
-		9EEDE02F246FCD800096C735 /* SpinningLogoComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EEDE02E246FCD800096C735 /* SpinningLogoComponent.swift */; };
 		AB21D7D5246C748A00B09CBA /* MapFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB21D7D4246C748A00B09CBA /* MapFactory.swift */; };
+		AB671B252494ECF0003FBE8D /* EloHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB671B242494ECF0003FBE8D /* EloHelper.swift */; };
 		ABA03DA0244BD54F00A66916 /* Base.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA03D9F244BD54F00A66916 /* Base.swift */; };
 		ABC0C3732481509300387B8F /* MapUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC0C3722481509300387B8F /* MapUtils.swift */; };
+		AE0C8E2F249BCC2A00996360 /* RulesScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0C8E2E249BCC2A00996360 /* RulesScene.swift */; };
 		C04783EE2468583F004961FB /* intro-music.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C04783ED2468583F004961FB /* intro-music.mp3 */; };
 		C04783F024685995004961FB /* SettingsScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04783EF24685995004961FB /* SettingsScene.swift */; };
 		C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C05BB9C3247D890C00411249 /* SliderComponent.swift */; };
@@ -72,7 +81,7 @@
 		110360D8244B101A008610AF /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = "<group>"; };
 		110360DA244B101A008610AF /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = "<group>"; };
 		110360DD244B101A008610AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		110360DF244B101B008610AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		110360DF244B101B008610AF /* GoldWarsAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = GoldWarsAssets.xcassets; sourceTree = "<group>"; };
 		110360E2244B101B008610AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		110360E4244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		110360E9244B101B008610AF /* GoldWarsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoldWarsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -80,14 +89,21 @@
 		110360EF244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; };
 		116060F6245C57D2004E5A36 /* EntityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntityManager.swift; sourceTree = "<group>"; };
+		20F1990424A4FAC1004B7A30 /* new_round.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = new_round.wav; sourceTree = "<group>"; };
+		20F1990524A4FAC1004B7A30 /* use_boost.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = use_boost.wav; sourceTree = "<group>"; };
+		20F1990624A4FAC1004B7A30 /* attack_base.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = attack_base.wav; sourceTree = "<group>"; };
 		3E67853F24728368007B9DE4 /* CElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CElements.swift; sourceTree = "<group>"; };
 		3E6785412472CBEC007B9DE4 /* Way.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Way.swift; sourceTree = "<group>"; };
-		3E6785432472CC27007B9DE4 /* DefaultWayComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultWayComponent.swift; sourceTree = "<group>"; };
 		3EAD889424801B6A0048A10A /* RoundTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundTimer.swift; sourceTree = "<group>"; };
 		3EBD242D245D9332003CECE7 /* Team.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Team.swift; sourceTree = "<group>"; };
-		3F745DEF246F48FC00CE7375 /* PlayerMoveType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerMoveType.swift; sourceTree = "<group>"; };
+		3F37551724A5490B00F9E331 /* SnapshotModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotModel.swift; sourceTree = "<group>"; };
+		3F37551924A5497300F9E331 /* RoundDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundDataModel.swift; sourceTree = "<group>"; };
+		3F37551B24A5498C00F9E331 /* NotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationModel.swift; sourceTree = "<group>"; };
+		3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeartbeatModel.swift; sourceTree = "<group>"; };
 		3F79FFDF2486F7CD003F79C3 /* Explosion.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Explosion.sks; sourceTree = "<group>"; };
 		3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundCalculatorService.swift; sourceTree = "<group>"; };
+		3FF5DA5C24A546B600ED668F /* ModalType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalType.swift; sourceTree = "<group>"; };
+		8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkillButtonNode.swift; sourceTree = "<group>"; };
 		8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingeClickButtonNode.swift; sourceTree = "<group>"; };
 		9E0E459624796262009817A6 /* GameCenterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCenterManager.swift; sourceTree = "<group>"; };
 		9E11FF77245CD81100EED3BE /* Fire.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Fire.sks; sourceTree = "<group>"; };
@@ -96,21 +112,23 @@
 		9E174C85245DD91500209FF0 /* ButtonComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonComponent.swift; sourceTree = "<group>"; };
 		9E174C87245DF1FF00209FF0 /* BackgroundComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundComponent.swift; sourceTree = "<group>"; };
 		9E174C89245E1A0A00209FF0 /* Background.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Background.swift; sourceTree = "<group>"; };
+		9E61EAC2249BAC9100334DDE /* LoserFire.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = LoserFire.sks; sourceTree = "<group>"; };
+		9E61EAC6249BB61A00334DDE /* SpinningLogo3DNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinningLogo3DNode.swift; sourceTree = "<group>"; };
 		9E78ACB5245C9A5300526FF7 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamComponent.swift; sourceTree = "<group>"; };
 		9E78ACB9245CBDAF00526FF7 /* HUD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUD.swift; sourceTree = "<group>"; };
 		9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultBaseComponent.swift; sourceTree = "<group>"; wrapsLines = 1; };
 		9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNode.swift; sourceTree = "<group>"; };
 		9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiplayerNetwork.swift; sourceTree = "<group>"; };
-		9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerInfoComponent.swift; sourceTree = "<group>"; };
 		9EC7E48A2461FBF700396BCD /* SliderNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderNode.swift; sourceTree = "<group>"; };
 		9EC86B9E245C88A300796EF3 /* Modal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modal.swift; sourceTree = "<group>"; };
 		9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = GoldWars.entitlements; sourceTree = "<group>"; };
 		9EEDE02C246FCD770096C735 /* SpinningLogoEntity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinningLogoEntity.swift; sourceTree = "<group>"; };
-		9EEDE02E246FCD800096C735 /* SpinningLogoComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinningLogoComponent.swift; sourceTree = "<group>"; };
 		AB21D7D4246C748A00B09CBA /* MapFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapFactory.swift; sourceTree = "<group>"; };
+		AB671B242494ECF0003FBE8D /* EloHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EloHelper.swift; sourceTree = "<group>"; };
 		ABA03D9F244BD54F00A66916 /* Base.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base.swift; sourceTree = "<group>"; };
 		ABC0C3722481509300387B8F /* MapUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapUtils.swift; sourceTree = "<group>"; };
+		AE0C8E2E249BCC2A00996360 /* RulesScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RulesScene.swift; sourceTree = "<group>"; };
 		C04783ED2468583F004961FB /* intro-music.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "intro-music.mp3"; sourceTree = "<group>"; };
 		C04783EF24685995004961FB /* SettingsScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScene.swift; sourceTree = "<group>"; };
 		C05BB9C3247D890C00411249 /* SliderComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SliderComponent.swift; sourceTree = "<group>"; };
@@ -162,26 +180,19 @@
 		110360D1244B101A008610AF /* GoldWars */ = {
 			isa = PBXGroup;
 			children = (
-				C04783ED2468583F004961FB /* intro-music.mp3 */,
+				3F003F3924A5589E00B5ACEA /* Assets */,
-				9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */,
-				9E11FF74245CD79100EED3BE /* Partikels */,
-				116060F5245C5709004E5A36 /* Entities */,
-				AB1D759E245DD2EA00671525 /* Map */,
 				116060F4245C56EA004E5A36 /* Components */,
+				116060F5245C5709004E5A36 /* Entities */,
 				9EC86BA2245C89B200796EF3 /* Enums */,
+				AB1D759E245DD2EA00671525 /* Map */,
+				3F37551624A548D900F9E331 /* Models */,
 				9EC86BA4245C8A1E00796EF3 /* Scenes */,
+				3FF5DA5B24A5464E00ED668F /* Services */,
 				9EC86BA3245C89F400796EF3 /* Storyboards */,
 				110360D2244B101A008610AF /* AppDelegate.swift */,
-				C05FAED52468559D0006AF2E /* SoundManager.swift */,
 				110360DA244B101A008610AF /* GameViewController.swift */,
-				110360DF244B101B008610AF /* Assets.xcassets */,
-				9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */,
-				C099579B246C5E5C0016AA22 /* DataService.swift */,
 				110360E4244B101B008610AF /* Info.plist */,
-				3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */,
+				9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */,
-				9E0E459624796262009817A6 /* GameCenterManager.swift */,
-				C04783EF24685995004961FB /* SettingsScene.swift */,
-				3EAD889424801B6A0048A10A /* RoundTimer.swift */,
 			);
 			path = GoldWars;
 			sourceTree = "<group>";
@@ -198,19 +209,12 @@
 		116060F4245C56EA004E5A36 /* Components */ = {
 			isa = PBXGroup;
 			children = (
+				3F37551F24A54A8200F9E331 /* Nodes */,
 				9E174C87245DF1FF00209FF0 /* BackgroundComponent.swift */,
-				9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */,
 				9E174C85245DD91500209FF0 /* ButtonComponent.swift */,
-				9E174C81245DD81D00209FF0 /* ButtonNode.swift */,
 				9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */,
-				3E6785432472CC27007B9DE4 /* DefaultWayComponent.swift */,
 				C064E9A9246C114C0022B228 /* LabelComponent.swift */,
-				C064E9A7246C0EA50022B228 /* LabelNode.swift */,
-				9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */,
-				8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */,
 				C05BB9C3247D890C00411249 /* SliderComponent.swift */,
-				9EC7E48A2461FBF700396BCD /* SliderNode.swift */,
-				9EEDE02E246FCD800096C735 /* SpinningLogoComponent.swift */,
 				9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */,
 			);
 			path = Components;
@@ -232,11 +236,72 @@
 			path = Entities;
 			sourceTree = "<group>";
 		};
+		3F003F3924A5589E00B5ACEA /* Assets */ = {
+			isa = PBXGroup;
+			children = (
+				3F003F3A24A5590100B5ACEA /* Music */,
+				9E11FF74245CD79100EED3BE /* Partikels */,
+				110360DF244B101B008610AF /* GoldWarsAssets.xcassets */,
+			);
+			path = Assets;
+			sourceTree = "<group>";
+		};
+		3F003F3A24A5590100B5ACEA /* Music */ = {
+			isa = PBXGroup;
+			children = (
+				C04783ED2468583F004961FB /* intro-music.mp3 */,
+				20F1990624A4FAC1004B7A30 /* attack_base.wav */,
+				20F1990424A4FAC1004B7A30 /* new_round.wav */,
+				20F1990524A4FAC1004B7A30 /* use_boost.wav */,
+			);
+			path = Music;
+			sourceTree = "<group>";
+		};
+		3F37551624A548D900F9E331 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				3F37551724A5490B00F9E331 /* SnapshotModel.swift */,
+				3F37551924A5497300F9E331 /* RoundDataModel.swift */,
+				3F37551B24A5498C00F9E331 /* NotificationModel.swift */,
+				3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		3F37551F24A54A8200F9E331 /* Nodes */ = {
+			isa = PBXGroup;
+			children = (
+				9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */,
+				9E174C81245DD81D00209FF0 /* ButtonNode.swift */,
+				C064E9A7246C0EA50022B228 /* LabelNode.swift */,
+				8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */,
+				8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */,
+				9EC7E48A2461FBF700396BCD /* SliderNode.swift */,
+				9E61EAC6249BB61A00334DDE /* SpinningLogo3DNode.swift */,
+			);
+			path = Nodes;
+			sourceTree = "<group>";
+		};
+		3FF5DA5B24A5464E00ED668F /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				9E0E459624796262009817A6 /* GameCenterManager.swift */,
+				C05FAED52468559D0006AF2E /* SoundManager.swift */,
+				C099579B246C5E5C0016AA22 /* DataService.swift */,
+				AB671B242494ECF0003FBE8D /* EloHelper.swift */,
+				9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */,
+				3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */,
+				3EAD889424801B6A0048A10A /* RoundTimer.swift */,
+			);
+			path = Services;
+			sourceTree = "<group>";
+		};
 		9E11FF74245CD79100EED3BE /* Partikels */ = {
 			isa = PBXGroup;
 			children = (
 				3F79FFDF2486F7CD003F79C3 /* Explosion.sks */,
 				9E11FF77245CD81100EED3BE /* Fire.sks */,
+				9E61EAC2249BAC9100334DDE /* LoserFire.sks */,
 			);
 			path = Partikels;
 			sourceTree = "<group>";
@@ -253,7 +318,7 @@
 			isa = PBXGroup;
 			children = (
 				3EBD242D245D9332003CECE7 /* Team.swift */,
-				3F745DEF246F48FC00CE7375 /* PlayerMoveType.swift */,
+				3FF5DA5C24A546B600ED668F /* ModalType.swift */,
 			);
 			path = Enums;
 			sourceTree = "<group>";
@@ -272,6 +337,8 @@
 			children = (
 				11036112244B3E30008610AF /* MenuScene.swift */,
 				110360D8244B101A008610AF /* GameScene.swift */,
+				C04783EF24685995004961FB /* SettingsScene.swift */,
+				AE0C8E2E249BCC2A00996360 /* RulesScene.swift */,
 			);
 			path = Scenes;
 			sourceTree = "<group>";
@@ -368,9 +435,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				110360DE244B101A008610AF /* Main.storyboard in Resources */,
+				20F1990924A4FAC1004B7A30 /* attack_base.wav in Resources */,
 				9E11FF79245CD81100EED3BE /* Fire.sks in Resources */,
-				110360E0244B101B008610AF /* Assets.xcassets in Resources */,
+				20F1990724A4FAC1004B7A30 /* new_round.wav in Resources */,
+				110360E0244B101B008610AF /* GoldWarsAssets.xcassets in Resources */,
 				110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */,
+				9E61EAC4249BAC9100334DDE /* LoserFire.sks in Resources */,
+				20F1990824A4FAC1004B7A30 /* use_boost.wav in Resources */,
 				C04783EE2468583F004961FB /* intro-music.mp3 in Resources */,
 				3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */,
 			);
@@ -390,7 +461,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3F37551A24A5497300F9E331 /* RoundDataModel.swift in Sources */,
 				9E78ACB8245CB75B00526FF7 /* TeamComponent.swift in Sources */,
+				3FF5DA5D24A546B600ED668F /* ModalType.swift in Sources */,
 				9E0E459724796262009817A6 /* GameCenterManager.swift in Sources */,
 				3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */,
 				9EC239E1246878A900952F74 /* MultiplayerNetwork.swift in Sources */,
@@ -403,31 +476,34 @@
 				3EBD242E245D9332003CECE7 /* Team.swift in Sources */,
 				9E174C88245DF1FF00209FF0 /* BackgroundComponent.swift in Sources */,
 				9E78ACBA245CBDAF00526FF7 /* HUD.swift in Sources */,
-				9EC2FBA72476B1EC00ABF11F /* PlayerInfoComponent.swift in Sources */,
 				9EEDE02D246FCD770096C735 /* SpinningLogoEntity.swift in Sources */,
 				9E174C86245DD91500209FF0 /* ButtonComponent.swift in Sources */,
+				AB671B252494ECF0003FBE8D /* EloHelper.swift in Sources */,
 				11036113244B3E30008610AF /* MenuScene.swift in Sources */,
+				3F37551824A5490B00F9E331 /* SnapshotModel.swift in Sources */,
 				C099579C246C5E5C0016AA22 /* DataService.swift in Sources */,
+				3F37551E24A54A1100F9E331 /* HeartbeatModel.swift in Sources */,
 				AB21D7D5246C748A00B09CBA /* MapFactory.swift in Sources */,
 				9EA3ABE9245C6DAA006BC61D /* DefaultBaseComponent.swift in Sources */,
 				9E174C8A245E1A0A00209FF0 /* Background.swift in Sources */,
 				8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */,
 				C064E9A8246C0EA50022B228 /* LabelNode.swift in Sources */,
-				3F745DF0246F48FC00CE7375 /* PlayerMoveType.swift in Sources */,
+				8B9CA5F1249A3C2E00561704 /* SkillButtonNode.swift in Sources */,
 				3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */,
+				AE0C8E2F249BCC2A00996360 /* RulesScene.swift in Sources */,
 				3E67854024728368007B9DE4 /* CElements.swift in Sources */,
 				ABA03DA0244BD54F00A66916 /* Base.swift in Sources */,
 				C064E9AC246C151F0022B228 /* Label.swift in Sources */,
 				ABC0C3732481509300387B8F /* MapUtils.swift in Sources */,
 				9E174C82245DD81D00209FF0 /* ButtonNode.swift in Sources */,
 				9EC7E48B2461FBF700396BCD /* SliderNode.swift in Sources */,
-				9EEDE02F246FCD800096C735 /* SpinningLogoComponent.swift in Sources */,
+				9E61EAC7249BB61A00334DDE /* SpinningLogo3DNode.swift in Sources */,
 				9E174C84245DD8CE00209FF0 /* Button.swift in Sources */,
 				110360DB244B101A008610AF /* GameViewController.swift in Sources */,
-				3E6785442472CC27007B9DE4 /* DefaultWayComponent.swift in Sources */,
 				C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */,
 				110360D3244B101A008610AF /* AppDelegate.swift in Sources */,
 				9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */,
+				3F37551C24A5498C00F9E331 /* NotificationModel.swift in Sources */,
 				C05FAED62468559D0006AF2E /* SoundManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -591,14 +667,14 @@
 				CODE_SIGN_ENTITLEMENTS = GoldWars/GoldWars.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = de.hft.stuttgart.ip2.goldwars;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -614,14 +690,14 @@
 				CODE_SIGN_ENTITLEMENTS = GoldWars/GoldWars.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = de.hft.stuttgart.ip2.goldwars;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

GoldWars/GoldWars/AppDelegate.swift

@@ -7,35 +7,45 @@
 //
 
 import UIKit
+import os
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
+    let LOG = OSLog.init(subsystem: "AppDelegate", category: "AppDelegate")
 
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+        os_log("application", log: LOG, type: .info)
         return true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+        os_log("applicationWillResignActive", log: LOG, type: .debug)
+
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        os_log("applicationDidEnterBackground", log: LOG, type: .debug)
+        NotificationCenter.default.post(name: Notification.Name(rawValue: "pauseGame"), object: nil)
+        MultiplayerNetwork.sharedInstance.sendNotificationToPlayer(name: "pauseGame")
     }
 
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+        os_log("applicationWillEnterForeground", log: LOG, type: .debug)
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
+        os_log("applicationDidBecomeActive", log: LOG, type: .debug)
-
+        NotificationCenter.default.post(name: Notification.Name(rawValue: "resumeGame"), object: nil)
-
+        MultiplayerNetwork.sharedInstance.sendNotificationToPlayer(name: "resumeGame")
+    }
 }
 

GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/README.txt

@@ -1,23 +0,0 @@
-
-The different image sizes are used for:
-
-App Store:                     logo.png
-iPad Pro - App Icon:           logo_167.png
-iPad, iPad Mini - App Icon:    logo_152.png
-iPad (all) - Spotlight:        logo_80.png
-iPad (all) - Settings:         logo_58.png
-iPad (all) - Notifications:    logo_40.png
-
-
-Color Codes:
-
-Coin:
-    Main: #ae841a
-    Edges: #daa520  (goldenrod)
-
-Background flow:
-    From: #a9003c
-    To: #2f0011
-
-
-The logo.svg file is a vectorized version of the coin without the background.

GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.svg

@@ -1,11 +0,0 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1024px" height="1024px" viewBox="0 0 10240 10240" preserveAspectRatio="xMidYMid meet">
-<g id="layer101" fill="#ae841a" stroke="none">
- <path d="M4865 8994 c-610 -49 -1168 -217 -1661 -500 -538 -308 -994 -736 -1327 -1245 -346 -528 -544 -1082 -619 -1734 -17 -144 -17 -646 0 -790 54 -470 170 -881 362 -1283 260 -544 672 -1048 1157 -1415 569 -430 1224 -689 1948 -769 158 -17 632 -17 790 0 1186 131 2214 760 2859 1749 336 517 538 1086 608 1718 17 158 17 632 0 790 -70 631 -271 1200 -608 1718 -153 234 -280 392 -484 601 -619 635 -1428 1033 -2320 1141 -129 16 -590 28 -705 19z m1000 -3134 l740 -740 -743 -743 -742 -742 -742 742 -743 743 740 740 c407 407 742 740 745 740 3 0 338 -333 745 -740z"/>
- </g>
-<g id="layer102" fill="#daa520" stroke="none">
- <path d="M4900 8989 c-942 -50 -1846 -455 -2520 -1129 -631 -631 -1018 -1443 -1116 -2342 -20 -184 -23 -578 -5 -753 79 -785 360 -1477 846 -2081 532 -663 1294 -1143 2125 -1338 298 -70 553 -98 890 -98 605 0 1135 118 1668 373 524 250 997 624 1352 1068 411 515 678 1100 795 1743 80 439 79 939 -1 1376 -305 1669 -1644 2941 -3322 3157 -121 16 -436 36 -522 33 -25 0 -110 -4 -190 -9z m616 -673 c1065 -138 1972 -771 2465 -1721 180 -345 290 -711 341 -1125 17 -136 17 -564 0 -700 -73 -593 -280 -1118 -622 -1575 -528 -705 -1298 -1153 -2188 -1272 -177 -24 -607 -24 -784 0 -890 119 -1660 567 -2188 1272 -342 457 -549 982 -622 1575 -17 136 -17 564 0 700 85 693 352 1290 807 1801 517 581 1276 971 2040 1048 61 6 126 13 145 15 78 9 493 -4 606 -18z"/>
- <path d="M3907 6342 l-1217 -1217 1218 -1218 1217 -1217 1218 1218 1217 1217 -1218 1218 -1217 1217 -1218 -1218z m1958 -482 l740 -740 -743 -743 -742 -742 -742 742 -743 743 740 740 c407 407 742 740 745 740 3 0 338 -333 745 -740z"/>
- </g>
-
-</svg>

GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "yellow_checkmark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "yellow_sliderDown.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "yellow_sliderLeft.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "yellow_sliderRight.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "yellow_sliderUp.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
+      "filename" : "exitButton.png",
       "idiom" : "universal",
-      "filename" : "yellow_tick.png",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "Base.png",
+      "filename" : "finish_button 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Base-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Base-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "gold_button_4.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "roundInfoTexture.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "roundInfoTexture-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "roundInfoTexture-2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/Contents.json

@@ -2,107 +2,107 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "20x20",
+      "scale" : "2x",
-      "scale" : "2x"
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "20x20",
+      "scale" : "3x",
-      "scale" : "3x"
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
+      "scale" : "2x",
-      "scale" : "2x"
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
+      "scale" : "3x",
-      "scale" : "3x"
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
+      "scale" : "2x",
-      "scale" : "2x"
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
+      "scale" : "3x",
-      "scale" : "3x"
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
+      "scale" : "2x",
-      "scale" : "2x"
+      "size" : "60x60"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
+      "scale" : "3x",
-      "scale" : "3x"
+      "size" : "60x60"
     },
     {
-      "idiom" : "ipad",
-      "size" : "20x20",
       "filename" : "logo_20.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "idiom" : "ipad",
-      "size" : "20x20",
       "filename" : "logo_40.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "idiom" : "ipad",
-      "size" : "29x29",
       "filename" : "logo_29.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "idiom" : "ipad",
-      "size" : "29x29",
       "filename" : "logo_58.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "idiom" : "ipad",
-      "size" : "40x40",
       "filename" : "logo_40.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "idiom" : "ipad",
-      "size" : "40x40",
       "filename" : "logo_80.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "idiom" : "ipad",
-      "size" : "76x76",
       "filename" : "logo_76.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "idiom" : "ipad",
-      "size" : "76x76",
       "filename" : "logo_152.png",
-      "scale" : "2x"
-    },
-    {
       "idiom" : "ipad",
-      "size" : "83.5x83.5",
+      "scale" : "2x",
-      "filename" : "logo_167.png",
+      "size" : "76x76"
-      "scale" : "2x"
+    },
+    {
+      "filename" : "logo_167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
       "filename" : "logo.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Contents.json

@@ -1,21 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "BaseTexture.png",
       "idiom" : "universal",
-      "filename" : "yellow_boxCheckmark.png",
       "scale" : "1x"
     },
     {
+      "filename" : "BaseTexture-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "BaseTexture-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "goldLettering.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "goldLettering-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "goldLettering-2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "goldWarsName.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "goldWarsName-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "goldWarsName-2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "warsLettering.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "warsLettering-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "warsLettering-2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Backgorund.png",
+      "filename" : "winner.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Background@2x.png",
+      "filename" : "winner-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Background@3x.png",
+      "filename" : "winner-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/atk_button.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
+      "filename" : "atk_button.png",
       "idiom" : "universal",
-      "filename" : "yellow_cross.png",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/def_button.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
+      "filename" : "def_button.png",
       "idiom" : "universal",
-      "filename" : "yellow_panel.png",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/spy_button.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "spy_button.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Credits.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Credits.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBasen.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "RulesBasen.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBoost.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "RulesBoost.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesEinheiten.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
+      "filename" : "RulesEinheiten.png",
       "idiom" : "universal",
-      "filename" : "yellow_boxCross.png",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }