Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team 2 towers #126

Merged
merged 45 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0dddd12
Created new TowerUpgraderComponent class, which listens for an event …
AlasdairS4698737 Aug 31, 2023
9cde24a
Added capabilty for TowerUpgraderComponent to increase the the base a…
AlasdairS4698737 Aug 31, 2023
0d189ca
Merge branch 'main' into Team-2--Alasdair-Branch
AlasdairS4698737 Sep 1, 2023
98c3dc5
Fixed filename typo
AlasdairS4698737 Sep 3, 2023
c75f782
Implemented the upgrading of a tower's max health, including changes …
AlasdairS4698737 Sep 3, 2023
051b6b2
added new methods and config files for tower1 and tower2
shiv-0831 Sep 4, 2023
71079ee
Added the modified files
shiv-0831 Sep 4, 2023
75f49a8
Created TNTTowerConfigs to store configuration for TNTTower and modif…
Mohamad11Dab Sep 5, 2023
a939d24
Created the TNTTower entity in the TowerFactory class
Mohamad11Dab Sep 5, 2023
3ebc055
renamed tower1 to fireTower and tower2 with stunTower in relevant files
shiv-0831 Sep 6, 2023
82715be
Added fire rate upgrade functionality to TowerUpgraderComponent, also…
AlasdairS4698737 Sep 6, 2023
705c3e2
TowerUpgraderComponent is now added to tower entities when they are c…
AlasdairS4698737 Sep 6, 2023
23d4e6e
Added repair capability to TowerUpgraderComponent
AlasdairS4698737 Sep 6, 2023
c8f319d
Merge branch 'main' into Shivam-Tower
shiv-0831 Sep 6, 2023
5207c70
Added png and atlas file for TNT_Tower
Mohamad11Dab Sep 6, 2023
ec9dee7
Added listeners for TNT_Tower animations in TNTAnimationController
Mohamad11Dab Sep 6, 2023
6fb7ebe
Added AIComponent and AnimationRenderComponent to TNT_Tower
Mohamad11Dab Sep 6, 2023
b05f088
Added a function to PhysicsMovementComponent which pauses the update …
Mohamad11Dab Sep 6, 2023
b095e08
Implemented the AOE effect for TNTTower but can still be used for oth…
Mohamad11Dab Sep 6, 2023
d2ddb2d
The TNTTowerCombatTask runs the AI for the TNTTower class. It has a b…
Mohamad11Dab Sep 6, 2023
3ec0494
Spawned TNT_Tower in ForestGameArea and added the flag in the update …
Mohamad11Dab Sep 6, 2023
4169819
Merge pull request #97 from UQcsse3200/Team-2--Alasdair-Branch
The-AhmadAA Sep 6, 2023
f56ca5f
Fixed the dispose functionality. I also had to comment out atlas.disp…
Mohamad11Dab Sep 7, 2023
0b5452e
fixed bug (#104)
Mohamad11Dab Sep 7, 2023
e46afce
created the FireTowerAnimationController, FireTowerCombatTask and com…
shiv-0831 Sep 7, 2023
4bbef11
Added files StunTowerCombatTask, StunTowerAnimationController, stun_t…
shiv-0831 Sep 7, 2023
bfee942
Added the png and atlas file for the DroidTower
Mohamad11Dab Sep 7, 2023
d7870fd
Added all the configurations for the DroidTower
Mohamad11Dab Sep 7, 2023
1863d80
Created the DroidTower entity and added some of the components to it
Mohamad11Dab Sep 7, 2023
71e40d4
Created the DroidAnimationController which listens to events relevant…
Mohamad11Dab Sep 7, 2023
406027b
Averts divide by zero edge case if a tower's firerate is reduced to 0…
AlasdairS4698737 Sep 8, 2023
bd6a871
TowerUpgraderComponent is a component of all tower entities, rather t…
AlasdairS4698737 Sep 8, 2023
0afcd0c
Update TowerCombatTask.java
The-AhmadAA Sep 8, 2023
5549e12
Update TowerUpgraderComponentTest.java
The-AhmadAA Sep 8, 2023
bfc1018
Merge pull request #117 from UQcsse3200/Team-2--Alasdair-Branch
The-AhmadAA Sep 8, 2023
4441a3b
Corrected animation lengths for fireTowers and stunTowers.
shiv-0831 Sep 8, 2023
5447fa5
resoved merge conflict with Team-2--Towers
shiv-0831 Sep 8, 2023
2a1b8e8
Added javadocs to StunTowerAnimationController, FireTowerAnimationCon…
shiv-0831 Sep 8, 2023
ea1063c
Merge pull request #119 from UQcsse3200/Shivam-Tower
The-AhmadAA Sep 8, 2023
46da325
Adjusted the TNT effect so that it only affects target on the same lane
Mohamad11Dab Sep 8, 2023
490cfdf
Added the combat task for Droid tower which triggers animations accor…
Mohamad11Dab Sep 8, 2023
8e804de
Added components to the Droid tower
Mohamad11Dab Sep 8, 2023
7ca10b5
Spawned Droid Tower to the game
Mohamad11Dab Sep 8, 2023
7eff3d7
fixed merge conflicts with Team-2--Towers
Mohamad11Dab Sep 8, 2023
105f823
Merge pull request #120 from UQcsse3200/Mohamad-Tower
The-AhmadAA Sep 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,26 @@
"health": 20,
"baseAttack": 0,
"cost": 1
},
"TNTTower": {
"health": 10,
"baseAttack": 5,
"cost": 1
},
"DroidTower": {
"health": 10,
"baseAttack": 5,
"cost": 1
},
"fireTower": {
"health": 10,
"baseAttack": 10,
"cost": 10
},
"stunTower": {
"health": 10,
"baseAttack": 10,
"cost": 10

}
}
251 changes: 251 additions & 0 deletions source/core/assets/images/towers/DroidTower.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@

