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.

Sign up for GitHub

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

Team 2 alasdair branch #117

Merged
merged 4 commits into from
Sep 8, 2023
Merged

Team 2 alasdair branch #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
406027b
Averts divide by zero edge case if a tower's firerate is reduced to 0…
AlasdairS4698737 Sep 8, 2023
bd6a871
TowerUpgraderComponent is a component of all tower entities, rather t…
AlasdairS4698737 Sep 8, 2023
0afcd0c
Update TowerCombatTask.java
The-AhmadAA Sep 8, 2023
5549e12
Update TowerUpgraderComponentTest.java
The-AhmadAA Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/TowerCombatTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ private boolean isTargetVisible() {
private void changeFireRateInterval(int perMinute) {
float oldFireSpeed = 1/fireRateInterval;
float newFireSpeed = oldFireSpeed + perMinute/60f;
fireRateInterval = 1/newFireSpeed;
if (newFireSpeed == 0) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

updated this to return without doing anything rather than changing the firerate

} else {
fireRateInterval = 1 / newFireSpeed;
}
}

/**
Expand Down
6 changes: 3 additions & 3 deletions source/core/src/main/com/csse3200/game/entities/factories/TowerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ public static Entity createWeaponTower() {
.addComponent(new CostComponent(config.cost))
.addComponent(aiTaskComponent)
.addComponent(animator)
.addComponent(new TowerAnimationController())
.addComponent(new TowerUpgraderComponent());
.addComponent(new TowerAnimationController());

return weapon;

Expand All @@ -132,7 +131,8 @@ public static Entity createBaseTower() {
Entity tower = new Entity()
.addComponent(new ColliderComponent())
.addComponent(new HitboxComponent().setLayer(PhysicsLayer.OBSTACLE)) // TODO: we might have to change the names of the layers
.addComponent(new PhysicsComponent().setBodyType(BodyType.StaticBody));
.addComponent(new PhysicsComponent().setBodyType(BodyType.StaticBody))
.addComponent(new TowerUpgraderComponent());

return tower;
}
Expand Down
16 changes: 16 additions & 0 deletions source/core/src/test/com/csse3200/game/components/tower/TowerUpgraderComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,20 @@ void increaseFireRate() {
verify(towerUpgraderComponent).upgradeTower(TowerUpgraderComponent.UPGRADE.FIRERATE, 60);
assertEquals(0.5, towerCombatTask.getFireRateInterval());
}

@Test
void divideByZeroDefaultToIgnore() {
entity.addComponent(towerUpgraderComponent);
AITaskComponent aiTaskComponent = new AITaskComponent();
ServiceLocator.registerPhysicsService(mock(PhysicsService.class));
ServiceLocator.registerTimeSource(mock(GameTime.class));
TowerCombatTask towerCombatTask = new TowerCombatTask(10, 10, 1);
aiTaskComponent.addTask(towerCombatTask);
entity.addComponent(aiTaskComponent);
towerCombatTask.start();
entity.create();
entity.getEvents().trigger("upgradeTower", TowerUpgraderComponent.UPGRADE.FIRERATE, -60);
verify(towerUpgraderComponent).upgradeTower(TowerUpgraderComponent.UPGRADE.FIRERATE, -60);
assertEquals(1., towerCombatTask.getFireRateInterval());
}
}