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 engineers - Final sprint 2 merge #154

Merged
merged 8 commits into from
Sep 12, 2023
Merged

Team 2 engineers - Final sprint 2 merge #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4390f55
cleaning up
The-AhmadAA Sep 10, 2023
38fcf45
merging Collab-end-game-state into Team-2--Engineers
The-AhmadAA Sep 11, 2023
8f466e1
fixed display not updating at start if engineerCount is not default
The-AhmadAA Sep 12, 2023
4cb118b
added upper bound to engineerCount (1000)
The-AhmadAA Sep 12, 2023
2e7dcc5
restored forestGameArea after testing
The-AhmadAA Sep 12, 2023
ca941e9
merging main into Team-2--Engineers in preparation for PR
The-AhmadAA Sep 12, 2023
2242ac7
uncommented code to allow engineers to spawn
The-AhmadAA Sep 12, 2023
71e46d7
Merge branch 'main' into Team-2--Engineers
The-AhmadAA Sep 12, 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
47 changes: 8 additions & 39 deletions source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ public void create() {
loadAssets();
displayUI();
spawnTerrain();
// spawnBuilding1();
// spawnBuilding2();
// spawnMountains();

// Set up infrastructure for end game tracking
player = spawnPlayer();
Expand All @@ -192,17 +189,14 @@ public void create() {
spawnRicochetFireball(new Vector2(2, 4), PhysicsLayer.NPC, towardsMobs, new Vector2(2f, 2f));
spawnSplitFireWorksFireBall(new Vector2(2, 5), PhysicsLayer.NPC, towardsMobs, new Vector2(2f, 2f), 12);
spawnEffectProjectile(new Vector2(2, 6), PhysicsLayer.NPC, towardsMobs, new Vector2(2f, 2f), ProjectileEffects.SLOW, false);
// spawnProjectileTest(new Vector2(0, 8), PhysicsLayer.NPC, towardsMobs, new Vector2(2f, 2f));
spawnXenoGrunts();
// spawnGhosts();
spawnWeaponTower();
// spawnIncome();
spawnScrap();
spawnTNTTower();

spawnGapScanners();
spawnDroidTower();
// spawnGapScanners();
// bossKing1 = spawnBossKing1();
// bossKing2 = spawnBossKing2();

bossKing2 = spawnBossKing2();
}
Expand Down Expand Up @@ -656,37 +650,12 @@ private void spawnEngineer() {
* Creates the scanners (one per lane) that detect absence of towers and presence of mobs,
* and trigger engineer spawning
*/
// private void spawnGapScanners() {
// for (int i = 0; i < terrain.getMapBounds(0).y; i++) {
// Entity scanner = GapScannerFactory.createScanner();
// spawnEntityAt(scanner, new GridPoint2(0, i), true, true);
// }
// }
// GridPoint2 minPos = new GridPoint2(0, 0);
// GridPoint2 maxPos = new GridPoint2(5, terrain.getMapBounds(0).sub(2, 2).y);
// GridPoint2 randomPos = RandomUtils.random(minPos, maxPos);
//
// Entity engineer = EngineerFactory.createEngineer();
// spawnEntityAt(engineer, randomPos, true, true);
// }

private void spawnGapScanners() {
for (int i = 0; i < terrain.getMapBounds(0).y; i++) {
Entity scanner = GapScannerFactory.createScanner();
spawnEntityAt(scanner, new GridPoint2(0, i), true, true);
}
}

// private void gameTrackerStart() {
// Entity endGameTracker = new Entity();
//
// endGameTracker
// .addComponent(new CombatStatsComponent(2, 0))
// .addComponent(new PlayerStatsDisplay());
//// .getEvents().addListener("engineerKilled" , this::decrementCounter);
// endGameTracker.create();
// }

// private void decrementCounter() {
// this.endStateCounter -= 1;
// logger.info("Engineer killed");
// if (endStateCounter <= 0) {
// // we've reached the end, game over
// this.dispose();
// }
// }
}
8 changes: 7 additions & 1 deletion source/core/src/main/com/csse3200/game/components/tasks/human/HumanWanderTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public class HumanWanderTask extends DefaultTask implements PriorityTask {
private Task currentTask;
private boolean isDead = false;

private boolean hasDied = false;

/**
* Constructor of HumanWanderTask
*
Expand All @@ -53,7 +55,6 @@ public int getPriority() {

/**
* Starts the HumanWanderTask instance and instantiates subtasks (HumanWaitTask, HumanWanderTask, EngineerCombatTask).
*
*/
@Override
public void start() {
Expand Down Expand Up @@ -85,6 +86,11 @@ public void start() {
*/
@Override
public void update() {
hasDied = owner.getEntity().getComponent(CombatStatsComponent.class).isDead();
// Check if engineer has died since last update
if (!isDead && hasDied) {
startDying();
}

boolean justDied = owner.getEntity().getComponent(CombatStatsComponent.class).isDead();
// Check if engineer has died since last update
Expand Down
3 changes: 2 additions & 1 deletion source/core/src/main/com/csse3200/game/services/GameEndService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ public GameEndService() {
* @param newLimit as an integer representing the maximum number of engineer deaths
*/
public void setEngineerCount(int newLimit) {
if (newLimit > 0) {
if (newLimit > 0 && newLimit < 1000) {
engineerCount = newLimit;
display.updateCount();
}
}

Expand Down