Skip to content

Commit

Permalink
Merge pull request #139 from UQcsse3200/Collab-end-game-state
Browse files Browse the repository at this point in the history 
Collab (Teams 2 and 5) Engineers/Game Loss State
  • Loading branch information
@The-AhmadAA
The-AhmadAA authored Sep 11, 2023
2 parents b8d88cf + 175d74f commit a7d3db4
Show file tree
Hide file tree
Showing 31 changed files with 460 additions and 418 deletions.
Binary file added source/core/assets/images/economy/crystalBanner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/core/assets/images/economy/crystalUI.png
View file
Binary file not shown.
Binary file added source/core/assets/images/economy/scrapBanner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/core/assets/images/economy/scrapsUI.png
View file
Binary file not shown.
Binary file added source/core/assets/images/engineers/engineerBanner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...allpaper-simple-stars-video-background-loop-black-and-white-aesthetic-space.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/lose-screen/lose-bg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion source/core/src/main/com/csse3200/game/GdxGame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
import com.csse3200.game.components.CombatStatsComponent;
import com.csse3200.game.files.UserSettings;
import com.csse3200.game.screens.*;
import org.slf4j.Logger;
Expand Down Expand Up @@ -74,13 +75,15 @@ private Screen newScreen(ScreenType screenType) {
return new StoryScreen(this);
case LEVEL_SELECT:
return new LevelSelectScreen(this);
case LOSING_SCREEN:
return new LosingScreen(this);
default:
return null;
}
}

public enum ScreenType {
MAIN_MENU, MAIN_GAME, SETTINGS, STORY_SCREEN, LEVEL_SELECT
MAIN_MENU, MAIN_GAME, SETTINGS, STORY_SCREEN, LEVEL_SELECT, LOSING_SCREEN
}

