diff --git a/core/assets/sprites/title_logo.png b/core/assets/sprites/title_logo.png index c757ba4..694286d 100644 Binary files a/core/assets/sprites/title_logo.png and b/core/assets/sprites/title_logo.png differ diff --git a/core/src/com/saltosion/gladiator/gui/creators/GameOverGUICreator.java b/core/src/com/saltosion/gladiator/gui/creators/GameOverGUICreator.java index 16a71a7..3153fd4 100644 --- a/core/src/com/saltosion/gladiator/gui/creators/GameOverGUICreator.java +++ b/core/src/com/saltosion/gladiator/gui/creators/GameOverGUICreator.java @@ -1,6 +1,8 @@ package com.saltosion.gladiator.gui.creators; import com.saltosion.gladiator.gui.nodes.ButtonNode; +import com.saltosion.gladiator.gui.nodes.GUINode; +import com.saltosion.gladiator.gui.nodes.ImageNode; import com.saltosion.gladiator.gui.nodes.TextNode; import com.saltosion.gladiator.util.AppUtil; import com.saltosion.gladiator.util.Name; @@ -12,13 +14,18 @@ public class GameOverGUICreator implements GUICreator { @Override public void create() { - TextNode titleText = new TextNode("game_title", "Gladiator Brawler Game Thing!"); - titleText.setPosition(0.23f, 0.8f); - AppUtil.guiManager.getRootNode().addChild(titleText); + ImageNode backgroundImg = new ImageNode("background_image", + SpriteLoader.loadSprite(Name.MENU_BACKGROUND)); + backgroundImg.setPosition(.5f, .5f); + AppUtil.guiManager.getRootNode().addChild(backgroundImg); + + GUINode menuNode = new GUINode("menu-node"); + menuNode.setPosition(-.5f, -.5f); + backgroundImg.addChild(menuNode); TextNode gameOverText = new TextNode("game_over", "Game over"); - gameOverText.setPosition(0.415f, 0.6f); - AppUtil.guiManager.getRootNode().addChild(gameOverText); + gameOverText.setPosition(0.315f, 0.6f); + menuNode.addChild(gameOverText); ButtonNode playButton = new ButtonNode("return_button", SpriteLoader.loadSprite(Name.BUTTON_BIG), SpriteLoader.loadSprite(Name.BUTTON_BIG_HOVER)) { @@ -31,11 +38,11 @@ public class GameOverGUICreator implements GUICreator { shouldReturn = true; } }; - playButton.setPosition(0.5f, 0.4f); + playButton.setPosition(0.4f, 0.4f); TextNode playButtonText = new TextNode("return_button_text", "Main Menu"); playButtonText.setPosition(-0.09f, 0.0175f); playButton.addChild(playButtonText); - AppUtil.guiManager.getRootNode().addChild(playButton); + menuNode.addChild(playButton); } public boolean shouldReturn() { diff --git a/core/src/com/saltosion/gladiator/gui/creators/WinGUICreator.java b/core/src/com/saltosion/gladiator/gui/creators/WinGUICreator.java index 4f0f223..743bdb1 100644 --- a/core/src/com/saltosion/gladiator/gui/creators/WinGUICreator.java +++ b/core/src/com/saltosion/gladiator/gui/creators/WinGUICreator.java @@ -1,6 +1,8 @@ package com.saltosion.gladiator.gui.creators; import com.saltosion.gladiator.gui.nodes.ButtonNode; +import com.saltosion.gladiator.gui.nodes.GUINode; +import com.saltosion.gladiator.gui.nodes.ImageNode; import com.saltosion.gladiator.gui.nodes.TextNode; import com.saltosion.gladiator.util.AppUtil; import com.saltosion.gladiator.util.Name; @@ -12,13 +14,18 @@ public class WinGUICreator implements GUICreator { @Override public void create() { - TextNode titleText = new TextNode("game_title", "Gladiator Brawler Game Thing!"); - titleText.setPosition(0.23f, 0.8f); - AppUtil.guiManager.getRootNode().addChild(titleText); + ImageNode backgroundImg = new ImageNode("background_image", + SpriteLoader.loadSprite(Name.MENU_BACKGROUND)); + backgroundImg.setPosition(.5f, .5f); + AppUtil.guiManager.getRootNode().addChild(backgroundImg); + + GUINode menuNode = new GUINode("menu-node"); + menuNode.setPosition(-.5f, -.5f); + backgroundImg.addChild(menuNode); TextNode gameOverText = new TextNode("win", "You win!"); - gameOverText.setPosition(0.415f, 0.6f); - AppUtil.guiManager.getRootNode().addChild(gameOverText); + gameOverText.setPosition(0.315f, 0.6f); + menuNode.addChild(gameOverText); ButtonNode playButton = new ButtonNode("return_button", SpriteLoader.loadSprite(Name.BUTTON_BIG), SpriteLoader.loadSprite(Name.BUTTON_BIG_HOVER)) { @@ -31,11 +38,11 @@ public class WinGUICreator implements GUICreator { shouldReturn = true; } }; - playButton.setPosition(0.5f, 0.4f); + playButton.setPosition(0.4f, 0.4f); TextNode playButtonText = new TextNode("return_button_text", "Main Menu"); playButtonText.setPosition(-0.09f, 0.0175f); playButton.addChild(playButtonText); - AppUtil.guiManager.getRootNode().addChild(playButton); + menuNode.addChild(playButton); } public boolean shouldReturn() {