diff --git a/src/main/java/ruscz/game/gameOfProd/BattleUI/ConsoleInput.java b/src/main/java/ruscz/game/gameOfProd/BattleUI/ConsoleInput.java index 40f4ab9..b62c4e9 100644 --- a/src/main/java/ruscz/game/gameOfProd/BattleUI/ConsoleInput.java +++ b/src/main/java/ruscz/game/gameOfProd/BattleUI/ConsoleInput.java @@ -4,15 +4,19 @@ import ruscz.game.gameOfProd.Windows.WindowOfBattle; import javax.swing.*; +import java.awt.*; + import static ruscz.game.gameOfProd.Windows.WindowOfBattle.*; public class ConsoleInput extends JPanel { - private JTextPane input; - private JButton submit; - private JButton list; - private JButton exit; + private final JTextPane input; + private final JButton submit; + private final JButton list; + private final JButton exit; public ConsoleInput(WindowOfBattle window) { + setLayout(new GridLayout(2, 2)); + setSize(CELL_SIZE * (CANVAS_WIDTH - 4), CELL_SIZE); setLocation(CELL_SIZE * 4, CELL_SIZE * CANVAS_HEIGHT * 3 / 4 - CELL_SIZE); setVisible(false); @@ -39,8 +43,8 @@ public class ConsoleInput extends JPanel { window.getMenuOfActions().getAttack().setEnabled(true); window.getMenuOfActions().getConsole().setEnabled(true); - window.getMenuOfActions().getConsole().setEnabled(true); - window.getMenuOfActions().getConsole().setEnabled(true); + window.getMenuOfActions().getInventory().setEnabled(true); + window.getMenuOfActions().getEscape().setEnabled(true); }); add(input); diff --git a/src/main/java/ruscz/game/gameOfProd/BattleUI/MenuOfActions.java b/src/main/java/ruscz/game/gameOfProd/BattleUI/MenuOfActions.java index 3c43956..b3e827e 100644 --- a/src/main/java/ruscz/game/gameOfProd/BattleUI/MenuOfActions.java +++ b/src/main/java/ruscz/game/gameOfProd/BattleUI/MenuOfActions.java @@ -8,12 +8,14 @@ import java.awt.*; import static ruscz.game.gameOfProd.Windows.WindowOfBattle.*; public class MenuOfActions extends JPanel { - private JButton attack; - private JButton console; - private JButton inventory; - private JButton escape; + private final JButton attack; + private final JButton console; + private final JButton inventory; + private final JButton escape; public MenuOfActions(WindowOfBattle window) { + setLayout(new GridLayout(4,1)); + setSize(CELL_SIZE * CANVAS_WIDTH / 3, CELL_SIZE * CANVAS_HEIGHT / 4); setLocation(CELL_SIZE * CANVAS_WIDTH * 2 / 3, CELL_SIZE * CANVAS_HEIGHT * 3 / 4); setBackground(Color.green); diff --git a/src/main/java/ruscz/game/gameOfProd/Game.java b/src/main/java/ruscz/game/gameOfProd/Game.java index caa5c4c..5184f43 100644 --- a/src/main/java/ruscz/game/gameOfProd/Game.java +++ b/src/main/java/ruscz/game/gameOfProd/Game.java @@ -12,11 +12,11 @@ import java.awt.*; public class Game extends JFrame { private static final int WINDOW_WIDTH = 13; private static final int WINDOW_HEIGHT = 13; - public static final int CELL_SIZE = 50; + public static final int CELL_SIZE = 60; - private WindowOfMenu menu; - private WindowOfFreeMove freeMove; - private WindowOfBattle battle; + private final WindowOfMenu menu; + private final WindowOfFreeMove freeMove; + private final WindowOfBattle battle; private TilesetOverview tilesetOverview; public WindowOfMenu getMenu() { @@ -41,7 +41,7 @@ public class Game extends JFrame { battle = new WindowOfBattle(this); //tohle spustí na začátku menu -// add(menu); + add(menu); //tohle spustí na začátku hru // add(freeMove); @@ -52,7 +52,7 @@ public class Game extends JFrame { // battle.startBattle(); //Tohle spustí na začátku tileset overview - new LevelEditor(); +// new LevelEditor(); setDefaultCloseOperation(EXIT_ON_CLOSE); setUndecorated(true); diff --git a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java index e5714f0..7de5fdd 100644 --- a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java +++ b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.LinkedList; public class WindowOfFreeMove extends JLayeredPane { - public static final int CELL_SIZE = 50; + public static final int CELL_SIZE = 70; public static int CANVAS_WIDTH = 50; public static int CANVAS_HEIGHT = 50; public static final int WINDOW_WIDTH = 13; diff --git a/src/main/resources/save/savedGame/events.txt b/src/main/resources/save/savedGame/events.txt index 8b367ec..e69de29 100644 --- a/src/main/resources/save/savedGame/events.txt +++ b/src/main/resources/save/savedGame/events.txt @@ -1,65 +0,0 @@ - - tutorial - - - 11 - 6 - false - - - - - openspace - - - 6 - 4 - true - - - 14 - 16 - false - - - 15 - 7 - true - - - - - office - - - 4 - 2 - false - - - 1 - 9 - false - - - - - boss - - - 4 - 18 - true - - - - - treasure - - - 6 - 1 - true - - - diff --git a/src/main/resources/save/savedGame/inventory.txt b/src/main/resources/save/savedGame/inventory.txt index ad81884..e69de29 100644 --- a/src/main/resources/save/savedGame/inventory.txt +++ b/src/main/resources/save/savedGame/inventory.txt @@ -1,6 +0,0 @@ - - blue-key-card - 1 - 39 - key - diff --git a/src/main/resources/save/savedGame/person.txt b/src/main/resources/save/savedGame/person.txt index da4d904..e69de29 100644 --- a/src/main/resources/save/savedGame/person.txt +++ b/src/main/resources/save/savedGame/person.txt @@ -1,6 +0,0 @@ - - openspace - 8 - 16 - 3 - \ No newline at end of file diff --git a/src/main/resources/save/savedGame/village.txt b/src/main/resources/save/savedGame/village.txt index 1b4bc7b..e69de29 100644 --- a/src/main/resources/save/savedGame/village.txt +++ b/src/main/resources/save/savedGame/village.txt @@ -1 +0,0 @@ -TODO: Village \ No newline at end of file