updated font due to the previous font not having numbers

UQcsse3200 · Oct 14, 2023 · b158bc5 · b158bc5
1 parent 91bec80
commit b158bc5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/source/core/assets/images/ui/buttons/glass.json b/source/core/assets/images/ui/buttons/glass.json
@@ -110,7 +110,7 @@ com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
 		checkboxOnOver: UI_Glass_Slot_Selected_01a
 		checkboxOver: UI_Glass_Slot_Unavailable_01a
 		checkboxOnDisabled: UI_Glass_Slot_Unavailable_01a
-		font: game_paused_24
+		font: glitch_24
 	}
 }
 com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
@@ -122,7 +122,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
 com.badlogic.gdx.scenes.scene2d.ui.ImageTextButton$ImageTextButtonStyle: {
 	default: {
 		parent: default
-		font: game_paused_24
+		font: glitch_24
 		fontColor: White
 		downFontColor: Blue
 		overFontColor: White
@@ -142,18 +142,18 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageTextButton$ImageTextButtonStyle: {
 }
 com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
 	default: {
-		font: game_paused_24
+		font: glitch_24
 		fontColor: White
 	}
 	title: {
 		parent: default
-		font: game_paused_title
+		font: glitch_title
 		fontColor: White
 	}
 }
 com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
 	default: {
-		font: game_paused_24
+		font: glitch_24
 		fontColorSelected: White
 		fontColorUnselected: Grey
 		selection: UI_Glass_Banner_01a
@@ -182,7 +182,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
 }
 com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
 	default: {
-		font: game_paused_24
+		font: glitch_24
 		fontColor: Grey
 		overFontColor: White
 		disabledFontColor: Grey
@@ -202,7 +202,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
 com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
 	default: {
 		parent: default
-		font: game_paused_24
+		font: glitch_24
 		fontColor: Grey
 		downFontColor: White
 		overFontColor: White
@@ -226,7 +226,7 @@ com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
 }
 com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
 	default: {
-		font: game_paused_24
+		font: glitch_24
 		fontColor: White
 	}
 }
@@ -238,7 +238,7 @@ com.badlogic.gdx.scenes.scene2d.ui.TextTooltip$TextTooltipStyle: {
 com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
 	default: {
 		background: UI_Glass_Frame_Standard_01a
-		titleFont: game_paused_title
+		titleFont: glitch_title
 		titleFontColor: White
 	}
 }

diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
@@ -11,25 +11,16 @@
 import com.csse3200.game.utils.math.RandomUtils;
 import com.csse3200.game.services.ResourceService;
 import com.csse3200.game.services.ServiceLocator;
-import com.csse3200.game.components.gamearea.GameAreaDisplay;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.security.SecureRandom;
 import java.util.Timer;
 
 import static com.csse3200.game.screens.AssetLoader.loadAllAssets;
 
 /** 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);
-  private static final int NUM_BUILDINGS = 4;
-  private static final int NUM_GHOSTS = 0;
-  private static final int NUM_GRUNTS = 5;
-  private static final int NUM_BOSS = 4;
 
-  private SecureRandom rand = new SecureRandom();
-
-  private int wave = 0;
   private Timer waveTimer;
 
   private static final int NUM_WEAPON_TOWERS = 3;
@@ -141,14 +132,12 @@ public class ForestGameArea extends GameArea {
           "images/projectiles/basic_projectile.atlas",
           "images/projectiles/bossProjectile.atlas",
           "images/projectiles/mobProjectile.atlas",
-          "images/projectiles/mobProjectile.atlas",
           "images/projectiles/engineer_projectile.atlas",
           "images/projectiles/mobBoss_projectile.atlas",
           "images/projectiles/snow_ball.atlas",
           "images/projectiles/pierce_anim.atlas",
           "images/projectiles/burn_effect.atlas",
           "images/projectiles/firework_anim.atlas",
-          "images/projectiles/mobProjectile.atlas",
           "images/projectiles/stun_effect.atlas",
           "images/mobboss/demon.atlas",
           "images/mobs/fire_worm.atlas",