/**
Expand Down
106 changes: 8 additions & 98 deletions source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.csse3200.game.components.CombatStatsComponent;
import com.csse3200.game.components.ProjectileEffects;
import com.csse3200.game.areas.terrain.TerrainFactory;
import com.csse3200.game.areas.terrain.TerrainFactory.TerrainType;
import com.csse3200.game.components.player.PlayerStatsDisplay;
import com.csse3200.game.entities.Entity;
import com.csse3200.game.entities.factories.*;
import com.csse3200.game.physics.PhysicsLayer;
import com.csse3200.game.utils.math.GridPoint2Utils;
import com.csse3200.game.utils.math.RandomUtils;
import com.csse3200.game.services.ResourceService;
import com.csse3200.game.services.ServiceLocator;
Expand All @@ -31,30 +28,15 @@
/** Forest area for the demo game with trees, a player, and some enemies. */
public class ForestGameArea extends GameArea {
private static final Logger logger = LoggerFactory.getLogger(ForestGameArea.class);

// Counts the number of humans left, if this reaches zero, game over.
private int endStateCounter = 2;
private static final int NUM_BUILDINGS = 4;

private static final int NUM_WALLS = 7;

private static final int NUM_TREES = 0;
private static final int NUM_GHOSTS = 0;
private static final int NUM_GRUNTS = 5;

private static final int NUM_BOSS=4;


private Timer bossSpawnTimer;
private int bossSpawnInterval = 10000; // 1 minute in milliseconds

private static final int NUM_WEAPON_TOWERS = 3;
private static final GridPoint2 PLAYER_SPAWN = new GridPoint2(0, 0);
// Temporary spawn point for testing
private static final float WALL_WIDTH = 0.1f;

private static final GridPoint2 BOSS_SPAWN = new GridPoint2(5, 5);

// Required to load assets before using them
private static final String[] forestTextures = {
"images/ingamebg.png",
Expand Down Expand Up @@ -94,26 +76,19 @@ public class ForestGameArea extends GameArea {
"images/towers/wallTower.png",
"images/background/building2.png",
"images/iso_grass_3.png",

"images/terrain_use.png",
"images/Dusty_MoonBG.png",

"images/economy/scrap.png",
"images/economy/crystal.png",
"images/economy/econ-tower.png",


"images/towers/mine_tower.png",
"images/towers/TNTTower.png",

"images/towers/DroidTower.png",
"images/projectiles/basic_projectile.png",
"images/projectiles/mobProjectile.png",
"images/projectiles/engineer_projectile.png",
"images/projectiles/mobKing_projectile.png",
"images/projectiles/snow_ball.png"


};
private static final String[] forestTextureAtlases = {
"images/economy/econ-tower.atlas",
Expand All @@ -136,7 +111,6 @@ public class ForestGameArea extends GameArea {
"images/projectiles/engineer_projectile.atlas",
"images/projectiles/mobKing_projectile.atlas",
"images/projectiles/snow_ball.atlas"

};
private static final String[] forestSounds = {
"sounds/Impact4.ogg",
Expand All @@ -158,8 +132,6 @@ public class ForestGameArea extends GameArea {
// Variables to be used with spawn projectile methods. This is the variable
// that should occupy the direction param.
private static final int towardsMobs = 100;
private static final int towardsTowers = 0;
private Entity bossKing1;
private Entity bossKing2;


Expand Down Expand Up @@ -194,27 +166,24 @@ 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();

spawnScrap();
spawnIncome();
spawnGhosts();
spawnWeaponTower();
spawnTNTTower();
spawnDroidTower();
spawnGapScanners();
spawnIncome();
// bossKing1 = spawnBossKing1();
bossKing2 = spawnBossKing2();



bossKing2 = spawnBossKing2();
}

private void displayUI() {
Entity ui = new Entity();
ui.addComponent(new GameAreaDisplay("Box Forest"));
ui.addComponent(ServiceLocator.getGameEndService().getDisplay());
ui.addComponent(ServiceLocator.getCurrencyService().getDisplay());
spawnEntity(ui);
}
Expand All @@ -231,8 +200,6 @@ private void spawnTerrain() {

// Left
// ! THIS ONE DOESNT WORK. GRIDPOINTS2UTIL.ZERO is (0, 4), not (0, 0)
// spawnEntityAt(
// ObstacleFactory.createWall(WALL_WIDTH, worldBounds.y), GridPoint2Utils.ZERO, false, false);
spawnEntityAt(
ObstacleFactory.createWall(WALL_WIDTH, worldBounds.y), new GridPoint2(1, 0), false, false);
// Right
Expand Down Expand Up @@ -266,17 +233,6 @@ private void spawnBuilding2() {
}
}

private void spawnMountains() {
ArrayList<GridPoint2> fixedPositions = new ArrayList<>(); //Generating ArrayList


for (GridPoint2 fixedPos : fixedPositions) {
Entity tree = ObstacleFactory.createMountain();
spawnEntityAt(tree, fixedPos, true, false);
}
}


private Entity spawnPlayer() {
Entity newPlayer = PlayerFactory.createPlayer();
spawnEntityAt(newPlayer, PLAYER_SPAWN, true, true);
Expand Down Expand Up @@ -358,22 +314,6 @@ private void spawnProjectile(Vector2 position, short targetLayer, int space, in
spawnEntity(Projectile);
}

// private Entity spawnBossKing() {
// for (int i = 0; i < NUM_BOSS; i++) {
// int fixedX = terrain.getMapBounds(0).x - 1; // Rightmost x-coordinate
// int randomY = MathUtils.random(0, maxPos.y);
// GridPoint2 randomPos = new GridPoint2(fixedX, randomY);
// bossKing1 = BossKingFactory.createBossKing1(player);
// spawnEntityAt(bossKing1,
// randomPos,
// true,
// false);
// }
// return bossKing1;

// }


private void spawnXenoGrunts() {
int[] pickedLanes = new Random().ints(1, 7)
.distinct().limit(5).toArray();
Expand All @@ -386,18 +326,6 @@ private void spawnXenoGrunts() {
}
}

// private Entity spawnGhostKing() {
// GridPoint2 minPos = new GridPoint2(0, 0);
// GridPoint2 maxPos = terrain.getMapBounds(0).sub(0, 0);
// GridPoint2 randomPos
// = RandomUtils.random(minPos, maxPos);
// // = new GridPoint2(26, 26);
// Entity ghostKing = NPCFactory.createGhostKing(player);
// spawnEntityAt(ghostKing, randomPos, true, true);
// return ghostKing;
//
// }

private Entity spawnBossKing2() {
GridPoint2 minPos = new GridPoint2(0, 0);
GridPoint2 maxPos = terrain.getMapBounds(0).sub(2, 2);
Expand Down Expand Up @@ -509,14 +437,11 @@ private void spawnWeaponTower() {
for (int i = 0; i < NUM_WEAPON_TOWERS; i++) {
GridPoint2 randomPos1 = RandomUtils.random(minPos, maxPos);
GridPoint2 randomPos2 = RandomUtils.random(minPos, maxPos);
//Entity weaponTower = TowerFactory.createWeaponTower();
Entity wallTower = TowerFactory.createWallTower();
Entity fireTower = TowerFactory.createFireTower();
Entity stunTower = TowerFactory.createStunTower();
//spawnEntityAt(weaponTower, randomPos, true, true);
spawnEntityAt(fireTower, randomPos1, true, true);
spawnEntityAt(stunTower, randomPos2, true, true);
//spawnEntityAt(wallTower, new GridPoint2(randomPos1.x + 3, randomPos1.y), true, true);
}
}

Expand Down Expand Up @@ -611,6 +536,10 @@ private void spawnIncome() {
}
}

/**
* 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();
Expand All @@ -623,23 +552,4 @@ private void spawnGapScanners() {
// Entity engineer = EngineerFactory.createEngineer();
// spawnEntityAt(engineer, randomPos, 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();
// }
// }
}
21 changes: 13 additions & 8 deletions source/core/src/main/com/csse3200/game/components/CombatStatsComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
public class CombatStatsComponent extends Component {

private static final Logger logger = LoggerFactory.getLogger(CombatStatsComponent.class);
private static final String HEALTH_FULL = "fullHealth";
private static final String HEALTH_MID = "midHealth";
private static final String HEALTH_LOW = "lowHealth";
private static final String HIT_EVENT = "hitStart";
private static final String UPDATE_HEALTH_EVENT = "updateHealth";
private int health;
private int baseAttack;
private int fullHealth;
Expand All @@ -41,7 +46,7 @@ public CombatStatsComponent(int health, int baseAttack) {
setHealth(health);
setBaseAttack(baseAttack);
this.fullHealth = health;
this.state = "fullHealth";
this.state = HEALTH_FULL;
}

public CombatStatsComponent(int health, int baseAttack,
Expand All @@ -54,7 +59,7 @@ public CombatStatsComponent(int health, int baseAttack,
this.drops = drops;
this.closeRangeAbilities = closeRangeAbilities;
this.longRangeAbilities = longRangeAbilities;
this.state = "fullHealth";
this.state = HEALTH_FULL;
}

/**
Expand Down Expand Up @@ -88,7 +93,7 @@ public void setHealth(int health) {
}

if (entity != null) {
entity.getEvents().trigger("updateHealth", this.health);
entity.getEvents().trigger(UPDATE_HEALTH_EVENT, this.health);
}
}

Expand Down Expand Up @@ -150,7 +155,7 @@ public void hit(Integer damage) {
int newHealth = getHealth() - damage;
setHealth(newHealth);
if (entity != null && !this.isDead()) {
entity.getEvents().trigger("hitStart");
entity.getEvents().trigger(HIT_EVENT);
}
changeState();
}
Expand All @@ -159,7 +164,7 @@ public void hit(Integer damage) {
public void hit(CombatStatsComponent attacker) {
int newHealth = getHealth() - attacker.getBaseAttack();
if (entity != null && !this.isDead()) {
entity.getEvents().trigger("hitStart");
entity.getEvents().trigger(HIT_EVENT);
}
setHealth(newHealth);
changeState();
Expand Down Expand Up @@ -226,11 +231,11 @@ public Weapon getWeapon(Entity target) {
* */
public void changeState() {
if (this.health <= (this.fullHealth * 0.33)) {
this.state = "lowHealth";
this.state = HEALTH_LOW;
} else if (this.health <= (this.fullHealth * 0.66)) {
this.state = "midHealth";
this.state = HEALTH_MID;
} else {
this.state = "fullHealth";
this.state = HEALTH_FULL;
}
}

Expand Down
Loading

0 comments on commit a7d3db4

Please sign in to comment.