diff --git a/.gitignore b/.gitignore index 1f28315..3659b33 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ InteractionCellLog.log.lck LoadManagerLog.log LoadManagerLog.log.lck gameOfProd.iml - +out diff --git a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfMenu.java b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfMenu.java index d2d2bf1..222e92f 100644 --- a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfMenu.java +++ b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfMenu.java @@ -37,7 +37,11 @@ public class WindowOfMenu extends JPanel { setIgnoreRepaint(true); this.game = game; this.freeMove = game.getFreeMove(); - screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); + int width = gd.getDisplayMode().getWidth(); + int height = gd.getDisplayMode().getHeight(); + //screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + screenSize = new Dimension(width, height); Image newImg = null; Image loadImg = null; Image loadImgDisabled = null; diff --git a/src/main/resources/save/savedGame/events.txt b/src/main/resources/save/savedGame/events.txt index ecd9763..dc7fbef 100644 --- a/src/main/resources/save/savedGame/events.txt +++ b/src/main/resources/save/savedGame/events.txt @@ -14,7 +14,7 @@ 6 4 - true + false 14 @@ -24,7 +24,7 @@ 1 2 - true + false 15 @@ -74,7 +74,7 @@ 1 9 - true + false 12 @@ -110,7 +110,7 @@ 2 12 false - false + true 17 @@ -158,7 +158,7 @@ 6 1 false - false + true diff --git a/src/main/resources/save/savedGame/inventory.txt b/src/main/resources/save/savedGame/inventory.txt index e69de29..344d3fd 100644 --- a/src/main/resources/save/savedGame/inventory.txt +++ b/src/main/resources/save/savedGame/inventory.txt @@ -0,0 +1,12 @@ + + cup-o'-coffee + 1 + 295 + heal + + + 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 2c7cd7c..ec0fcae 100644 --- a/src/main/resources/save/savedGame/person.txt +++ b/src/main/resources/save/savedGame/person.txt @@ -1,6 +1,6 @@ - office - 8 - 7 - 3 + storageroom + 6 + 2 + 0 \ No newline at end of file