Merge pull request #29 from Vanessamae23/main

Add tower card
cs3217-2324 · Mar 23, 2024 · 5a21737 · 5a21737
2 parents 135e29e + b4a07a3
commit 5a21737
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 4 deletions.
diff --git a/...proj/project.xcworkspace/xcuserdata/macbookpro.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/macbookpro.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TowerForge/TowerForge/Assets.xcassets/arrowTower.imageset/Contents.json b/TowerForge/TowerForge/Assets.xcassets/arrowTower.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "arrowTower.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TowerForge/TowerForge/Assets.xcassets/arrowTower.imageset/arrowTower.png b/TowerForge/TowerForge/Assets.xcassets/arrowTower.imageset/arrowTower.png
diff --git a/TowerForge/TowerForge/LevelManager/Components/HomeComponent.swift b/TowerForge/TowerForge/LevelManager/Components/HomeComponent.swift
@@ -12,7 +12,8 @@ class HomeComponent: TFComponent {
     var lifeLeft: Int {
         didSet {
             // Update the life left in the LabelComponent when it changes
-            guard let labelComponent = entity?.component(ofType: LabelComponent.self), labelComponent.name == "life" else {
+            guard let labelComponent = entity?.component(ofType: LabelComponent.self),
+                  labelComponent.name == "life" else {
                 return
             }
             labelComponent.changeText(String(lifeLeft))
@@ -21,7 +22,8 @@ class HomeComponent: TFComponent {
     var points = 0 {
         didSet {
             // Update the points in the LabelComponent when it changes
-            guard let labelComponent = entity?.component(ofType: LabelComponent.self), labelComponent.name == "point" else {
+            guard let labelComponent = entity?.component(ofType: LabelComponent.self),
+                  labelComponent.name == "point" else {
                 return
             }
             labelComponent.changeText(String(points))

diff --git a/TowerForge/TowerForge/LevelManager/Entities/Base Entities/BaseTower.swift b/TowerForge/TowerForge/LevelManager/Entities/Base Entities/BaseTower.swift
@@ -16,8 +16,8 @@ class BaseTower: TFEntity {
          player: Player) {
         super.init()
 
-        createHealthComponent(maxHealth: maxHealth)
         createSpriteComponent(textureNames: textureNames, size: size, key: key, position: position)
+        createHealthComponent(maxHealth: maxHealth)
         createPositionComponent(position: position)
         createPlayerComponent(player: player)
     }

diff --git a/TowerForge/TowerForge/LevelManager/Entities/SpawnableEntities.swift b/TowerForge/TowerForge/LevelManager/Entities/SpawnableEntities.swift
@@ -8,5 +8,10 @@
 import Foundation
 
 struct SpawnableEntities {
-    static let playerSpawnableEntities: [(TFEntity & PlayerSpawnable).Type] = [MeleeUnit.self, SoldierUnit.self]
+    static let playerSpawnableEntities: [(TFEntity & PlayerSpawnable).Type] =
+    [
+        MeleeUnit.self,
+        SoldierUnit.self,
+        ArrowTower.self
+    ]
 }