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 7 tower stat alterations #280

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Team 7 tower stat alterations #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e7d04
Fixed tower scanner to match the enemies hitboxes
ThivanW Oct 16, 2023
db0073e
Merge branch 'main' into Team-7--Tower-Stat-Alterations
ThivanW Oct 16, 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
2 changes: 1 addition & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/FireTowerCombatTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public FireTowerCombatTask(int priority, float maxRange) {
public void start() {
super.start();
// get the tower coordinates
this.towerPosition = owner.getEntity().getCenterPosition();
this.towerPosition = owner.getEntity().getCenterPosition().sub(0.125f,0.125f);
this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
owner.getEntity().getEvents().addListener("addFireRate",this::changeFireRateInterval);
//default to idle state
Expand Down
2 changes: 1 addition & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/PierceTowerCombatTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public PierceTowerCombatTask(int priority, float maxRange) {
public void start() {
super.start();
// Get the tower coordinates
this.towerPosition = owner.getEntity().getCenterPosition();
this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
// Set the default state to IDLE state
owner.getEntity().getEvents().trigger(IDLE);
Expand Down
2 changes: 1 addition & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/RicochetTowerCombatTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public RicochetTowerCombatTask(int priority, float maxRange) {
public void start() {
super.start();
// Get the tower coordinates
this.towerPosition = owner.getEntity().getCenterPosition();
this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
// Set the default state to IDLE state
owner.getEntity().getEvents().trigger(IDLE);
Expand Down
2 changes: 1 addition & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public StunTowerCombatTask(int priority, float maxRange) {
public void start() {
super.start();
//get the tower coordinates
this.towerPosition = owner.getEntity().getCenterPosition();
this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
owner.getEntity().getEvents().addListener("addFireRate",this::changeFireRateInterval);
//set the default state to IDLE state
Expand Down
Loading