Final Commit

This commit is contained in:
iryupnik 2020-06-12 09:16:15 +02:00
parent 55cd27cb21
commit 5841f050f8
5 changed files with 27 additions and 11 deletions

2
.gitignore vendored
View File

@ -15,4 +15,4 @@ InteractionCellLog.log.lck
LoadManagerLog.log LoadManagerLog.log
LoadManagerLog.log.lck LoadManagerLog.log.lck
gameOfProd.iml gameOfProd.iml
out

View File

@ -37,7 +37,11 @@ public class WindowOfMenu extends JPanel {
setIgnoreRepaint(true); setIgnoreRepaint(true);
this.game = game; this.game = game;
this.freeMove = game.getFreeMove(); 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 newImg = null;
Image loadImg = null; Image loadImg = null;
Image loadImgDisabled = null; Image loadImgDisabled = null;

View File

@ -14,7 +14,7 @@
<trigger> <trigger>
<x>6</x> <x>6</x>
<y>4</y> <y>4</y>
<active>true</active> <active>false</active>
</trigger> </trigger>
<trigger> <trigger>
<x>14</x> <x>14</x>
@ -24,7 +24,7 @@
<chest> <chest>
<x>1</x> <x>1</x>
<y>2</y> <y>2</y>
<active>true</active> <active>false</active>
</chest> </chest>
<chest> <chest>
<x>15</x> <x>15</x>
@ -74,7 +74,7 @@
<chest> <chest>
<x>1</x> <x>1</x>
<y>9</y> <y>9</y>
<active>true</active> <active>false</active>
</chest> </chest>
<door> <door>
<x>12</x> <x>12</x>
@ -110,7 +110,7 @@
<x>2</x> <x>2</x>
<y>12</y> <y>12</y>
<locked>false</locked> <locked>false</locked>
<open>false</open> <open>true</open>
</dooŕ> </dooŕ>
<door> <door>
<x>17</x> <x>17</x>
@ -158,7 +158,7 @@
<x>6</x> <x>6</x>
<y>1</y> <y>1</y>
<locked>false</locked> <locked>false</locked>
<open>false</open> <open>true</open>
</dooŕ> </dooŕ>
</events> </events>
</map> </map>

View File

@ -0,0 +1,12 @@
<item>
<name>cup-o'-coffee</name>
<multiplicity>1</multiplicity>
<image>295</image>
<action>heal</action>
</item>
<item>
<name>blue-key-card</name>
<multiplicity>1</multiplicity>
<image>39</image>
<action>key</action>
</item>

View File

@ -1,6 +1,6 @@
<location> <location>
<map>office</map> <map>storageroom</map>
<x>8</x> <x>6</x>
<y>7</y> <y>2</y>
<direction>3</direction> <direction>0</direction>
</location> </location>