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 Engineers Feature for Sprint 2 #118

Merged
merged 47 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b13b149
Added EngineerConfig with basic attributes for Engineer Entity.
praneetdhoolia Sep 4, 2023
0e9fb05
Added EngineerConfig for storing basic Engineer entity attributes and…
praneetdhoolia Sep 4, 2023
c6817e9
created skeleton engineer animation controller class
The-AhmadAA Sep 4, 2023
afeb869
added initial engineer assets
The-AhmadAA Sep 5, 2023
3f56d28
added more engineer visual assets, updated animationcontroller
The-AhmadAA Sep 5, 2023
a8ea714
updated engineer visual assets
The-AhmadAA Sep 5, 2023
382f4ae
added firing sounds, update animationController
The-AhmadAA Sep 5, 2023
5663ba6
created Engineer Factory class
The-AhmadAA Sep 5, 2023
aa05c31
created human version of WanderTask with subtasks
The-AhmadAA Sep 5, 2023
000847c
created EngineerConfigs class
The-AhmadAA Sep 5, 2023
6cc7e0e
added Engineers.json config file
The-AhmadAA Sep 5, 2023
081d9b2
Created EngineerCombatTask, modified EngineerFactory to accommodate E…
praneetdhoolia Sep 5, 2023
25ade84
Pulled changes from Ahmad's branch.
praneetdhoolia Sep 5, 2023
81f1d2f
Pulled changes from Ahmad's branch.
praneetdhoolia Sep 5, 2023
443c67a
Testing Engineer Entity
praneetdhoolia Sep 5, 2023
c9a9e91
removed unused sound effects assets, updated comment
The-AhmadAA Sep 6, 2023
9f11e53
added scale constants, updated wanderTask range
The-AhmadAA Sep 6, 2023
962650a
created human specific CombatStatsComponent, and updated references
The-AhmadAA Sep 6, 2023
d5dd3d4
added Override decorator, removed ununsed imports and variables
The-AhmadAA Sep 6, 2023
4ff5b0a
update changes
The-AhmadAA Sep 6, 2023
e3b92aa
Added Shooting Functionality to Engineers.
praneetdhoolia Sep 6, 2023
7a97d53
removed unused imports
The-AhmadAA Sep 6, 2023
9d10e9e
re-enabled checkAndDeleteBodies, Engineers now die
The-AhmadAA Sep 6, 2023
9958c1c
added hit event triggering in hit methods
The-AhmadAA Sep 6, 2023
8317df9
added null checking in checkAndDeleteBodies
The-AhmadAA Sep 6, 2023
27e18c6
modified engineers to take damage and die
The-AhmadAA Sep 6, 2023
354b55f
commented checkAndDeleteBodies out for investigation of alternative a…
The-AhmadAA Sep 6, 2023
7e15eab
Merge pull request #102 from UQcsse3200/main
The-AhmadAA Sep 6, 2023
a7fca4a
Merge remote-tracking branch 'origin/Team-2--Engineers' into Team-2-e…
The-AhmadAA Sep 6, 2023
994758f
Merge pull request #103 from UQcsse3200/Team-2-engineers-ahmad
The-AhmadAA Sep 6, 2023
8ab5f3a
updated PhysicalLayer class with new layers, and updated references i…
The-AhmadAA Sep 7, 2023
5a17e39
updated humanWanderTask and started writing tests
The-AhmadAA Sep 7, 2023
76daacc
merged changes from Team-2--Engineers-Praneet
The-AhmadAA Sep 7, 2023
f95d5d7
modified EngineerCombatTask target scanning and integrated into Human…
The-AhmadAA Sep 7, 2023
5811775
modified EngineerFactory to add integrated HumanWanderTask
The-AhmadAA Sep 7, 2023
fb36e25
modified ProjectileFactory for testing purposes.
The-AhmadAA Sep 7, 2023
120dd79
removed unnecessary target arg in EngineerFactory
The-AhmadAA Sep 7, 2023
bfc544d
added tests to EngineerFactoryTest
The-AhmadAA Sep 8, 2023
b8982f4
merging changes from main into Team-2-engineers-ahmad
The-AhmadAA Sep 8, 2023
a811432
fixed merge conflicts from merging main into Team-2-engineers-ahmad
The-AhmadAA Sep 8, 2023
46ab5d2
Merge pull request #114 from UQcsse3200/Team-2-engineers-ahmad
The-AhmadAA Sep 8, 2023
ca8e48e
minor fixes to human combat tasks to fix missing projectiles
The-AhmadAA Sep 8, 2023
6c17533
added more engineer animations
The-AhmadAA Sep 8, 2023
d198eeb
updated engineer classes to use a new animation and event types
The-AhmadAA Sep 8, 2023
b2d7462
updated ForestGameArea to spawn a fixed number of engineers
The-AhmadAA Sep 8, 2023
7772795
fixes to engineer firing animations
The-AhmadAA Sep 8, 2023
589a59b
updated comments
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
6 changes: 6 additions & 0 deletions source/core/assets/configs/Engineers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"engineer" : {
"health": 100,
"baseAttack": 5
}
}
391 changes: 391 additions & 0 deletions source/core/assets/images/engineers/engineer.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,391 @@

