diff --git a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
index d7da1c5bc0e1eadf7ea6b432465e56409c6f56e4..8aaab64c9d97c8a32c2fcf487890495d03b3b0ff 100644 (file)
import com.badlogic.gdx.utils.Array;
import ru.deadsoftware.cavecraft.CaveGame;
import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.game.GameItems;
import ru.deadsoftware.cavecraft.game.GameSaver;
-import ru.deadsoftware.cavecraft.game.Items;
import ru.deadsoftware.cavecraft.menu.objects.Button;
import ru.deadsoftware.cavecraft.misc.AppState;
import ru.deadsoftware.cavecraft.misc.Assets;
public class MenuRenderer extends Renderer {
- public Array<Button> menuMainButtons;
+ public Array<Button> menuMainBtns;
+ public Array<Button> menuNGBtns;
public MenuRenderer(int width) {
super(width, width * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
- menuMainButtons = new Array<Button>();
- menuMainButtons.add(new Button("New game", getWidth() / 2 - 100, getHeight() / 4));
- menuMainButtons.add(new Button("Load game", getWidth() / 2 - 100, getHeight() / 4 + 30, GameSaver.exists() ? 1 : 0));
- menuMainButtons.add(new Button("Quit", getWidth() / 2 - 100, getHeight() / 4 + 60));
+ //main menu
+ menuMainBtns = new Array<Button>();
+ menuMainBtns.add(new Button("New game", getWidth() / 2 - 100, getHeight() / 4));
+ menuMainBtns.add(new Button("Load game", getWidth() / 2 - 100, getHeight() / 4 + 30, GameSaver.exists() ? 1 : 0));
+ menuMainBtns.add(new Button("Quit", getWidth() / 2 - 100, getHeight() / 4 + 60));
+ //new game menu
+ menuNGBtns = new Array<Button>();
+ menuNGBtns.add(new Button("Survival", getWidth() / 2 - 100, getHeight() / 4, 1));
+ menuNGBtns.add(new Button("Creative", getWidth() / 2 - 100, getHeight() / 4 + 30));
+ menuNGBtns.add(new Button("Back", getWidth() / 2 - 100, getHeight() / 4 + 60));
+
}
public void buttonClicked(Button button) {
if (button.getLabel().toLowerCase().equals("new game")) {
- CaveGame.STATE = AppState.GOTO_NEW_GAME;
+ CaveGame.STATE = AppState.MENU_NEW_GAME;
} else if (button.getLabel().toLowerCase().equals("load game")) {
CaveGame.STATE = AppState.GOTO_LOAD_GAME;
} else if (button.getLabel().toLowerCase().equals("quit")) {
Gdx.app.exit();
+ } else if (button.getLabel().toLowerCase().equals("survival")) {
+ GameScreen.NEW_GAME_MODE = 0;
+ CaveGame.STATE = AppState.GOTO_NEW_GAME;
+ } else if (button.getLabel().toLowerCase().equals("creative")) {
+ GameScreen.NEW_GAME_MODE = 1;
+ CaveGame.STATE = AppState.GOTO_NEW_GAME;
+ } else if (button.getLabel().toLowerCase().equals("back")) {
+ CaveGame.STATE = AppState.MENU_MAIN;
}
}
private void drawButton(Button button) {
- spriteBatch.draw(Assets.menuButton[button.getType()], button.getX(), button.getY());
+ spriter.draw(Assets.menuBtn[button.getType()], button.getX(), button.getY());
setFontColor(255, 255, 255);
drawString(button.getLabel(),
(button.getX() + button.getWidth() / 2) - Assets.getStringWidth(button.getLabel()) / 2,
}
private void drawMenuMain() {
- for (Button button : menuMainButtons) {
+ for (Button button : menuMainBtns) {
+ if (button.getType() > 0) {
+ if (button.getRect().contains(Gdx.input.getX() * getWidth() / GameScreen.getWidth(),
+ Gdx.input.getY() * getHeight() / GameScreen.getHeight()))
+ button.setType(2);
+ else button.setType(1);
+ }
+ drawButton(button);
+ }
+ }
+
+ private void drawMenuNewGame() {
+ for (Button button : menuNGBtns) {
if (button.getType() > 0) {
if (button.getRect().contains(Gdx.input.getX() * getWidth() / GameScreen.getWidth(),
Gdx.input.getY() * getHeight() / GameScreen.getHeight()))
@Override
public void render() {
- spriteBatch.begin();
+ spriter.begin();
for (int x = 0; x <= getWidth() / 16; x++)
for (int y = 0; y <= getHeight() / 16; y++) {
- spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.get("dirt").getTexture()], x * 16, y * 16);
- spriteBatch.draw(Assets.shade, x * 16, y * 16);
+ spriter.draw(Assets.blockTex[GameItems.getBlock(3).getTex()], x * 16, y * 16);
+ spriter.draw(Assets.shade, x * 16, y * 16);
}
- spriteBatch.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 0);
+ spriter.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 0);
switch (CaveGame.STATE) {
case MENU_MAIN:
drawMenuMain();
break;
+ case MENU_NEW_GAME:
+ drawMenuNewGame();
+ break;
case GOTO_NEW_GAME:
case GOTO_LOAD_GAME:
drawLabel("Generating World...");
drawString("CaveCraft " + CaveGame.VERSION, 0,
getHeight() - Assets.getStringHeight("CaveCraft " + CaveGame.VERSION) * 1.5f);
- spriteBatch.end();
+ spriter.end();
switch (CaveGame.STATE) {
case GOTO_NEW_GAME: