diff --git a/assets/greenTeam/tank_blue_right.png b/assets/Misc/tank_blue_right.png similarity index 100% rename from assets/greenTeam/tank_blue_right.png rename to assets/Misc/tank_blue_right.png diff --git a/assets/greenTeam/general_green_right_1.png b/assets/greenTeam/general_green_right_1.png deleted file mode 100644 index 972b577..0000000 Binary files a/assets/greenTeam/general_green_right_1.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_2.png b/assets/greenTeam/general_green_right_2.png deleted file mode 100644 index e35aa62..0000000 Binary files a/assets/greenTeam/general_green_right_2.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_3.png b/assets/greenTeam/general_green_right_3.png deleted file mode 100644 index 973b1a1..0000000 Binary files a/assets/greenTeam/general_green_right_3.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_4.png b/assets/greenTeam/general_green_right_4.png deleted file mode 100644 index f0a760c..0000000 Binary files a/assets/greenTeam/general_green_right_4.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_5.png b/assets/greenTeam/general_green_right_5.png deleted file mode 100644 index 5444f2f..0000000 Binary files a/assets/greenTeam/general_green_right_5.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_6.png b/assets/greenTeam/general_green_right_6.png deleted file mode 100644 index 4bd0005..0000000 Binary files a/assets/greenTeam/general_green_right_6.png and /dev/null differ diff --git a/assets/greenTeam/general_green_right_7.png b/assets/greenTeam/general_green_right_7.png deleted file mode 100644 index 4c1f3d6..0000000 Binary files a/assets/greenTeam/general_green_right_7.png and /dev/null differ diff --git a/assets/spritesheets/blue_general1.png b/assets/spritesheets/blue_general1.png new file mode 100644 index 0000000..da248f9 Binary files /dev/null and b/assets/spritesheets/blue_general1.png differ diff --git a/assets/spritesheets/blue_general2.png b/assets/spritesheets/blue_general2.png new file mode 100644 index 0000000..12fc070 Binary files /dev/null and b/assets/spritesheets/blue_general2.png differ diff --git a/assets/spritesheets/blue_general3.png b/assets/spritesheets/blue_general3.png new file mode 100644 index 0000000..c922bb3 Binary files /dev/null and b/assets/spritesheets/blue_general3.png differ diff --git a/assets/spritesheets/blue_infantry1.png b/assets/spritesheets/blue_infantry1.png new file mode 100644 index 0000000..8e69922 Binary files /dev/null and b/assets/spritesheets/blue_infantry1.png differ diff --git a/assets/spritesheets/blue_infantry2.png b/assets/spritesheets/blue_infantry2.png new file mode 100644 index 0000000..48a6af4 Binary files /dev/null and b/assets/spritesheets/blue_infantry2.png differ diff --git a/assets/spritesheets/green_artillery.png b/assets/spritesheets/green_artillery.png new file mode 100644 index 0000000..4a8b36c Binary files /dev/null and b/assets/spritesheets/green_artillery.png differ diff --git a/assets/spritesheets/green_commando.png b/assets/spritesheets/green_commando.png new file mode 100644 index 0000000..c27c663 Binary files /dev/null and b/assets/spritesheets/green_commando.png differ diff --git a/assets/spritesheets/green_general.png b/assets/spritesheets/green_general.png new file mode 100644 index 0000000..12b82f8 Binary files /dev/null and b/assets/spritesheets/green_general.png differ diff --git a/assets/spritesheets/green_helicopter.png b/assets/spritesheets/green_helicopter.png new file mode 100644 index 0000000..a547560 Binary files /dev/null and b/assets/spritesheets/green_helicopter.png differ diff --git a/assets/spritesheets/green_infantry.png b/assets/spritesheets/green_infantry.png new file mode 100644 index 0000000..21a8198 Binary files /dev/null and b/assets/spritesheets/green_infantry.png differ diff --git a/assets/spritesheets/green_tank.png b/assets/spritesheets/green_tank.png new file mode 100644 index 0000000..b653151 Binary files /dev/null and b/assets/spritesheets/green_tank.png differ diff --git a/assets/spritesheets/green_wardog.png b/assets/spritesheets/green_wardog.png new file mode 100644 index 0000000..d81545e Binary files /dev/null and b/assets/spritesheets/green_wardog.png differ diff --git a/assets/spritesheets/projectFiles/artillery_green_right.png.pxo b/assets/spritesheets/projectFiles/artillery_green_right.png.pxo new file mode 100644 index 0000000..908f57f Binary files /dev/null and b/assets/spritesheets/projectFiles/artillery_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/commando_green_right.png.pxo b/assets/spritesheets/projectFiles/commando_green_right.png.pxo new file mode 100644 index 0000000..99402ab Binary files /dev/null and b/assets/spritesheets/projectFiles/commando_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/general_blue_rightTHREE.png.pxo b/assets/spritesheets/projectFiles/general_blue_rightTHREE.png.pxo new file mode 100644 index 0000000..77bc3ad Binary files /dev/null and b/assets/spritesheets/projectFiles/general_blue_rightTHREE.png.pxo differ diff --git a/assets/spritesheets/projectFiles/general_blue_rightTWO.png.pxo b/assets/spritesheets/projectFiles/general_blue_rightTWO.png.pxo new file mode 100644 index 0000000..e698248 Binary files /dev/null and b/assets/spritesheets/projectFiles/general_blue_rightTWO.png.pxo differ diff --git a/assets/spritesheets/projectFiles/general_blue_right_ONE.png.pxo b/assets/spritesheets/projectFiles/general_blue_right_ONE.png.pxo new file mode 100644 index 0000000..44ab48e Binary files /dev/null and b/assets/spritesheets/projectFiles/general_blue_right_ONE.png.pxo differ diff --git a/assets/spritesheets/projectFiles/general_green_right.png.pxo b/assets/spritesheets/projectFiles/general_green_right.png.pxo new file mode 100644 index 0000000..6ebe87d Binary files /dev/null and b/assets/spritesheets/projectFiles/general_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/green_helicopter.png b/assets/spritesheets/projectFiles/green_helicopter.png new file mode 100644 index 0000000..a547560 Binary files /dev/null and b/assets/spritesheets/projectFiles/green_helicopter.png differ diff --git a/assets/spritesheets/projectFiles/helicopter_green_right.png.pxo b/assets/spritesheets/projectFiles/helicopter_green_right.png.pxo new file mode 100644 index 0000000..09c9b4b Binary files /dev/null and b/assets/spritesheets/projectFiles/helicopter_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/infantry_blue_rightONE.png.pxo b/assets/spritesheets/projectFiles/infantry_blue_rightONE.png.pxo new file mode 100644 index 0000000..81b9135 Binary files /dev/null and b/assets/spritesheets/projectFiles/infantry_blue_rightONE.png.pxo differ diff --git a/assets/spritesheets/projectFiles/infantry_blue_rightTWO.png.pxo b/assets/spritesheets/projectFiles/infantry_blue_rightTWO.png.pxo new file mode 100644 index 0000000..6236b32 Binary files /dev/null and b/assets/spritesheets/projectFiles/infantry_blue_rightTWO.png.pxo differ diff --git a/assets/spritesheets/projectFiles/infantry_green_right.png.pxo b/assets/spritesheets/projectFiles/infantry_green_right.png.pxo new file mode 100644 index 0000000..5ebff1c Binary files /dev/null and b/assets/spritesheets/projectFiles/infantry_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/tank_green_right.png.pxo b/assets/spritesheets/projectFiles/tank_green_right.png.pxo new file mode 100644 index 0000000..2972280 Binary files /dev/null and b/assets/spritesheets/projectFiles/tank_green_right.png.pxo differ diff --git a/assets/spritesheets/projectFiles/war_dog_green_right.png.pxo b/assets/spritesheets/projectFiles/war_dog_green_right.png.pxo new file mode 100644 index 0000000..7cad92e Binary files /dev/null and b/assets/spritesheets/projectFiles/war_dog_green_right.png.pxo differ diff --git a/core/src/com/boomchess/game/BoomChess.java b/core/src/com/boomchess/game/BoomChess.java index 918c7c7..49e6fae 100644 --- a/core/src/com/boomchess/game/BoomChess.java +++ b/core/src/com/boomchess/game/BoomChess.java @@ -862,6 +862,8 @@ private void loadAllAssets() { // Loading Texture of the map + Gdx.app.log("BoomChess", "Loading Assets: Maps"); + medievalMaps = new RandomImage(); modernMaps = new RandomImage(); @@ -889,6 +891,10 @@ private void loadAllAssets() { actionOngoing = new Image(new Texture(Gdx.files.internal("Misc/actionOngoing.png"))); actionOngoing.setSize(tileSize*2.5f, tileSize*1.2f); + Gdx.app.log("BoomChess", "Loading Assets: Maps done"); + + Gdx.app.log("BoomChess", "Loading Assets: Medieval Assets"); + // load the Textures of the medieval game mode redArcher = new Texture(Gdx.files.internal("medieval/red_archer.png")); @@ -906,6 +912,10 @@ private void loadAllAssets() { redFea = new Texture(Gdx.files.internal("medieval/red_fea.png")); greenFea = new Texture(Gdx.files.internal("medieval/green_fea.png")); + Gdx.app.log("BoomChess", "Loading Assets: Medieval Assets done"); + + Gdx.app.log("BoomChess", "Loading Assets: Speech Bubbles & Obstacles"); + // textures of the obstacles obstacleTextures = new RandomImage(); @@ -933,8 +943,12 @@ private void loadAllAssets() { // Texture of the red cross of death crossOfDeathTexture = new Texture(Gdx.files.internal("Misc/crossOfDeath.png")); + Gdx.app.log("BoomChess", "Loading Assets: Speech Bubbles & Obstacles done"); + // load the sound effects into respective Objects -------------------------------------- + Gdx.app.log("BoomChess", "Loading Assets: Sound Effects"); + smallArmsSound = new RandomSound(); smallArmsSound.addSound("sounds/desert-eagle-gunshot.mp3"); smallArmsSound.addSound("sounds/Gunshot/autocannon-20mm.mp3"); @@ -1059,44 +1073,40 @@ private void loadAllAssets() { background_music = new MusicPlaylist(); background_music.addSong("music/A Little R & R.mp3", "A Little R & R", "Bert Cole"); - /* TODO not vibing with it anywhere + background_music.addSong("music/SeeingDouble.wav", "Seeing Double", + "Not Jam"); + background_music.addSong("music/First.wav", "First", + "Steek Stook"); + background_music.addSong("music/SnesPenultimateLevel.wav", "SnesPenultimateLevel", + "Steek Stook"); + background_music.addSong("music/03 - Beginnings.mp3", + "Beginnings", "Oak Thielbar"); + background_music.addSong("music/KleptoLindaCavernsB.wav", + "CavernsB", "not jam"); + + /* + TODO not vibing with it anywhere background_music.addSong("music/24 Stray cat.mp3", "Stray cat", "Garo"); - */ - /* TODO not rocking enough + TODO not rocking enough background_music.addSong("music/06 Tonal Dissonance.mp3", "Tonal Dissonance", "Garo"); background_music.addSong("music/36 Tonal Resonance.mp3", "Tonal Resonance", "Garo"); - */ - /* - // TODO not vibing + TODO not vibing background_music.addSong("music/Outside the Colosseum.mp3", "Outside the\n Colosseum", "Bert Cole\nbitbybitsound.com"); background_music.addSong("music/Song Idee Chess.mp3", "Song Idee Chess", "Wambutz"); background_music.addSong("music/Song 2.mp3", "Song 2", "Wambutz"); - /* - // TODO too loud + TODO too loud background_music.addSong("music/Boss Battle.mp3", "Boss Battle", "nostalgiac"); - - */ - /* TODO eh + TODO eh background_music.addSong("music/TypeCastTheme.wav", "TYPE:CAST", "Not Jam"); */ - background_music.addSong("music/SeeingDouble.wav", "Seeing Double", - "Not Jam"); - background_music.addSong("music/First.wav", "First", - "Steek Stook"); - background_music.addSong("music/SnesPenultimateLevel.wav", "SnesPenultimateLevel", - "Steek Stook"); - background_music.addSong("music/03 - Beginnings.mp3", - "Beginnings", "Oak Thielbar"); - background_music.addSong("music/KleptoLindaCavernsB.wav", - "CavernsB", "not jam"); // load the menu music @@ -1116,16 +1126,18 @@ private void loadAllAssets() { "Epic Battle", "Bert Cole"); creditsMusic = new MusicPlaylist(); - /* TODO vibes - creditsMusic.addSong("music/credits/Hadokowa - Loading.. - 03 囡囡 (NanNan).mp3", - "NanNan", "Hadokowa"); - */ creditsMusic.addSong("music/TouhouEuropeanQuartet.wav", "TouhouEuropeanQuartet", "Steek Stook"); - // TODO elaborate on this Song cause wow - // creditsMusic.addSong("music/credits/Hadokowa - Loading.. - 04 買狗養狗 (Get a Dog,\n Pet a Dog).mp3", - // "Get a Dog, Pet a Dog", "Hadokowa"); + + /* + TODO vibes + creditsMusic.addSong("music/credits/Hadokowa - Loading.. - 03 囡囡 (NanNan).mp3", + "NanNan", "Hadokowa"); + TODO elaborate on this Song cause wow + creditsMusic.addSong("music/credits/Hadokowa - Loading.. - 04 買狗養狗 (Get a Dog,\n Pet a Dog).mp3", + "Get a Dog, Pet a Dog", "Hadokowa"); + */ wrongMoveLogo = new Texture("Misc/WrongMove.png"); @@ -1133,6 +1145,8 @@ private void loadAllAssets() { // ---------------------------- universal Buttons for adding to stages + Gdx.app.log("BoomChess", "Loading Assets: Audio Table and Buttons"); + muteButton = new TextButton("Mute", skin); skipButton = new TextButton("Skip", skin); @@ -1247,6 +1261,7 @@ public void changed(ChangeEvent event, Actor actor) { } }); + Gdx.app.log("BoomChess", "Loading Assets: Audio Table and Buttons finished"); // for the dotted Line when damage occurs ----------------------------------------------- @@ -1308,6 +1323,8 @@ public void changed(ChangeEvent event, Actor actor) { private void loadAllAnimation() { + Gdx.app.log("BoomChess", "Loading Assets: Animations"); + Soldier[] allSoldiers = new Soldier[14]; // load all possible soldiers into the array @@ -1346,7 +1363,6 @@ private void loadAllAnimation() { redArtilleryAnimation = new soldierAnimation(allSoldiers[6]); redArtilleryAnimation.setSize(tileSize, tileSize); - /* // TODO comment out when green spritesheets are done isColourChanged = false; greenInfantryAnimation = new soldierAnimation(allSoldiers[7]); greenInfantryAnimation.setSize(tileSize, tileSize); @@ -1362,7 +1378,6 @@ private void loadAllAnimation() { greenTankAnimation.setSize(tileSize, tileSize); greenArtilleryAnimation = new soldierAnimation(allSoldiers[13]); greenArtilleryAnimation.setSize(tileSize, tileSize); - */ isColourChanged = true; blueInfantryAnimation = new soldierAnimation(allSoldiers[7]); @@ -1383,6 +1398,8 @@ private void loadAllAnimation() { blueArtilleryAnimation.setSize(tileSize, tileSize); isColourChanged = tmp; + + Gdx.app.log("BoomChess", "Loading Assets: Animations finished"); } public static void createInGameOptionStages() { @@ -1424,6 +1441,7 @@ public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) { isColourChanged = !isColourChanged; currentStage = GameStage.createGameStage(isBotMatch); + addAudioTable(); createInGameOptionStages(); } }); diff --git a/core/src/com/boomchess/game/frontend/screen/RelativeResizer.java b/core/src/com/boomchess/game/frontend/screen/RelativeResizer.java index cf2c588..e497c1b 100644 --- a/core/src/com/boomchess/game/frontend/screen/RelativeResizer.java +++ b/core/src/com/boomchess/game/frontend/screen/RelativeResizer.java @@ -81,16 +81,16 @@ private static void changeSkinBitmaps() { } else { if (tileSize > 140) { font.getData().setScale(3.5f); - BoomChess.musicLabelScale = 1.0f; + BoomChess.musicLabelScale = 1.1f; } else if (tileSize > 100) { font.getData().setScale(2.8f); - BoomChess.musicLabelScale = 0.5f; + BoomChess.musicLabelScale = 0.8f; } else if (tileSize > 50) { font.getData().setScale(2); - BoomChess.musicLabelScale = 0.25f; + BoomChess.musicLabelScale = 0.6f; } else { font.getData().setScale(1.5f); - BoomChess.musicLabelScale = 0.1f; + BoomChess.musicLabelScale = 0.4f; } }