engineer.png
size: 2048, 128
format: RGBA8888
filter: Nearest, Nearest
repeat: none
death
rotate: false
xy: 503, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 6
death
rotate: false
xy: 902, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
death
rotate: false
xy: 1358, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 5
death
rotate: false
xy: 1814, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
death
rotate: false
xy: 454, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
death
rotate: false
xy: 796, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
firing_auto
rotate: false
xy: 25, 80
size: 52, 31
orig: 52, 31
offset: 0, 0
index: 2
firing_auto
rotate: false
xy: 25, 44
size: 52, 31
orig: 52, 31
offset: 0, 0
index: 4
firing_auto
rotate: false
xy: 102, 80
size: 52, 31
orig: 52, 31
offset: 0, 0
index: 1
firing_auto
rotate: false
xy: 25, 8
size: 52, 31
orig: 52, 31
offset: 0, 0
index: 3
firing_single
rotate: false
xy: 102, 42
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 2
firing_single
rotate: false
xy: 179, 78
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 4
firing_single
rotate: false
xy: 249, 78
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 1
firing_single
rotate: false
xy: 319, 78
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 3
firing_single
rotate: false
xy: 343, 40
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 5
hit
rotate: false
xy: 560, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
hit
rotate: false
xy: 1415, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
hit
rotate: false
xy: 511, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
idle_left
rotate: false
xy: 674, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
idle_left
rotate: false
xy: 1130, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
idle_left
rotate: false
xy: 1529, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
idle_left
rotate: false
xy: 102, 5
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
idle_right
rotate: false
xy: 1016, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
idle_right
rotate: false
xy: 1586, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
default
rotate: false
xy: 1928, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
idle_right
rotate: false
xy: 1928, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
idle_right
rotate: false
xy: 568, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
prep
rotate: false
xy: 343, 40
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 4
prep
rotate: false
xy: 853, 41
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 1
prep
rotate: false
xy: 907, 41
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 3
prep
rotate: false
xy: 961, 41
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 2
walk_left
rotate: false
xy: 446, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 6
walk_left
rotate: false
xy: 845, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
walk_left
rotate: false
xy: 959, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 8
walk_left
rotate: false
xy: 1301, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 5
walk_left
rotate: false
xy: 1700, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
walk_left
rotate: false
xy: 1871, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 7
walk_left
rotate: false
xy: 397, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
walk_left
rotate: false
xy: 739, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
walk_prep
rotate: false
xy: 389, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 8
walk_prep
rotate: false
xy: 731, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 5
walk_prep
rotate: false
xy: 1073, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
walk_prep
rotate: false
xy: 1244, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 7
walk_prep
rotate: false
xy: 1643, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
walk_prep
rotate: false
xy: 1985, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
walk_prep
rotate: false
xy: 229, 41
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 6
walk_prep
rotate: false
xy: 625, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
walk_right
rotate: false
xy: 617, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 2
walk_right
rotate: false
xy: 788, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 7
walk_right
rotate: false
xy: 1187, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 4
walk_right
rotate: false
xy: 1472, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 1
walk_right
rotate: false
xy: 1757, 79
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 6
walk_right
rotate: false
xy: 172, 41
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 3
walk_right
rotate: false
xy: 286, 41
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 8
walk_right
rotate: false
xy: 682, 42
size: 52, 32
orig: 32, 32
offset: 0, 0
index: 5
Binary file added source/core/assets/images/engineers/engineer.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 not shown.
Binary file not shown.
Loading
Loading