-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/Team4/integrate-enemies
# Conflicts: # source/core/assets/images/mobs/xenoGruntDeath.atlas # source/core/assets/images/mobs/xenoGruntMeleeAttack.atlas # source/core/assets/images/mobs/xenoGruntRangedAttack.atlas # source/core/assets/images/mobs/xenoGruntRunning.atlas # source/core/assets/images/mobs/xenoGruntRunningDamaged.atlas # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java # source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
- Loading branch information
Showing
82 changed files
with
409 additions
and
63 deletions.
There are no files selected for viewing
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| xeno-grunt-death.png | ||
| size: 1600, 320 | ||
| format: RGBA8888 | ||
| filter: Nearest,Nearest | ||
| repeat: none | ||
| xeno_die | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_die | ||
| rotate: false | ||
| xy: 320, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_die | ||
| rotate: false | ||
| xy: 640, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_die | ||
| rotate: false | ||
| xy: 960, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_die | ||
| rotate: false | ||
| xy: 1280, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 |
117 changes: 117 additions & 0 deletions
117
source/core/assets/images/mobs/xenoGruntMeleeAttack.atlas
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| xeno-grunt-melee-attack.png | ||
| size: 2880, 640 | ||
| format: RGBA8888 | ||
| filter: Nearest,Nearest | ||
| repeat: none | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 320, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 640, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 960, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 1280, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 1600, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 5 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 1920, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 6 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 2240, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 7 | ||
| xeno_melee_1 | ||
| rotate: false | ||
| xy: 2560, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 8 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 0, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 320, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 640, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 960, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 1280, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 1600, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 5 | ||
| xeno_melee_2 | ||
| rotate: false | ||
| xy: 1920, 320 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 6 |
47 changes: 47 additions & 0 deletions
47
source/core/assets/images/mobs/xenoGruntRangedAttack.atlas
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| xeno-grunt-range-attack.png | ||
| size: 2240, 320 | ||
| format: RGBA8888 | ||
| filter: Nearest,Nearest | ||
| repeat: none | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 320, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 640, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 960, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 1280, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 | ||
| xeno_shoot | ||
| rotate: false | ||
| xy: 1600, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| xeno-grunt-run.png | ||
| size: 2560, 320 | ||
| format: RGBA8888 | ||
| filter: Nearest,Nearest | ||
| repeat: none | ||
| xeno_run | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 320, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 640, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 960, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 1280, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 1600, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 5 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 1920, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 6 | ||
| xeno_run | ||
| rotate: false | ||
| xy: 2240, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 7 | ||
| default | ||
| rotate: false | ||
| xy: 2240, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 |
68 changes: 68 additions & 0 deletions
68
source/core/assets/images/mobs/xenoGruntRunningDamaged.atlas
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| xeno-grunt-run-damaged.png | ||
| size: 2560, 320 | ||
| format: RGBA8888 | ||
| filter: Nearest,Nearest | ||
| repeat: none | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 320, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 1 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 640, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 2 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 960, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 3 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 1280, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 4 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 1600, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 5 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 1920, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 6 | ||
| xeno_hurt | ||
| rotate: false | ||
| xy: 2240, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 7 | ||
| default | ||
| rotate: false | ||
| xy: 2240, 0 | ||
| size: 320, 320 | ||
| orig: 320, 320 | ||
| offset: 0, 0 | ||
| index: 0 |
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.