new damage number system

mklemmingen · Jan 8, 2024 · 3dc55c2 · 3dc55c2
1 parent e6f2676
commit 3dc55c2
Show file tree

Hide file tree

Showing 46 changed files with 384 additions and 27 deletions.
diff --git a/assets/Misc/blackCircle.png b/assets/Misc/blackCircle.png
diff --git a/assets/numbers/colourPalette.ase b/assets/numbers/colourPalette.ase
diff --git a/assets/numbers/greenEight.png b/assets/numbers/greenEight.png
diff --git a/assets/numbers/greenFive.png b/assets/numbers/greenFive.png
diff --git a/assets/numbers/greenFour.png b/assets/numbers/greenFour.png
diff --git a/assets/numbers/greenNine.png b/assets/numbers/greenNine.png
diff --git a/assets/numbers/greenOne.png b/assets/numbers/greenOne.png
diff --git a/assets/numbers/greenSeven.png b/assets/numbers/greenSeven.png
diff --git a/assets/numbers/greenSix.png b/assets/numbers/greenSix.png
diff --git a/assets/numbers/greenThree.png b/assets/numbers/greenThree.png
diff --git a/assets/numbers/greenTwo.png b/assets/numbers/greenTwo.png
diff --git a/assets/numbers/greenZero.png b/assets/numbers/greenZero.png
diff --git a/assets/numbers/orangeEight.png b/assets/numbers/orangeEight.png
diff --git a/assets/numbers/orangeFive.png b/assets/numbers/orangeFive.png
diff --git a/assets/numbers/orangeFour.png b/assets/numbers/orangeFour.png
diff --git a/assets/numbers/orangeNine.png b/assets/numbers/orangeNine.png
diff --git a/assets/numbers/orangeOne.png b/assets/numbers/orangeOne.png
diff --git a/assets/numbers/orangeSeven.png b/assets/numbers/orangeSeven.png
diff --git a/assets/numbers/orangeSix.png b/assets/numbers/orangeSix.png
diff --git a/assets/numbers/orangeThree.png b/assets/numbers/orangeThree.png
diff --git a/assets/numbers/orangeTwo.png b/assets/numbers/orangeTwo.png
diff --git a/assets/numbers/orangeZero.png b/assets/numbers/orangeZero.png
diff --git a/assets/numbers/redEight.png b/assets/numbers/redEight.png
diff --git a/assets/numbers/redFive.png b/assets/numbers/redFive.png
diff --git a/assets/numbers/redFour.png b/assets/numbers/redFour.png
diff --git a/assets/numbers/redNine.png b/assets/numbers/redNine.png
diff --git a/assets/numbers/redOne.png b/assets/numbers/redOne.png
diff --git a/assets/numbers/redSeven.png b/assets/numbers/redSeven.png
diff --git a/assets/numbers/redSix.png b/assets/numbers/redSix.png
diff --git a/assets/numbers/redThree.png b/assets/numbers/redThree.png
diff --git a/assets/numbers/redTwo.png b/assets/numbers/redTwo.png
diff --git a/assets/numbers/redZero.png b/assets/numbers/redZero.png
diff --git a/assets/numbers/yellowEight.png b/assets/numbers/yellowEight.png
diff --git a/assets/numbers/yellowFive.png b/assets/numbers/yellowFive.png
diff --git a/assets/numbers/yellowFour.png b/assets/numbers/yellowFour.png
diff --git a/assets/numbers/yellowNine.png b/assets/numbers/yellowNine.png
diff --git a/assets/numbers/yellowOne.png b/assets/numbers/yellowOne.png
diff --git a/assets/numbers/yellowSeven.png b/assets/numbers/yellowSeven.png
diff --git a/assets/numbers/yellowSix.png b/assets/numbers/yellowSix.png
diff --git a/assets/numbers/yellowThree.png b/assets/numbers/yellowThree.png
diff --git a/assets/numbers/yellowTwo.png b/assets/numbers/yellowTwo.png
diff --git a/assets/numbers/yellowZero.png b/assets/numbers/yellowZero.png
diff --git a/core/src/com/boomchess/game/BoomChess.java b/core/src/com/boomchess/game/BoomChess.java
@@ -307,14 +307,14 @@ public class BoomChess extends ApplicationAdapter {
 
 	// --------------------------------------------
 
-	public static Sound boomSoftware;
+	public static Sound katIncluded;
 
 	public static Texture tutorialTexture;
 	public static boolean inTutorial = false;
 
 	// --------------------------------------------
 
-	public static int botMovingSpeed = 2;
+	public static int botMovingSpeed = 1;
 
 	// --------------------------------------------
 
@@ -358,6 +358,58 @@ public class BoomChess extends ApplicationAdapter {
 	public static Texture eight;
 	public static Texture nine;
 
+	// --------------------------------------------------------------------------------------------------
+
+	// for the possible colors of textures
+
+	public static Texture redOne;
+	public static Texture greenOne;
+	public static Texture yellowOne;
+	public static Texture orangeOne;
+	public static Texture redTwo;
+	public static Texture greenTwo;
+	public static Texture yellowTwo;
+	public static Texture orangeTwo;
+	public static Texture redThree;
+	public static Texture greenThree;
+	public static Texture yellowThree;
+	public static Texture orangeThree;
+	public static Texture redFour;
+	public static Texture greenFour;
+	public static Texture yellowFour;
+	public static Texture orangeFour;
+	public static Texture redFive;
+	public static Texture greenFive;
+	public static Texture yellowFive;
+	public static Texture orangeFive;
+	public static Texture redSix;
+	public static Texture greenSix;
+	public static Texture yellowSix;
+	public static Texture orangeSix;
+	public static Texture redSeven;
+	public static Texture greenSeven;
+	public static Texture yellowSeven;
+	public static Texture orangeSeven;
+	public static Texture redEight;
+	public static Texture greenEight;
+	public static Texture yellowEight;
+	public static Texture orangeEight;
+	public static Texture redNine;
+	public static Texture greenNine;
+	public static Texture yellowNine;
+	public static Texture orangeNine;
+	public static Texture redZero;
+	public static Texture greenZero;
+	public static Texture yellowZero;
+	public static Texture orangeZero;
+
+	// ----------------------------
+
+	// black circle
+
+	public static Texture blackCircle;
+
+
 	@Override
 	public void create() {
 		// creation of the batch for drawing the images
@@ -368,9 +420,7 @@ public void create() {
 		loadingScreenTextures = new RandomImage();
 		loadingScreenTextures.addTexture("loadingScreen/BoomSoftware.png");
 		loadingSound = Gdx.audio.newSound(Gdx.files.internal("sounds/countdown.mp3"));
-
 		tutorialTexture = new Texture(Gdx.files.internal("Misc/tutorial.png"));
-
 		loadingStage = LoadingScreenStage.initalizeUI();
 
 		// creating all stage objects
@@ -409,7 +459,7 @@ public void create() {
 		buttonWidth = tileSize*2;
 		buttonHeight = tileSize/2;
 
-		boomSoftware = Gdx.audio.newSound(Gdx.files.internal("Misc/BoomSoftwares.mp3"));
+		katIncluded = Gdx.audio.newSound(Gdx.files.internal("Misc/BoomSoftwares.mp3"));
 
 		loadingScreenIsRunning = true;
 	}
@@ -443,7 +493,7 @@ public void render() {
 			loadingStage.act();
 			loadingStage.draw();
 			// run loading screen for 3 seconds atleast
-			if(loadingElapsed < 3){
+			if(loadingElapsed < 4){
 				loadingElapsed += Gdx.graphics.getDeltaTime();
 			} else {
 				loadingScreenIsRunning = false;
@@ -454,7 +504,7 @@ public void render() {
 			// load the assets first time
 			if(!(assetsLoaded)){
 				loadAllAssets();
-				boomSoftware.play(volume);
+				katIncluded.play(volume);
 			}
 			return;
 		}
@@ -619,16 +669,16 @@ private static void loadAllAssets() {
 		// Scaling the font depending on the relativresizer calculated tile size
 
 		if (tileSize > 140) {
-			font.getData().setScale(3f);
+			font.getData().setScale(2f);
 			sliderSize = 4f;
 		} else if (tileSize > 100) {
-			font.getData().setScale(2f);
+			font.getData().setScale(1.5f);
 			sliderSize = 2.5f;
 		} else if (tileSize > 50){
-			font.getData().setScale(1.5f);
+			font.getData().setScale(1);
 			sliderSize = 1.5f;
 		} else {
-			font.getData().setScale(1.5f);
+			font.getData().setScale(1f);
 			sliderSize = 1f;
 		}
 
@@ -720,6 +770,59 @@ private static void loadAllAssets() {
 		threeTOthreeCircle = new Texture(Gdx.files.internal("Misc/threeTothreeCircle.png"));
 		fiveTOfiveCircle = new Texture(Gdx.files.internal("Misc/fiveTofiveCircle.png"));
 
+		// loading coloured numbers
+		redOne = new Texture(Gdx.files.internal("numbers/redOne.png"));
+		greenOne = new Texture(Gdx.files.internal("numbers/greenOne.png"));
+		yellowOne = new Texture(Gdx.files.internal("numbers/yellowOne.png"));
+		orangeOne = new Texture(Gdx.files.internal("numbers/orangeOne.png"));
+
+		redTwo = new Texture(Gdx.files.internal("numbers/redTwo.png"));
+		greenTwo = new Texture(Gdx.files.internal("numbers/greenTwo.png"));
+		yellowTwo = new Texture(Gdx.files.internal("numbers/yellowTwo.png"));
+		orangeTwo = new Texture(Gdx.files.internal("numbers/orangeTwo.png"));
+
+		redThree = new Texture(Gdx.files.internal("numbers/redThree.png"));
+		greenThree = new Texture(Gdx.files.internal("numbers/greenThree.png"));
+		yellowThree = new Texture(Gdx.files.internal("numbers/yellowThree.png"));
+		orangeThree = new Texture(Gdx.files.internal("numbers/orangeThree.png"));
+
+		redFour = new Texture(Gdx.files.internal("numbers/redFour.png"));
+		greenFour = new Texture(Gdx.files.internal("numbers/greenFour.png"));
+		yellowFour = new Texture(Gdx.files.internal("numbers/yellowFour.png"));
+		orangeFour = new Texture(Gdx.files.internal("numbers/orangeFour.png"));
+
+		redFive = new Texture(Gdx.files.internal("numbers/redFive.png"));
+		greenFive = new Texture(Gdx.files.internal("numbers/greenFive.png"));
+		yellowFive = new Texture(Gdx.files.internal("numbers/yellowFive.png"));
+		orangeFive = new Texture(Gdx.files.internal("numbers/orangeFive.png"));
+
+		redSix = new Texture(Gdx.files.internal("numbers/redSix.png"));
+		greenSix = new Texture(Gdx.files.internal("numbers/greenSix.png"));
+		yellowSix = new Texture(Gdx.files.internal("numbers/yellowSix.png"));
+		orangeSix = new Texture(Gdx.files.internal("numbers/orangeSix.png"));
+
+		redSeven = new Texture(Gdx.files.internal("numbers/redSeven.png"));
+		greenSeven = new Texture(Gdx.files.internal("numbers/greenSeven.png"));
+		yellowSeven = new Texture(Gdx.files.internal("numbers/yellowSeven.png"));
+		orangeSeven = new Texture(Gdx.files.internal("numbers/orangeSeven.png"));
+
+		redEight = new Texture(Gdx.files.internal("numbers/redEight.png"));
+		greenEight = new Texture(Gdx.files.internal("numbers/greenEight.png"));
+		yellowEight = new Texture(Gdx.files.internal("numbers/yellowEight.png"));
+		orangeEight = new Texture(Gdx.files.internal("numbers/orangeEight.png"));
+
+		redNine = new Texture(Gdx.files.internal("numbers/redNine.png"));
+		greenNine = new Texture(Gdx.files.internal("numbers/greenNine.png"));
+		yellowNine = new Texture(Gdx.files.internal("numbers/yellowNine.png"));
+		orangeNine = new Texture(Gdx.files.internal("numbers/orangeNine.png"));
+
+		redZero = new Texture(Gdx.files.internal("numbers/redZero.png"));
+		greenZero = new Texture(Gdx.files.internal("numbers/greenZero.png"));
+		yellowZero = new Texture(Gdx.files.internal("numbers/yellowZero.png"));
+		orangeZero = new Texture(Gdx.files.internal("numbers/orangeZero.png"));
+
+		Gdx.app.log("BoomChess", "Loading Assets: HealthNumber assets finished");
+
 		// Loading Texture of the map
 
 		medievalMaps = new RandomImage();
@@ -740,6 +843,11 @@ private static void loadAllAssets() {
 		modernMaps.addTexture("map/map3/map5.png"); // cool black and white map
 		modernMaps.addTexture("map/map3/map6.png"); // cool black and white map
 
+		Gdx.app.log("BoomChess", "Loading Assets: HealthNumber assets");
+		// black circle
+
+		blackCircle = new Texture(Gdx.files.internal("Misc/blackCircle.png"));
+
 		// texture for the action Running logo
 		actionOngoing = new Image(new Texture(Gdx.files.internal("Misc/actionOngoing.png")));
 		actionOngoing.setSize(tileSize*2.5f, tileSize*1.2f);
@@ -1422,6 +1530,57 @@ public void dispose() {
 		 background_music.dispose();
 		 menu_music.dispose();
 		 creditsMusic.dispose();
+
+		// dispose of all numbers
+		redOne.dispose();
+		greenOne.dispose();
+		yellowOne.dispose();
+		orangeOne.dispose();
+
+		redTwo.dispose();
+		greenTwo.dispose();
+		yellowTwo.dispose();
+		orangeTwo.dispose();
+
+		redThree.dispose();
+		greenThree.dispose();
+		yellowThree.dispose();
+		orangeThree.dispose();
+
+		redFour.dispose();
+		greenFour.dispose();
+		yellowFour.dispose();
+		orangeFour.dispose();
+
+		redFive.dispose();
+		greenFive.dispose();
+		yellowFive.dispose();
+		orangeFive.dispose();
+
+		redSix.dispose();
+		greenSix.dispose();
+		yellowSix.dispose();
+		orangeSix.dispose();
+
+		redSeven.dispose();
+		greenSeven.dispose();
+		yellowSeven.dispose();
+		orangeSeven.dispose();
+
+		redEight.dispose();
+		greenEight.dispose();
+		yellowEight.dispose();
+		orangeEight.dispose();
+
+		redNine.dispose();
+		greenNine.dispose();
+		yellowNine.dispose();
+		orangeNine.dispose();
+
+		redZero.dispose();
+		greenZero.dispose();
+		yellowZero.dispose();
+		orangeZero.dispose();
 	}
 
 	public static void switchToStage(Stage newStage) {
@@ -1672,7 +1831,7 @@ public static Coordinates calculateTileByPXNonGDX(int pxCoordinateX, int pxCoord
 
 		// method for checking which tile a pxCoordinateX and pxCoordinateY is in, creating the coordinates object
 		// of the respective tile and returning it
-		Coordinates iconTileCoordinate;
+		Coordinates iconTileCoordinate = new Coordinates();
 
 		iconTileCoordinate = calculateTileByPX(pxCoordinateX, pxCoordinateY);
 
@@ -1932,6 +2091,4 @@ public static int getSpecialMalusValue(Soldier soldier){
 
 		return specialValue;
 	}
-
-
 }
diff --git a/core/src/com/boomchess/game/backend/Soldier.java b/core/src/com/boomchess/game/backend/Soldier.java
@@ -14,7 +14,7 @@ public abstract class Soldier {
 
     protected String teamColor;
     protected int health;
-    public static int standardHealth;
+    private int standardHealth;
 
     public Soldier(String teamColor, int health) {
         this.teamColor = teamColor;
@@ -79,4 +79,8 @@ public ArrayList<Coordinates> mathMove(int positionX, int positionY) {
         }
         return possibleMoves;
     }
+
+    public int getStandardHealth(){
+        return standardHealth;
+    }
 }