-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from Vanessamae23/main
Add Wizard and fix position
- Loading branch information
Showing
25 changed files
with
227 additions
and
20 deletions.
There are no files selected for viewing
21 changes: 21 additions & 0 deletions
21
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-0.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "sprite_0.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+11.5 KB
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-0.imageset/sprite_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-1.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "sprite_1.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+11.8 KB
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-1.imageset/sprite_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-2.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "sprite_2.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+11.5 KB
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-2.imageset/sprite_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
TowerForge/Assets.xcassets/Sprites.spriteatlas/Wizard-ball-0.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "wizard-ball0.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+9.55 KB
...rge/Assets.xcassets/Sprites.spriteatlas/Wizard-ball-0.imageset/wizard-ball0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
TowerForge/Assets.xcassets/Sprites.spriteatlas/wizard.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "soldier-frame.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+315 KB
TowerForge/Assets.xcassets/Sprites.spriteatlas/wizard.imageset/soldier-frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+42.8 KB
(110%)
...proj/project.xcworkspace/xcuserdata/macbookpro.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
TowerForge/TowerForge/GameModule/Entities/GameEntities/WizardBall.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // | ||
| // WizardBall.swift | ||
| // TowerForge | ||
| // | ||
| // Created by Vanessa Mae on 31/03/24. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class WizardBall: BaseProjectile { | ||
| static let textureNames: [String] = ["Wizard-ball-0"] | ||
| static let size = CGSize(width: 10, height: 10) | ||
| static let key = "wizard-ball" | ||
| static let damage = 5.0 | ||
| static let attackRate = 1.0 | ||
| static let velocity = CGVector(dx: 100, dy: 0) | ||
|
|
||
| required init(position: CGPoint, player: Player) { | ||
| super.init(textureNames: WizardBall.textureNames, | ||
| size: WizardBall.size, | ||
| key: WizardBall.key, | ||
| position: position, | ||
| player: player, | ||
| velocity: WizardBall.velocity) | ||
| self.addComponent(DamageComponent(attackRate: WizardBall.attackRate, | ||
| attackPower: WizardBall.damage, | ||
| temporary: true)) | ||
| } | ||
|
|
||
| override func collide(with other: any Collidable) -> TFEvent? { | ||
| let superEvent = super.collide(with: other) | ||
| guard let damageComponent = self.component(ofType: DamageComponent.self) else { | ||
| return superEvent | ||
| } | ||
| if let superEvent = superEvent { | ||
| return superEvent.concurrentlyWith(other.collide(with: damageComponent)) | ||
| } | ||
| return other.collide(with: damageComponent) | ||
| } | ||
|
|
||
| override func collide(with healthComponent: HealthComponent) -> TFEvent? { | ||
| guard let damageComponent = self.component(ofType: DamageComponent.self) else { | ||
| return nil | ||
| } | ||
| return damageComponent.damage(healthComponent) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ struct SpawnableEntities { | |
| [ | ||
| MeleeUnit.self, | ||
| SoldierUnit.self, | ||
| WizardUnit.self, | ||
| ArrowTower.self | ||
| ] | ||
| } | ||
36 changes: 36 additions & 0 deletions
36
TowerForge/TowerForge/GameModule/Entities/SpawnableEntities/WizardUnit.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // WizardUnit.swift | ||
| // TowerForge | ||
| // | ||
| // Created by Vanessa Mae on 31/03/24. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class WizardUnit: BaseUnit, PlayerSpawnable { | ||
| static let title: String = "wizard" | ||
| static let textureNames = ["Wizard-0", "Wizard-1", "Wizard-2"] | ||
| static let size = CGSize(width: 100, height: 100) | ||
| static let key = "shoot" | ||
| static let maxHealth = 100.0 | ||
| static let damage = 10.0 | ||
| static var cost = 5 | ||
| static let attackRate = 1.0 | ||
| static let velocity = CGVector(dx: 30.0, dy: 0.0) | ||
| static let range = 400.0 | ||
| static let attackPower = 10.0 | ||
|
|
||
| required init(position: CGPoint, player: Player) { | ||
| super.init(textureNames: WizardUnit.textureNames, | ||
| size: WizardUnit.size, | ||
| key: WizardUnit.key, | ||
| position: position, | ||
| maxHealth: WizardUnit.maxHealth, | ||
| velocity: WizardUnit.velocity, | ||
| player: player) | ||
|
|
||
| self.addComponent(ShootingComponent(fireRate: WizardUnit.attackRate, | ||
| range: WizardUnit.range, | ||
| attackPower: WizardUnit.attackPower, shootingType: WizardBall.self)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.