Merge branch '45-validierung-kommerzieller-assets' into 'development'

Resolve "Validierung kommerzieller Assets"

Closes #45

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

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

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

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

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "logo_kante.jpg",
+      "filename" : "Base_2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "logo_kante-1.jpg",
+      "filename" : "Base_2-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "logo_kante-2.jpg",
+      "filename" : "Base_2-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

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

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

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

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

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

GoldWars/GoldWars/Components/DefaultBaseComponent.swift

@@ -15,7 +15,7 @@ class DefaultBaseComponent: GKComponent {
     var labelNode : SKLabelNode
     
     init(texture: SKTexture, position: CGPoint) {
-        spriteNode = BaseNode(texture: texture, size: CGSize(width: 80, height: 80))
+        spriteNode = BaseNode(texture: texture, size: CGSize(width: 100, height: 100))
         spriteNode.position = position
         spriteNode.zPosition = 2
         labelNode = SKLabelNode(text: "")

GoldWars/GoldWars/Entities/Base.swift

@@ -32,7 +32,7 @@ class Base: GKEntity{
         super.init()
         
         let spritePos = position
-        addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: spritePos))
+        addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "BaseTexture"), position: spritePos))
         if(team != nil && player != nil){
             addComponent(TeamComponent(team: team!, player: player!, position: spritePos))
             self.unitCount = 500

GoldWars/GoldWars/Entities/Modal.swift

@@ -28,14 +28,14 @@ class Modal: GKEntity{
         
         let texture = SKTexture(imageNamed:"ModalBackground")
         background = SKSpriteNode(texture: texture, size: texture.size())
-        background.setScale(2)
+        background.setScale(2.4)
         background.position = anchorPoint
         background.zPosition = 3
         
-        closeButton = ButtonNode(textureName: "yellow_cross", text: "", isEnabled: true, position: CGPoint(x: anchorPoint.x + 160, y: anchorPoint.y + 140), onButtonPress: {
+        closeButton = ButtonNode(textureName: "red_cross", text: "", isEnabled: true, position: CGPoint(x: anchorPoint.x + 195, y: anchorPoint.y + 178), onButtonPress: {
             EntityManager.gameEMInstance.removeModal()
         })
-        closeButton.size = CGSize(width: 30, height: 30)
+        closeButton.size = CGSize(width: 26, height: 26)
         closeButton.zPosition = 4
         
         
@@ -50,7 +50,7 @@ class Modal: GKEntity{
             footer = SKLabelNode()
         }
         
-        self.header.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y + 125)
+        self.header.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y + 90)
         self.header.fontName = "HelveticaNeue-Bold"
         self.header.fontSize = 40
         self.header.zPosition = 4
@@ -72,12 +72,12 @@ class Modal: GKEntity{
         
         switch modaltype{
         case .BaseDetails:
-            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Zurück", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 120), isEnabled: true, onButtonPress: {
+            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Zurück", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 105), isEnabled: true, onButtonPress: {
                 EntityManager.gameEMInstance.removeModal()
             }))
         case .BaseAttack:
             addComponent(SliderComponent(width: 300, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 50)))
-            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Senden", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 120), isEnabled: true, onButtonPress: {
+            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Senden", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 105), isEnabled: true, onButtonPress: {
                 self.sendUnits(currentDraggedBase: currentDraggedBase, touchLocation: touchLocation, gameScene: gameScene, collisionBase: collisionBase)
                 EntityManager.gameEMInstance.removeModal()
             }))

GoldWars/GoldWars/SettingsScene.swift

@@ -39,7 +39,7 @@ class SettingsScene: SKScene {
                                     }
         }))
         entityManager.add(Button(name: "StopMovingBackground",
-                                 textureName: "",
+                                 textureName: "yellow_button04",
                                  text: "MOVE/STOP",
                                  position: CGPoint(x: self.size.width * 0.6, y: self.size.height / 2 - 100),
                                  onButtonPress: {