Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Add turret ability and dash to space bar#26

Merged
lvocanson merged 13 commits intomainfrom
ft/turret
Dec 19, 2023
Merged

Add turret ability and dash to space bar#26
lvocanson merged 13 commits intomainfrom
ft/turret

Conversation

@generaltoto
Copy link
Copy Markdown
Collaborator

No description provided.

- Add turret prefab with state machine and 3 states : seek, attack and destroy
- Add collider for turret range with List of targets in sight
- On Seek state, turret rotate
- Add ObjectPool for turret shoot
#WIP : Need to finish turret attack and implement turret destroy
- Add target switch for turret
# Conflicts:
#	Assets/If Simulator/Code/Scripts/Entity/Player/Ability/List/PrimaryShoot/AbilityPrimaryShoot.cs
#	Assets/If Simulator/Code/Scripts/Projectiles/Projectile.cs
#	Assets/If Simulator/Prefabs/Entity/Enemies/Marge.prefab
#	Assets/If Simulator/Prefabs/Entity/Player/Player.prefab
#	ProjectSettings/Physics2DSettings.asset
#	ProjectSettings/TagManager.asset
- Fix projectile pool management for player and turret
- Create new Toto scene for test
# Conflicts:
#	Assets/If Simulator/Scenes/BaseLevel.scenetemplate
Copy link
Copy Markdown
Owner

@lvocanson lvocanson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove Scenes/Experimental/Toto/ folder

# Conflicts:
#	Assets/If Simulator/Code/Scripts/Entity/Player/Ability/List/Spells/ShockWaveBehavior.cs
#	Assets/If Simulator/Prefabs/Abilities/Shockwave.prefab
#	Assets/If Simulator/Prefabs/Entity/Enemies/Marge.prefab
#	Assets/If Simulator/Prefabs/Entity/Player/Player.prefab
#	Assets/If Simulator/Prefabs/Level/Door.prefab
#	Assets/If Simulator/Prefabs/Projectiles/Enemies/MargeBullet.prefab
#	Assets/If Simulator/Prefabs/Projectiles/PlayerBullet.prefab
#	ProjectSettings/Physics2DSettings.asset
#	ProjectSettings/TagManager.asset
@lvocanson lvocanson merged commit ae141f4 into main Dec 19, 2023
@lvocanson lvocanson deleted the ft/turret branch December 19, 2023 11:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants