S1 - T5 feature/enemies #49
Merged
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
projectiles are now removed on collsion with the player
NPC factory refactor PhysicsMovementComponent addition from base entity to child entities
NPC factory refactor PhysicsMovementComponent addition from base entity to child entities
…d in a .json file.
…factory refactor PhysicsMovementComponent addition from base entity to child entities
…/2021-studio-6 into S1T5-Task/Large-Enemy
…d the methods relating to ghost and ghost king to clean up the code.
added a distance based bullet AI task
…der task to distance bullet fire task
…ge with feature branch. Added basic animation with placeholder sprite using atlas files and spritesheets
…of the large enemy.
|
Might be worth pulling main into your feature branch first and solving the conflicts locally before creating a pull request I believe. Just had a look at your commits, main hasn't been merged into your feature branch since we started working on the project. |
|
Enemies seem to work well, I like that they all look distinct so that it is easy to tell them apart. As other comments have mentioned: should add a description and fix merge conflicts before merging the pull request. |
Bluehalomango
approved these changes
Sep 1, 2021
|
There's some quite bad breaking changes with merging this branch with the current main branch (mainly our interactions with the player) going to fix them in this merge! |
integrated playerattack with enemies, increased speed of player bullets (for fun!)
increased speed of player bullets
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.
Enemies Feature, at a glance
3 enemies added:
Long Range,Small enemy,Large enemyfiles added:
BulletFactory: for creating bulletsBulletCollider: collider component for bulletsDistanceFireBulletTask: ai task 'fire bullet at enemy within a certain radius'FireBulletTask: simpler implementation ofDistanceFireBulletTaskFireBulletListener: component for listening to the aiFireBulletTask'sfiles Changed:
NPCFactory: Extensive changes, added factories for the 3 enemiesForestGameArea: added spawning functions for the 3 enemiesTextureRenderComponent: changeddrawfunction to add rotation capability to texture componentsPhysicsEngine: changed how physics bodies are being destroyed (the game will crash without this)ColliderComponentadd to comment out the destruction of fixturesFor reasoning behind these last two changes refer to this issue on the game engine UQdeco2800/game-engine#8
also added all assets for the enemies
note: going to keep T5 but it really should be T3, you can blame @yourlow for this tragedy