Skip to content

Commit

Permalink
more animations
Browse files Browse the repository at this point in the history
  • Loading branch information
mklemmingen committed Jan 13, 2024
1 parent 9148c56 commit 60b0626
Show file tree
Hide file tree
Showing 35 changed files with 52 additions and 34 deletions.
File renamed without changes
Binary file removed assets/greenTeam/general_green_right_1.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_2.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_3.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_4.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_5.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_6.png
Binary file not shown.
Binary file removed assets/greenTeam/general_green_right_7.png
Binary file not shown.
Binary file added assets/spritesheets/blue_general1.png
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 assets/spritesheets/blue_general2.png
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 assets/spritesheets/blue_general3.png
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 assets/spritesheets/blue_infantry1.png
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 assets/spritesheets/blue_infantry2.png
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 assets/spritesheets/green_artillery.png
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 assets/spritesheets/green_commando.png
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 assets/spritesheets/green_general.png
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 assets/spritesheets/green_helicopter.png
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 assets/spritesheets/green_infantry.png
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 assets/spritesheets/green_tank.png
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 assets/spritesheets/green_wardog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
78 changes: 48 additions & 30 deletions core/src/com/boomchess/game/BoomChess.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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"));
Expand All @@ -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();
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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

Expand All @@ -1116,23 +1126,27 @@ 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");

Gdx.app.log("BoomChess", "Loading Assets: Music finished");

// ---------------------------- 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);
Expand Down Expand Up @@ -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 -----------------------------------------------

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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]);
Expand All @@ -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() {
Expand Down Expand Up @@ -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();
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 60b0626

Please sign in to comment.