DroidTower.png
size: 1024, 64
format: RGBA8888
filter: Nearest, Nearest
repeat: none
attackDown
rotate: false
xy: 72, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 4
attackDown
rotate: false
xy: 212, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
attackDown
rotate: false
xy: 457, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
attackDown
rotate: false
xy: 597, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
attackDown
rotate: false
xy: 737, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
attackUp
rotate: false
xy: 247, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
attackUp
rotate: false
xy: 422, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
attackUp
rotate: false
xy: 422, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 4
death
rotate: false
xy: 422, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
idle
rotate: false
xy: 422, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
attackUp
rotate: false
xy: 632, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
attackUp
rotate: false
xy: 842, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
death
rotate: false
xy: 2, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
death
rotate: false
xy: 177, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 6
death
rotate: false
xy: 387, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 8
death
rotate: false
xy: 527, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 5
death
rotate: false
xy: 702, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 7
goDown
rotate: false
xy: 37, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
death
rotate: false
xy: 37, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
goUp
rotate: false
xy: 37, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
goDown
rotate: false
xy: 282, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
goUp
rotate: false
xy: 282, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
goDown
rotate: false
xy: 562, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 5
goDown
rotate: false
xy: 772, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 4
goUp
rotate: false
xy: 142, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
death
rotate: false
xy: 142, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 4
goDown
rotate: false
xy: 142, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
goUp
rotate: false
xy: 352, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
death
rotate: false
xy: 352, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
goDown
rotate: false
xy: 352, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
walk
rotate: false
xy: 107, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 1
walk
rotate: false
xy: 317, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 3
walk
rotate: false
xy: 492, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 0
walk
rotate: false
xy: 667, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 2
walk
rotate: false
xy: 807, 2
size: 33, 38
orig: 33, 38
offset: 0, 0
index: 4
Binary file added source/core/assets/images/towers/DroidTower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions source/core/assets/images/towers/TNTTower.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@

TNTTower.png
size: 1024, 128
format: RGBA8888
filter: Nearest, Nearest
repeat: none
default
rotate: false
xy: 773, 104
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 0
dig
rotate: false
xy: 2, 21
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 4
dig
rotate: false
xy: 751, 104
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 1
dig
rotate: false
xy: 2, 2
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 3
dig
rotate: false
xy: 24, 21
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 0
dig
rotate: false
xy: 751, 85
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 5
dig
rotate: false
xy: 24, 2
size: 20, 17
orig: 20, 17
offset: 0, 0
index: 2
explode
rotate: false
xy: 2, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 2
explode
rotate: false
xy: 109, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 4
explode
rotate: false
xy: 216, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 1
explode
rotate: false
xy: 323, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 6
explode
rotate: false
xy: 430, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 3
explode
rotate: false
xy: 537, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 0
explode
rotate: false
xy: 644, 40
size: 105, 81
orig: 105, 81
offset: 0, 0
index: 5
Binary file added source/core/assets/images/towers/TNTTower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading