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) PR to merge Shivam-Tower to main #143

Merged
merged 19 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
"health": 10,
"baseAttack": 10,
"cost": 10

}
}
118 changes: 101 additions & 17 deletions source/core/assets/images/towers/fire_tower_atlas.atlas
Original file line number Diff line number Diff line change
@@ -1,83 +1,167 @@

fire_tower_atlas.png
size: 1024, 64
size: 2048, 64
format: RGBA8888
filter: Nearest, Nearest
repeat: none
attack
rotate: false
xy: 122, 2
xy: 242, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 1
attack
rotate: false
xy: 302, 2
xy: 542, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 3
attack
rotate: false
xy: 422, 2
xy: 782, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 0
attack
rotate: false
xy: 602, 2
xy: 1082, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 2
idle
death
rotate: false
xy: 62, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 1
idle
index: 6
death
rotate: false
xy: 182, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 3
idle
death
rotate: false
xy: 302, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 8
death
rotate: false
xy: 362, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 0
idle
prepAttack
rotate: false
xy: 542, 2
xy: 362, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 1
death
rotate: false
xy: 482, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 5
death
rotate: false
xy: 662, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 11
death
rotate: false
xy: 722, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 2
prep_attack
death
rotate: false
xy: 2, 2
xy: 842, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 7
death
rotate: false
xy: 1022, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 4
death
rotate: false
xy: 1142, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 9
death
rotate: false
xy: 1202, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 10
death
rotate: false
xy: 1262, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 1
idle
rotate: false
xy: 122, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 1
prep_attack
idle
rotate: false
xy: 242, 2
xy: 422, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 3
idle
rotate: false
xy: 602, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 0
prep_attack
idle
rotate: false
xy: 482, 2
xy: 902, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 2
prepAttack
rotate: false
xy: 2, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 2
prepAttack
rotate: false
xy: 962, 2
size: 58, 58
orig: 58, 58
offset: 0, 0
index: 0
Binary file modified source/core/assets/images/towers/fire_tower_atlas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 79 additions & 23 deletions source/core/assets/images/towers/stun_tower.atlas
Original file line number Diff line number Diff line change
@@ -1,118 +1,174 @@

stun_tower.png
size: 1024, 64
size: 256, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: none
attack
rotate: false
xy: 2, 2
xy: 59, 207
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 4
attack
rotate: false
xy: 116, 2
xy: 173, 207
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 9
attack
rotate: false
xy: 173, 2
xy: 2, 160
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 1
attack
rotate: false
xy: 230, 2
xy: 2, 113
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 6
attack
rotate: false
xy: 344, 2
xy: 2, 19
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 3
attack
rotate: false
xy: 458, 2
xy: 116, 160
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 8
attack
rotate: false
xy: 572, 2
xy: 59, 113
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 0
attack
rotate: false
xy: 629, 2
xy: 59, 66
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 5
attack
rotate: false
xy: 743, 2
xy: 116, 113
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 2
attack
rotate: false
xy: 800, 2
xy: 173, 113
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 7
death
rotate: false
xy: 116, 76
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 6
death
rotate: false
xy: 116, 39
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 3
death
rotate: false
xy: 116, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 0
death
rotate: false
xy: 158, 76
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 5
death
rotate: false
xy: 200, 76
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 2
death
rotate: false
xy: 158, 39
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 7
death
rotate: false
xy: 158, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 4
death
rotate: false
xy: 200, 39
size: 40, 35
orig: 40, 35
offset: 0, 0
index: 1
idle
rotate: false
xy: 59, 2
xy: 2, 207
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 1
index: 4
idle
rotate: false
xy: 287, 2
xy: 116, 207
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 3
index: 1
idle
rotate: false
xy: 401, 2
xy: 2, 66
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 0
index: 3
idle
rotate: false
xy: 515, 2
xy: 59, 160
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 5
index: 0
idle
rotate: false
xy: 686, 2
xy: 173, 160
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 2
index: 5
idle
rotate: false
xy: 857, 2
xy: 59, 19
size: 55, 45
orig: 55, 45
offset: 0, 0
index: 4
index: 2
Binary file modified source/core/assets/images/towers/stun_tower.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