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

Update SpawnEvent and Add ShootingSystem #24

Merged
merged 8 commits into from
Mar 22, 2024

Conversation

zheng-ze
Copy link
Contributor

  • Add all implemented systems into the GameWorld
  • Remove all reference of EntityManager from non Systems and GameWorld
  • Add new Spawnable Protocol to be used in the SpawnEvent
  • Update SpawnEvent to be able to spawn any Spawnable
  • Update Arrow to be Spawnable
  • Update ShootingComponent to spawn an Arrow
  • Add ShootingSystem to update ShootingComponent

@zheng-ze zheng-ze self-assigned this Mar 22, 2024
Vanessamae23
Vanessamae23 previously approved these changes Mar 22, 2024
Copy link
Contributor

@Vanessamae23 Vanessamae23 left a comment

Choose a reason for hiding this comment

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

lgtm

…branch

# Conflicts:
#	TowerForge/TowerForge/Grid.swift
#	TowerForge/TowerForge/LevelManager/Components/AiComponent.swift
#	TowerForge/TowerForge/LevelManager/Entities/Base Entities/BaseUnit.swift
#	TowerForge/TowerForge/LevelManager/Entities/MeleeUnit.swift
#	TowerForge/TowerForge/LevelManager/Entities/SoldierUnit.swift
#	TowerForge/TowerForge/LevelManager/Generators/UnitGenerator.swift
#	TowerForge/TowerForge/Protocols/Spawnable.swift
Copy link
Contributor

@Vanessamae23 Vanessamae23 left a comment

Choose a reason for hiding this comment

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

Looks Good !

@Vanessamae23 Vanessamae23 merged commit 74ce857 into cs3217-2324:main Mar 22, 2024
1 check passed
Vanessamae23 added a commit to Vanessamae23/group-project-tower-forge that referenced this pull request Mar 30, 2024
Update SpawnEvent and Add ShootingSystem
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants