Commit: a9ba9e76724a2c0fe90c499e676ae3eb797dbc5e - SpaceRocket (hg)

Commit MetaInfo

• Revision: a9ba9e76724a2c0fe90c499e676ae3eb797dbc5e (tree)
• Zeit: 2022-01-10 02:40:15
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Cosmetic changes. Readded difficulty selection menu.

Ändern Zusammenfassung

• modified: core/src/com/headwayent/spacerocket/CreditsActivity.java
• modified: core/src/com/headwayent/spacerocket/HelpActivity.java
• modified: core/src/com/headwayent/spacerocket/HighScoreActivity.java
• modified: core/src/com/headwayent/spacerocket/MainMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/Utility.java
• modified: core/src/com/headwayent/spacerocket/old/DifficultySelection.java

Diff

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/CreditsActivity.java
--- a/core/src/com/headwayent/spacerocket/CreditsActivity.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/CreditsActivity.java	Sun Jan 09 19:40:15 2022 +0200
@@ -41,11 +41,12 @@
 		String creditsString = "SPACEROCKET\n" +
 				"Programmed by Sebastian Bugiu\n" +
 				"Art by Alex Bratu\n" +
+				"Powered by libGDX\n" +
 				"Headway Tech Copyright 2009 - 2022";
 		titleLabel.setText("Credits");
 		creditsLabel.setText(creditsString);
 
-		final TextButton backButton = new TextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+		final TextButton backButton = Utility.createTextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
 		backButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/HelpActivity.java
--- a/core/src/com/headwayent/spacerocket/HelpActivity.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/HelpActivity.java	Sun Jan 09 19:40:15 2022 +0200
@@ -99,7 +99,7 @@
 		ScrollPane scrollPane = new ScrollPane(label, skin);
 		scrollPane.setScrollingDisabled(true, false);
 
-		final TextButton backButton = new TextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+		final TextButton backButton = Utility.createTextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
 		backButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/HighScoreActivity.java
--- a/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Jan 09 19:40:15 2022 +0200
@@ -107,7 +107,7 @@
 			table.row().pad(10, 10, 0, 10);
 		}
 
-		final TextButton backButton = new TextButton("Done", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+		final TextButton backButton = Utility.createTextButton("Done", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
 		backButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/MainMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 09 19:40:15 2022 +0200
@@ -6,10 +6,12 @@
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.ScreenUtils;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 
@@ -36,29 +38,34 @@
         Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
 
         //create buttons
-        TextButton resumeGame = new TextButton("Resume Game", skin);
-        TextButton newGame = new TextButton("New Game", skin);
-        TextButton preferences = new TextButton("Preferences", skin);
-        TextButton highScore = new TextButton("High Score", skin);
-        TextButton help = new TextButton("How to play", skin);
-        TextButton credits = new TextButton("Credits", skin);
-        TextButton exit = new TextButton("Exit", skin);
+        Label title = new Label("HotShot", skin);
+        title.setAlignment(Align.center);
+        title.setFontScale(2.0f);
+        TextButton resumeGame = Utility.createTextButton("Resume Game", skin);
+        TextButton newGame = Utility.createTextButton("New Game", skin);
+        TextButton preferences = Utility.createTextButton("Preferences", skin);
+        TextButton highScore = Utility.createTextButton("High Score", skin);
+        TextButton help = Utility.createTextButton("How to play", skin);
+        TextButton credits = Utility.createTextButton("Credits", skin);
+        TextButton exit = Utility.createTextButton("Exit", skin);
 
+        table.add(title).fillX().uniformX();
+        table.row().pad(20, 20, 0, 20);
         //add buttons to table
         if (SpaceRocket.getGame().isSessionResumeAvailable()) {
             table.add(resumeGame).fillX().uniformX();
-            table.row().pad(10, 0, 0, 0);
+            table.row().pad(10, 20, 0, 20);
         }
         table.add(newGame).fillX().uniformX();
-        table.row().pad(10, 0, 0, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(preferences).fillX().uniformX();
-        table.row().pad(10, 0, 0, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(highScore).fillX().uniformX();
-        table.row().pad(10, 0, 0, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(help).fillX().uniformX();
-        table.row().pad(10, 0, 0, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(credits).fillX().uniformX();
-        table.row().pad(10, 0, 0, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(exit).fillX().uniformX();
 
         // create button listeners

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Sun Jan 09 19:40:15 2022 +0200
@@ -88,7 +88,7 @@
 		});
 
 
-		final TextButton backButton = new TextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+		final TextButton backButton = Utility.createTextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
 		backButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/Utility.java
--- a/core/src/com/headwayent/spacerocket/Utility.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/Utility.java	Sun Jan 09 19:40:15 2022 +0200
@@ -2,6 +2,8 @@
 
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 
 public class Utility {
 
@@ -51,4 +53,10 @@
     public static float clamp(float val, float min, float max) {
         return Math.max(min, Math.min(max, val));
     }
+
+    public static TextButton createTextButton(String text, Skin skin) {
+        TextButton textButton = new TextButton(text, skin);
+        textButton.pad(10.0f);
+        return textButton;
+    }
 }

diff -r 953854125e19 -r a9ba9e76724a core/src/com/headwayent/spacerocket/old/DifficultySelection.java
--- a/core/src/com/headwayent/spacerocket/old/DifficultySelection.java	Sun Jan 09 17:53:30 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/DifficultySelection.java	Sun Jan 09 19:40:15 2022 +0200
@@ -4,13 +4,16 @@
 import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.ScreenUtils;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 /**
  *
@@ -49,7 +52,6 @@
 
     public DifficultySelection() {
         stage = new Stage(new ScreenViewport());
-        Gdx.input.setInputProcessor(stage);
     }
 
     public void show() {
@@ -59,20 +61,37 @@
         //table.setDebug(true);
         stage.addActor(table);
 
+        Gdx.input.setInputProcessor(stage);
+
         // temporary until we have asset manager in
         Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
 
+        Label title = new Label("Select difficulty", skin);
+        title.setAlignment(Align.center);
+        title.setFontScale(2.0f);
         //create buttons
-        TextButton easy = new TextButton("Easy", skin);
-        TextButton medium = new TextButton("Medium", skin);
-        TextButton hard = new TextButton("Hard", skin);
+        TextButton easy = Utility.createTextButton("Easy", skin);
+        TextButton medium = Utility.createTextButton("Medium", skin);
+        TextButton hard = Utility.createTextButton("Hard", skin);
+
+        final TextButton backButton = Utility.createTextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+        backButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.MAIN_MENU);
+            }
+        });
 
         //add buttons to table
+        table.add(title).fillX().uniformX();
+        table.row().pad(20, 20, 0, 20);
         table.add(easy).fillX().uniformX();
-        table.row().pad(10, 0, 10, 0);
+        table.row().pad(10, 20, 0, 20);
         table.add(medium).fillX().uniformX();
-        table.row();
+        table.row().pad(10, 20, 0, 20);
         table.add(hard).fillX().uniformX();
+        table.row().pad(10, 20, 0, 20);
+        table.add(backButton).fillX().uniformX();
 
         final SpaceRocket game = SpaceRocket.getGame();
         easy.addListener(new ChangeListener() {
@@ -102,9 +121,9 @@
             }
         });
 
-        difficulty = Difficulty.HARD;
-        game.changeScreen(SpaceRocket.Screen.IN_GAME);
-        startGame();
+//        difficulty = Difficulty.HARD;
+//        game.changeScreen(SpaceRocket.Screen.IN_GAME);
+//        startGame();
     }
 
     @Override