Team 4 general mobs #136
Merged
Team 4 general mobs #136
Conversation
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
… the second xeno melee.
…am-4---General-Mobs---Animations
# 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
…rs to MobAttackTask and MobDeathTask
…obs will now die when shot & drop currency.
…mies & change mob target to HUMANS # Conflicts: # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java # source/core/src/main/com/csse3200/game/components/TouchAttackComponent.java # source/core/src/main/com/csse3200/game/components/tasks/MobAttackTask.java
…r used or maintained.
…-4---General-Mobs
…udio-3 into Team-4---General-Mobs
BlairCannon97
requested review from
Hasakev,
MiniSoda17,
The-AhmadAA and
AlasdairS4698737
The-AhmadAA
approved these changes
Sep 11, 2023
| // GridPoint2 minPos = new GridPoint2(0, 0); | ||
| // GridPoint2 maxPos = new GridPoint2(5, terrain.getMapBounds(0).sub(2, 2).y); | ||
| // GridPoint2 randomPos = RandomUtils.random(minPos, maxPos); | ||
| // |
There was a problem hiding this comment.
Why is this commented out code added here?
| mobPosition = owner.getEntity().getPosition(); | ||
|
|
||
| // If the mob is at zero health, kill the mob, | ||
| // play the death animation and stop the task |
There was a problem hiding this comment.
Thanks for the mention 😄
There was a problem hiding this comment.
Should probably call this a 'MobWanderTask' to make it clear it belongs to mobs, just in case someone else is tempted to modify it.
| Entity npc = | ||
| new Entity() | ||
| .addComponent(new PhysicsComponent()) | ||
| .addComponent(new PhysicsMovementComponent()) | ||
| .addComponent(new ColliderComponent()) | ||
| .addComponent(new HitboxComponent().setLayer(PhysicsLayer.NPC)) | ||
| .addComponent(new TouchAttackComponent(PhysicsLayer.HUMANS, 1.5f)) | ||
| .addComponent(new HitboxComponent().setLayer(PhysicsLayer.XENO)) |
There was a problem hiding this comment.
Probably should announce the existence of a new physical layer so that everyone is aware of it and can modify their code if necessary
There was a problem hiding this comment.
What was the rationale for modifying physics?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added basic functionality and animations to the Xeno Grunt, including death and shooting. Hitboxes have been modified to improve collisions. Waves of Xenos will spawn xenos in increasing numbers.