#26 Done windows positioning in night watch screens

core/src/cz/nic/tablexia/game/games/night_watch/NightWatchScreen.java

@@ -4,8 +4,10 @@ import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.scenes.scene2d.Group;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Stack;
+import com.badlogic.gdx.scenes.scene2d.utils.DragListener;
 
 import java.awt.Point;
 import java.util.List;
@@ -18,6 +20,7 @@ import cz.nic.tablexia.game.games.night_watch.subscene.Watch;
 import cz.nic.tablexia.game.games.robbery.rules.GameRule;
 import cz.nic.tablexia.screen.gamemenu.GameMenuAssets;
 import cz.nic.tablexia.screen.halloffame.helper.TrophyHelper;
+import cz.nic.tablexia.util.Log;
 
 /**
  * Created by Václav Tarantík on 6.3.15.
@@ -26,7 +29,7 @@ public class NightWatchScreen extends AbstractTablexiaGame<GameRule> {
     private static final int SCREEN_WIDTH = TablexiaSettings.getWorldWidth();
     private static final int SCREEN_MIN_HEIGHT = TablexiaSettings.getMinWorldHeight();
 
-    private int difficulty;
+    private int difficulty = 2;
     private Stack contentStack;
 
     @Override
@@ -35,7 +38,7 @@ public class NightWatchScreen extends AbstractTablexiaGame<GameRule> {
         contentStack.setSize(SCREEN_WIDTH,SCREEN_MIN_HEIGHT);
         getStage().addActor(contentStack);
 
-        difficulty = getGameDifficulty().ordinal();
+//        difficulty = getGameDifficulty().ordinal();
         prepareBackground();
         prepareWindows();
         prepareWatch();
@@ -68,15 +71,25 @@ public class NightWatchScreen extends AbstractTablexiaGame<GameRule> {
     private void prepareWindows(){
         Group imageGroup = new Group();
         List<Point> windowPositions = TextureHelper.getWindowsPositions(difficulty);
-        List<String> windowsNamesList = TextureHelper.getWindowsNamesList(difficulty);
+        final List<String> windowsNamesList = TextureHelper.getWindowsNamesList(difficulty);
         for(int i = 0;i<windowsNamesList.size();i++){
-            Image windowImage = new Image(getTexture(windowsNamesList.get(i)));
+            final int currentI = i;
+            final Image windowImage = new Image(getTexture(windowsNamesList.get(i)));
             windowImage.setPosition(windowPositions.get(i).x,windowPositions.get(i).y);
+//            windowImage.addListener(new DragListener(){
+//
+//                @Override
+//                public void drag(InputEvent event, float x, float y, int pointer) {
+//                    windowImage.setPosition(event.getStageX(),event.getStageY());
+//                }
+//
+//                @Override
+//                public void dragStop(InputEvent event, float x, float y, int pointer) {
+//                    Log.info(getClass(),"IMAGE NUMBER: "+windowsNamesList.get(currentI)+"X: "+windowImage.getX()+" Y: "+windowImage.getY());
+//                }
+//            });
             imageGroup.addActor(windowImage);
         }
-//        Image windowImage = new Image(getTexture(windowsNamesList.get(15)));
-//        windowImage.setPosition(795 ,222);
-//        imageGroup.addActor(windowImage);
         contentStack.add(imageGroup);
     }
 

core/src/cz/nic/tablexia/game/games/night_watch/helper/TextureHelper.java

@@ -32,63 +32,63 @@ public class TextureHelper {
         sixteenWindowsPositions.add(new Point(735,222));//14
         sixteenWindowsPositions.add(new Point(795,222));//15
 
-        twentyFourWindowsPositions.add(new Point(0,0));//0
-        twentyFourWindowsPositions.add(new Point(0,0));//1
-        twentyFourWindowsPositions.add(new Point(0,0));//2
-        twentyFourWindowsPositions.add(new Point(0,0));//3
-        twentyFourWindowsPositions.add(new Point(0,0));//4
-        twentyFourWindowsPositions.add(new Point(0,0));//5
-        twentyFourWindowsPositions.add(new Point(0,0));//6
-        twentyFourWindowsPositions.add(new Point(0,0));//7
-        twentyFourWindowsPositions.add(new Point(0,0));//8
-        twentyFourWindowsPositions.add(new Point(0,0));//9
-        twentyFourWindowsPositions.add(new Point(0,0));//10
-        twentyFourWindowsPositions.add(new Point(0,0));//11
-        twentyFourWindowsPositions.add(new Point(0,0));//12
-        twentyFourWindowsPositions.add(new Point(0,0));//13
-        twentyFourWindowsPositions.add(new Point(0,0));//14
-        twentyFourWindowsPositions.add(new Point(0,0));//15
-        twentyFourWindowsPositions.add(new Point(0,0));//16
-        twentyFourWindowsPositions.add(new Point(0,0));//17
-        twentyFourWindowsPositions.add(new Point(0,0));//18
-        twentyFourWindowsPositions.add(new Point(0,0));//19
-        twentyFourWindowsPositions.add(new Point(0,0));//20
-        twentyFourWindowsPositions.add(new Point(0,0));//21
-        twentyFourWindowsPositions.add(new Point(0,0));//22
-        twentyFourWindowsPositions.add(new Point(0,0));//23
-
-        thirtyTwoWindowsPositions.add(new Point(0,0));//0
-        thirtyTwoWindowsPositions.add(new Point(0,0));//1
-        thirtyTwoWindowsPositions.add(new Point(0,0));//2
-        thirtyTwoWindowsPositions.add(new Point(0,0));//3
-        thirtyTwoWindowsPositions.add(new Point(0,0));//4
-        thirtyTwoWindowsPositions.add(new Point(0,0));//5
-        thirtyTwoWindowsPositions.add(new Point(0,0));//6
-        thirtyTwoWindowsPositions.add(new Point(0,0));//7
-        thirtyTwoWindowsPositions.add(new Point(0,0));//8
-        thirtyTwoWindowsPositions.add(new Point(0,0));//9
-        thirtyTwoWindowsPositions.add(new Point(0,0));//10
-        thirtyTwoWindowsPositions.add(new Point(0,0));//11
-        thirtyTwoWindowsPositions.add(new Point(0,0));//12
-        thirtyTwoWindowsPositions.add(new Point(0,0));//13
-        thirtyTwoWindowsPositions.add(new Point(0,0));//14
-        thirtyTwoWindowsPositions.add(new Point(0,0));//15
-        thirtyTwoWindowsPositions.add(new Point(0,0));//16
-        thirtyTwoWindowsPositions.add(new Point(0,0));//17
-        thirtyTwoWindowsPositions.add(new Point(0,0));//18
-        thirtyTwoWindowsPositions.add(new Point(0,0));//19
-        thirtyTwoWindowsPositions.add(new Point(0,0));//20
-        thirtyTwoWindowsPositions.add(new Point(0,0));//21
-        thirtyTwoWindowsPositions.add(new Point(0,0));//22
-        thirtyTwoWindowsPositions.add(new Point(0,0));//23
-        thirtyTwoWindowsPositions.add(new Point(0,0));//24
-        thirtyTwoWindowsPositions.add(new Point(0,0));//25
-        thirtyTwoWindowsPositions.add(new Point(0,0));//26
-        thirtyTwoWindowsPositions.add(new Point(0,0));//27
-        thirtyTwoWindowsPositions.add(new Point(0,0));//28
-        thirtyTwoWindowsPositions.add(new Point(0,0));//29
-        thirtyTwoWindowsPositions.add(new Point(0,0));//30
-        thirtyTwoWindowsPositions.add(new Point(0,0));//31
+        twentyFourWindowsPositions.add(new Point(19,138));//0
+        twentyFourWindowsPositions.add(new Point(134,151));//1
+        twentyFourWindowsPositions.add(new Point(90,371));//2
+        twentyFourWindowsPositions.add(new Point(492,386));//3
+        twentyFourWindowsPositions.add(new Point(223,94));//4
+        twentyFourWindowsPositions.add(new Point(258,227));//5
+        twentyFourWindowsPositions.add(new Point(374,254));//6
+        twentyFourWindowsPositions.add(new Point(416,257));//7
+        twentyFourWindowsPositions.add(new Point(375,185));//8
+        twentyFourWindowsPositions.add(new Point(426,311));//9
+        twentyFourWindowsPositions.add(new Point(530,317));//10
+        twentyFourWindowsPositions.add(new Point(458,226));//11
+        twentyFourWindowsPositions.add(new Point(533,219));//12
+        twentyFourWindowsPositions.add(new Point(656,371));//13
+        twentyFourWindowsPositions.add(new Point(677,288));//14
+        twentyFourWindowsPositions.add(new Point(676,212));//15
+        twentyFourWindowsPositions.add(new Point(719,397));//16
+        twentyFourWindowsPositions.add(new Point(701,298));//17
+        twentyFourWindowsPositions.add(new Point(734,206));//18
+        twentyFourWindowsPositions.add(new Point(775,415));//19
+        twentyFourWindowsPositions.add(new Point(798,287));//20
+        twentyFourWindowsPositions.add(new Point(868,293));//21
+        twentyFourWindowsPositions.add(new Point(791,175));//22
+        twentyFourWindowsPositions.add(new Point(875,94));//23
+
+        thirtyTwoWindowsPositions.add(new Point(5,259));//0
+        thirtyTwoWindowsPositions.add(new Point(88,257));//1
+        thirtyTwoWindowsPositions.add(new Point(162,257));//2
+        thirtyTwoWindowsPositions.add(new Point(294,376));//3
+        thirtyTwoWindowsPositions.add(new Point(127,387));//4
+        thirtyTwoWindowsPositions.add(new Point(7,136));//5
+        thirtyTwoWindowsPositions.add(new Point(85,146));//6
+        thirtyTwoWindowsPositions.add(new Point(157,152));//7
+        thirtyTwoWindowsPositions.add(new Point(240,224));//8
+        thirtyTwoWindowsPositions.add(new Point(240,300));//9
+        thirtyTwoWindowsPositions.add(new Point(290,299));//10
+        thirtyTwoWindowsPositions.add(new Point(297,229));//11
+        thirtyTwoWindowsPositions.add(new Point(343,294));//12
+        thirtyTwoWindowsPositions.add(new Point(353,222));//13
+        thirtyTwoWindowsPositions.add(new Point(482,307));//14
+        thirtyTwoWindowsPositions.add(new Point(526,314));//15
+        thirtyTwoWindowsPositions.add(new Point(585,321));//16
+        thirtyTwoWindowsPositions.add(new Point(469,214));//17
+        thirtyTwoWindowsPositions.add(new Point(530,227));//18
+        thirtyTwoWindowsPositions.add(new Point(590,221));//19
+        thirtyTwoWindowsPositions.add(new Point(726,364));//20
+        thirtyTwoWindowsPositions.add(new Point(870,388));//21
+        thirtyTwoWindowsPositions.add(new Point(680,268));//22
+        thirtyTwoWindowsPositions.add(new Point(734,271));//23
+        thirtyTwoWindowsPositions.add(new Point(791,271));//24
+        thirtyTwoWindowsPositions.add(new Point(854,275));//25
+        thirtyTwoWindowsPositions.add(new Point(933,273));//26
+        thirtyTwoWindowsPositions.add(new Point(679,196));//27
+        thirtyTwoWindowsPositions.add(new Point(733,197));//28
+        thirtyTwoWindowsPositions.add(new Point(791,194));//29
+        thirtyTwoWindowsPositions.add(new Point(814,128));//30
+        thirtyTwoWindowsPositions.add(new Point(933,175));//31
 
         if(sixteenWindowsPositions.size()!=16||twentyFourWindowsPositions.size()!=24||thirtyTwoWindowsPositions.size()!=32){
             throw new IllegalStateException("Incomplete windows position info");