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 7 tower extension #213

Merged
merged 39 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
685341e
added FireworksTower config
ThivanW Oct 1, 2023
aff253f
Added FireworksTowerCombatTask
ThivanW Oct 1, 2023
3833226
Added all components apart from animations to the FireworksTower
ThivanW Oct 1, 2023
a0a26c4
Added PierceTower to TowerFactory
ThivanW Oct 1, 2023
0386c95
Added ricochet tower and made modifications to pierce and fireworks t…
ThivanW Oct 1, 2023
cacf4fc
made the tower fireworks from created to working state the tower is c…
karthikeya-v Oct 1, 2023
b519f89
created a new tower code for a health tower(experimenting)
karthikeya-v Oct 1, 2023
aa4bec5
added attackRate and incomeRate variables for the ui team to use in t…
karthikeya-v Oct 2, 2023
12412ce
Added Fireworks Tower Combat Task Test
ThivanW Oct 2, 2023
0ca893e
Added Pierce Tower Combat Task Test
ThivanW Oct 2, 2023
3984d3b
Added Ricochet Tower Combat Task Test
ThivanW Oct 2, 2023
9c4fd94
removed charge states for the fireworks tower combat task
ThivanW Oct 2, 2023
fd11f32
Added Bombship Movement Task
Vishal-jodd Oct 2, 2023
9675d4b
Added Wait Task for the bombship
Vishal-jodd Oct 2, 2023
705ddcb
Added the Animation Controller for the Bombship
Vishal-jodd Oct 2, 2023
c0a28ab
changed some code regarding atlas files and animations
karthikeya-v Oct 2, 2023
6d4e561
created walltowerdestructiontask and the wall towers or barricades ar…
karthikeya-v Oct 2, 2023
c42b661
Added the combat task for the bombship
Vishal-jodd Oct 2, 2023
5af5a14
Added the Bombship Wander Task
Vishal-jodd Oct 2, 2023
7ec9e42
implemented the animations and working for the PierceTower
karthikeya-v Oct 2, 2023
dd5ccbb
Added the ricochetTower and fine tuned the animations for the wall to…
karthikeya-v Oct 2, 2023
b3c67a1
changed the barrier or wallTower atlas file contents
karthikeya-v Oct 2, 2023
2a40dd9
fixed wall tower animation being played on reverse
ThivanW Oct 2, 2023
4005c46
Fixed merge conflicts
ThivanW Oct 2, 2023
2e52c80
Added targets to combat task , the targets are boss and mob
Vishal-jodd Oct 2, 2023
a93747b
changed the projectile used by the fireworks tower
ThivanW Oct 2, 2023
915648f
Added the Config class
Vishal-jodd Oct 3, 2023
81216ce
Merge remote-tracking branch 'origin/Team-7--Tower-Extension' into Te…
Vishal-jodd Oct 3, 2023
a72ad50
fixed merge issues and readded fireworks tower combat task test
ThivanW Oct 3, 2023
1750b40
Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse32…
ThivanW Oct 3, 2023
8e3585d
Added the config classes and also cleared errors
Vishal-jodd Oct 3, 2023
07ee863
Merge remote-tracking branch 'origin/Team-7--Tower-Extension' into Te…
Vishal-jodd Oct 3, 2023
102a537
Added spawn , but its working
Vishal-jodd Oct 3, 2023
206d181
Changes the combat logic and is not working
Vishal-jodd Oct 3, 2023
0b9ec9e
Merge branch 'main' into Team-7--Tower-Extension
ThivanW Oct 3, 2023
ee863ce
No other tower in the same lane
DevenBhasin Oct 3, 2023
746ef5b
Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse32…
DevenBhasin Oct 3, 2023
6aaa551
Added temporary fix to prevent updating of new towers
Hasakev Oct 3, 2023
a7c20a7
Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse32…
Hasakev Oct 3, 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
6 changes: 6 additions & 0 deletions source/core/assets/configs/Bombship.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"Bombship" : {
"health": 100,
"baseAttack": 20
}
}
89 changes: 89 additions & 0 deletions source/core/assets/images/bombship/bombship.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
bombship.png
size: 32, 286
format: RGBA8888
filter: Linear,Linear
repeat: none
destroy
rotate: false
xy: 0, 0
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
destroy
rotate: false
xy: 0, 32
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
destroy
rotate: false
xy: 0, 64
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
destroy
rotate: false
xy: 0, 96
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
destroy
rotate: false
xy: 0, 128
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
default
rotate: false
xy: 0, 160
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
idle
rotate: false
xy: 0, 160
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
idle
rotate: false
xy: 0, 181
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
idle
rotate: false
xy: 0, 202
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
start
rotate: false
xy: 0, 223
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
start
rotate: false
xy: 0, 244
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
start
rotate: false
xy: 0, 265
size: 26, 21
orig: 26, 21
offset: 0, 0
index: -1
Binary file added source/core/assets/images/bombship/bombship.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
299 changes: 299 additions & 0 deletions source/core/assets/images/towers/PierceTower.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
PierceTower.png
size: 896, 192
format: RGBA8888
filter: Linear,Linear
repeat: none
Attack
rotate: false
xy: 0, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 64, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 128, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 192, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 256, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 320, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 384, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 448, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 512, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 576, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 640, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 704, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 768, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 832, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 0, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 64, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 128, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 192, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 256, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 320, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 384, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 448, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 512, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 576, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 640, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 704, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 768, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 832, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 0, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 64, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 128, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 192, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 256, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 320, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 384, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Default
rotate: false
xy: 256, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 448, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 512, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 576, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 640, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 704, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 768, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Binary file added source/core/assets/images/towers/PierceTower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading