Merge branch '91-gold-wars-schriftzug-2' into 'development'

Resolve "Gold Wars Schriftzug"

Closes #91

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

GoldWars/GoldWars/Assets.xcassets/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.xcassets/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.xcassets/gold_button.imageset/Contents.json

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

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

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

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

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

GoldWars/GoldWars/Assets.xcassets/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/Entities/EntityManager.swift

@@ -62,6 +62,8 @@ class EntityManager {
         
         if let spinningLogoEntity = entity as? SpinningLogoEntity {
             scene.addChild(spinningLogoEntity.spinningLogoNode)
+            scene.addChild(spinningLogoEntity.goldLetteringNode)
+            scene.addChild(spinningLogoEntity.warsLetteringNode)
         }
         
         if let wayEntity = entity as? Way {

GoldWars/GoldWars/Entities/SpinningLogoEntity.swift

@@ -12,10 +12,26 @@ import GameplayKit
 class SpinningLogoEntity: GKEntity {
     
     let spinningLogoNode : SpinningLogo3DNode
+    let goldLetteringNode : SKSpriteNode
+    let warsLetteringNode : SKSpriteNode
     
-    init(position: CGPoint) {
+    init(sceneSize size: CGSize) {
         spinningLogoNode = SpinningLogo3DNode()
-        spinningLogoNode.position = position
+        let midX = size.width / 2
+        let midY = size.height / 2
+        goldLetteringNode = SKSpriteNode(texture: SKTexture(imageNamed: "goldLettering"))
+        goldLetteringNode.position = CGPoint(x: midX, y: midY);
+        goldLetteringNode.size = CGSize(width: 675, height: 284)
+        goldLetteringNode.position = CGPoint(x: midX , y: midY + 280);
+        goldLetteringNode.size = CGSize(width: 675, height: 284)
+        
+        warsLetteringNode = SKSpriteNode(texture: SKTexture(imageNamed: "warsLettering"))
+        warsLetteringNode.position = CGPoint(x: midX, y: midY - 300);
+        warsLetteringNode.size = CGSize(width: 700, height: 284)
+        
+        spinningLogoNode.viewportSize = CGSize(width: 200, height: 200)
+        spinningLogoNode.zPosition = goldLetteringNode.zPosition - 1
+        spinningLogoNode.position = CGPoint(x: midX - 65, y: midY + 285);
         super.init()
     }
     

GoldWars/GoldWars/Scenes/MenuScene.swift

@@ -18,9 +18,9 @@ class MenuScene: SKScene {
         let midX = self.size.width / 2
         let midY = self.size.height / 2
         entityManager.add(Button(name: "startGameButton",
-                                 textureName: "yellow_button04",
+                                 textureName: "gold_button_3",
                                  text: "Start Game",
-                                 position: CGPoint(x: midX, y: midY),
+                                 position: CGPoint(x: midX, y: midY + 90),
                                  onButtonPress: {
                                     if CommandLine.arguments.contains("--no-matchmaking") {
                                         self.loadScene(scene: GameScene(size: self.size))
@@ -35,17 +35,17 @@ class MenuScene: SKScene {
                                     }
         }))
         entityManager.add(Button(name: "settingsButton",
-                                 textureName: "yellow_button04",
+                                 textureName: "gold_button_3",
                                  text: "Settings",
-                                 position: CGPoint(x: midX, y: midY - 80 ),
+                                 position: CGPoint(x: midX, y: midY ),
                                  onButtonPress: {
                                     let scene = SettingsScene(size: self.size)
                                     self.loadScene(scene: scene)
         }))
         entityManager.add(Button(name: "gameCenterButton",
-                                 textureName: "yellow_button04",
+                                 textureName: "gold_button_3",
                                  text: "GameCenter",
-                                 position: CGPoint(x: midX, y: midY - 160),
+                                 position: CGPoint(x: midX, y: midY - 90),
                                  onButtonPress: {
                                     if GameCenterManager.isAuthenticated {
                                          GameCenterManager.sharedInstance.presentGameCenter()
@@ -54,7 +54,7 @@ class MenuScene: SKScene {
                                     }
         }))
         entityManager.add(Background(size: self.size))
-        entityManager.add(SpinningLogoEntity(position: CGPoint(x: midX, y: midY + 200)))
+        entityManager.add(SpinningLogoEntity(sceneSize: self.size))
         
         if SoundManager.sharedInstance.isMusicPlaying == false && SoundManager.sharedInstance.isMusicEnabled == true && !CommandLine.arguments.contains("--no-music") && !UserDefaults.standard.bool(forKey: "noMusic"){
             SoundManager.sharedInstance.startMenuMusic()