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 1 New Fire mobs and mob bug fixes #266

Merged
merged 21 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
de0dcbd
created effect component and added it to all factories
gregchan550 Oct 13, 2023
5d80561
added projectile effects component
gregchan550 Oct 13, 2023
033694d
Add various mobtypes with splitmoblings component
freshc0w Oct 13, 2023
67ecbce
Merge branch 'main' into Team-1-Mobs-Enhancement-variations
MiniSoda17 Oct 14, 2023
40f8661
Added fireWizard, splitRocky and necromanser to NPCFactory
cindyle1 Oct 14, 2023
300e240
Merge branch 'Team-1-Mobs-Enhancement-variations' of github.com:UQcss…
cindyle1 Oct 14, 2023
36d4413
Fixed merge conflict errors with split
cindyle1 Oct 14, 2023
66719bf
Added bow and arrow sound
MiniSoda17 Oct 14, 2023
70685f9
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 14, 2023
27677df
Alter dodging functionality so other tasks can be run simultaneously
freshc0w Oct 14, 2023
1c3a72a
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
freshc0w Oct 14, 2023
f4b9a7c
Added new fire mobs to waves
MiniSoda17 Oct 14, 2023
264c5d6
Fix moblings boundaries
freshc0w Oct 15, 2023
7b0d4c5
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 15, 2023
aedd08a
Merge branch 'main' into Team-1-Mobs-Enhancement-variations
MiniSoda17 Oct 15, 2023
a35c44d
Fixing Junit testing for mobs
MiniSoda17 Oct 15, 2023
3143751
Added new mobs to new wave structure
MiniSoda17 Oct 15, 2023
23cf562
Removing accidental error logs previously added
MiniSoda17 Oct 15, 2023
2a4e2b4
refactor: Removed some code smells.
JSLLW Oct 15, 2023
1856c3c
refactor: Resolved code smells.
JSLLW Oct 15, 2023
b6a7afe
test: Resolved failing tests in EnemyTest.
JSLLW Oct 15, 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
160 changes: 160 additions & 0 deletions source/core/assets/images/mobs/firewizard.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@

firewizard.png
size: 2048, 128
format: RGBA8888
filter: Nearest, Nearest
repeat: none
firewizard_attack
rotate: false
xy: 492, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 296, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 2, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 394, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 198, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 688, 11
size: 96, 69
orig: 96, 69
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 590, 11
size: 96, 69
orig: 96, 69
offset: 0, 0
index: -1
firewizard_attack
rotate: false
xy: 100, 8
size: 96, 72
orig: 96, 72
offset: 0, 0
index: -1
firewizard_death
rotate: false
xy: 1389, 16
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
firewizard_death
rotate: false
xy: 1521, 16
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
firewizard_death
rotate: false
xy: 1323, 16
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
firewizard_death
rotate: false
xy: 1587, 16
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
firewizard_death
rotate: false
xy: 1455, 16
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 1189, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 988, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_mov
rotate: false
xy: 786, 2
size: 66, 78
orig: 66, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 1122, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 921, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 1256, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 1055, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
firewizard_move
rotate: false
xy: 854, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
default
rotate: false
xy: 854, 2
size: 65, 78
orig: 65, 78
offset: 0, 0
index: -1
Binary file added source/core/assets/images/mobs/firewizard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
167 changes: 167 additions & 0 deletions source/core/assets/images/mobs/necromancer.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@

necromancer.png
size: 2048, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: none
necromancer_attack
rotate: false
xy: 304, 5
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 1558, 116
size: 70, 110
orig: 70, 110
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 1702, 121
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 1630, 121
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 1774, 121
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 160, 5
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 88, 5
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 232, 5
size: 70, 105
orig: 70, 105
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 2, 112
size: 1554, 114
orig: 1554, 114
offset: 0, 0
index: -1
necromancer_attack
rotate: false
xy: 2, 2
size: 84, 108
orig: 84, 108
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 601, 37
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 451, 37
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 376, 37
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 526, 37
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 1921, 153
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_death
rotate: false
xy: 1846, 153
size: 73, 73
orig: 73, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 676, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 960, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 818, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 1031, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 889, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
necromancer_walk
rotate: false
xy: 747, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
default
rotate: false
xy: 747, 37
size: 69, 73
orig: 69, 73
offset: 0, 0
index: -1
Binary file added source/core/assets/images/mobs/necromancer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading