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

Updated comments #45

Merged
merged 39 commits into from
Aug 25, 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
2a9f37a
updated readme for individual branch (sub-branch of team-2)
The-AhmadAA Aug 16, 2023
db7e7fe
updated readme for team 2
The-AhmadAA Aug 18, 2023
79f29c3
Added TowerFactory class
Mohamad11Dab Aug 18, 2023
5c27158
Implemented CostComponent for entities that necessitate a cost
Mohamad11Dab Aug 18, 2023
91c121c
Added empty files baseTowerConfigs and tower.json
Mohamad11Dab Aug 18, 2023
ff7cfc1
Added comments in TowerFactory
Mohamad11Dab Aug 18, 2023
b680796
added static sprite and spritesheet for graphics development
The-AhmadAA Aug 19, 2023
55d0f47
changed tree texture into turret texture
The-AhmadAA Aug 19, 2023
95c142b
added skeleton JUnit files for Tower graphics specific rendering testing
The-AhmadAA Aug 19, 2023
c6b9ca2
merged changes from Mohamad-Tower-state into Tower-Graphics branch to…
The-AhmadAA Aug 19, 2023
d18aca6
Added JUnit tests for TowerFactoryTest and CostComponentTest
Mohamad11Dab Aug 20, 2023
c1e4c0e
Added Configurations for WallTower and WeaponTower entities
Mohamad11Dab Aug 22, 2023
12064f0
Implemented WeaponTower and WallTower in TowerFactory
Mohamad11Dab Aug 22, 2023
925e86f
Added new JUnit tests in TowerFactoryTest
Mohamad11Dab Aug 22, 2023
18f435d
added turret (weapon tower) animation assets
The-AhmadAA Aug 22, 2023
97e4d12
modified animation atlas files to animate
The-AhmadAA Aug 22, 2023
ea0a7a4
configured ghosts to appear as towers and animate
The-AhmadAA Aug 22, 2023
a478674
Test has bug
AlasdairS4698737 Aug 23, 2023
a165843
Added Tower animation controller class
The-AhmadAA Aug 23, 2023
9c8c156
added updated tower deployment assets
The-AhmadAA Aug 23, 2023
96e2f0e
modified atlas file to include all animations
The-AhmadAA Aug 24, 2023
e3a9202
asset update
The-AhmadAA Aug 24, 2023
48528c7
modified TowerFactory with AiTaskComponent and AnimationRenderCompone…
The-AhmadAA Aug 24, 2023
fa94aaf
created TowerAnimationController class
The-AhmadAA Aug 24, 2023
5f1e1a7
modified ForestGameArea for testing, added TowerCombatTask and TowerI…
The-AhmadAA Aug 24, 2023
c1fff29
Built tower idle and combat tasks
The-AhmadAA Aug 24, 2023
23cebb2
updated the TowerFactory to add animator and aiTask components
The-AhmadAA Aug 24, 2023
97cea2d
fixed some naming
The-AhmadAA Aug 24, 2023
b9cec11
restored ghost functionality to focus on dedicated turret classes
The-AhmadAA Aug 24, 2023
f1ca47d
duplicated assets for troubleshooting
The-AhmadAA Aug 24, 2023
2cef542
More adjustments to animation and tower ai for troubleshooting.
The-AhmadAA Aug 24, 2023
4fe7ac6
Fixed bug in PopupMenuComponent that caused its override method to be…
AlasdairS4698737 Aug 24, 2023
f1d773a
fixed animation and event triggering in TowerCombatTask, removed Towe…
The-AhmadAA Aug 25, 2023
b44a783
fixed TowerFactory JUnit test 'asset not loaded' error
The-AhmadAA Aug 25, 2023
9ab82c1
Merge pull request #42 from UQcsse3200/Team-2--Alasdair-Branch
The-AhmadAA Aug 25, 2023
d06363b
Merge branch 'Team-2--Towers' into Tower-Graphics
Mohamad11Dab Aug 25, 2023
7dd76bb
Merge pull request #43 from UQcsse3200/Tower-Graphics
Mohamad11Dab Aug 25, 2023
3d2f6cb
fixed merge conflict
The-AhmadAA Aug 25, 2023
b2e61b8
updated comments
The-AhmadAA Aug 25, 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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ You are welcome to use the game engine for your own purposes. It is released und

- [JavaDoc](https://uqcsse3200.github.io/2023-studio-3/)
- [SonarCloud](https://sonarcloud.io/project/overview?id=UQcsse3200_2023-studio-3)


## Team 2 - Tower Branch

Implements defense towers in the Outworld Outposts game. Any questions or discussion, please contact Team 2
12 changes: 12 additions & 0 deletions source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"weapon": {
"health": 10,
"baseAttack": 10,
"cost": 10
},
"wall": {
"health": 20,
"baseAttack": 0,
"cost": 5
}
}
160 changes: 160 additions & 0 deletions source/core/assets/images/turret.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@

turret.png
size: 256, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: xy
deploy
rotate: false
xy: 20, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 140, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 20
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
default
rotate: false
xy: 20, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
firing
rotate: false
xy: 200, 195
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
firing
rotate: false
xy: 140, 81
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
firing
rotate: false
xy: 80, 24
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
idle
rotate: false
xy: 140, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
idle
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 140, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 20
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
Binary file added source/core/assets/images/turret.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
160 changes: 160 additions & 0 deletions source/core/assets/images/turret01.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@

turret01.png
size: 256, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: xy
deploy
rotate: false
xy: 20, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 140, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 20
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 80, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
firing
rotate: false
xy: 200, 195
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
firing
rotate: false
xy: 140, 81
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
firing
rotate: false
xy: 80, 24
size: 35, 33
orig: 35, 33
offset: 0, 0
index: -1
idle
rotate: false
xy: 140, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
idle
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
deploy
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
default
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 140, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 20
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 77
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 80, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 191
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
stow
rotate: false
xy: 20, 134
size: 40, 37
orig: 40, 37
offset: 0, 0
index: -1
Binary file added source/core/assets/images/turret01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/turret_deployed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading