Refactored menu

Arctic_Nigthmare/src/arctic_nightmare/Block.java

@@ -30,7 +30,7 @@ public class Block extends JLabel{
         {
             public void mouseClicked(MouseEvent e)  
             {
-                window.event(field);;
+                window.event(field);
             }  
         });  
     }

Arctic_Nigthmare/src/arctic_nightmare/Game.java

@@ -81,13 +81,11 @@ public class Game{
     	for(int i = 1; i < playernum + 1; i++) {
             boolean playertype = false;
             Person newperson = null;
-            Object[] options = GameWindow.getPlayerOptions(i);
-            if (((String)options[0]).equals("Eskimo")) playertype = true;
-            else if (((String)options[0]).equals("RANDOM")) playertype = (new Random()).nextBoolean();
+            String name = GameWindow.getPlayerOptions(i);
             if(i % 2 == 0)
-                newperson = playertype ? new Eskimo((String)options[1], this) : new Explorer((String)options[1], this);
+                newperson = new Eskimo(name, this);
             else
-                newperson = playertype ? new Eskimo((String)options[1], board.getfield((i + 1) * 2), this) : new Explorer((String)options[1], board.getfield((i + 1) * 2), this);
+                newperson = new Explorer(name, board.getfield((i + 1) * 2), this);
             players.add(newperson);
             if(board.getfield((i + 1) * 2).canAddPlayer()) board.getfield((i + 1) * 2).addPlayer(newperson);
                 newperson.addField(board.getfield((i + 1) * 2));

Arctic_Nigthmare/src/arctic_nightmare/GameWindow.java

@@ -156,19 +156,19 @@ public class GameWindow extends JFrame{
         return new Object[]{combo.getSelectedItem(), combo1.getSelectedItem(), combo2.getSelectedItem()};
     } 
     
-    static public Object[] getPlayerOptions(int count)
+    static public String getPlayerOptions(int count)
     {
-        String[] items = {"RANDOM", "Eskimo", "Explorer"};
-        JComboBox<String> combo = new JComboBox<>(items);
         JTextField field1 = new JTextField("Player " + count);
+        JPanel panel0 = new JPanel(new FlowLayout());
         JPanel panel = new JPanel(new GridLayout(0, 1));
-        panel.add(new JLabel("Character Type :"));
-        panel.add(combo);
         panel.add(new JLabel("Name :"));
         panel.add(field1);
-        int result = JOptionPane.showConfirmDialog(null, panel, "Set player " + count,
+        field1.setColumns(20);
+        panel0.add(panel);
+        panel0.add(new JLabel((count % 2 == 0) ? MediaAssociation.getImage("eskimo") : MediaAssociation.getImage("explorer")));
+        int result = JOptionPane.showConfirmDialog(null, panel0, "Set player " + count,
             JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE);
-        return new Object[]{combo.getSelectedItem(), field1.getText()};
+        return field1.getText();
     }
     
     static public boolean playAgain(String text)

Arctic_Nigthmare/src/arctic_nightmare/MediaAssociation.java

@@ -17,6 +17,8 @@ public class MediaAssociation {
         items.put("bear", new ImageIcon( "src/arctic_nightmare/resources/icebear.png"));
         items.put("eskimo", new ImageIcon( "src/arctic_nightmare/resources/eskimo.png"));
         items.put("explorer", new ImageIcon( "src/arctic_nightmare/resources/explorer.png"));
+        items.put("Flare", new ImageIcon( "src/arctic_nightmare/resources/signalflare_visible.png"));
+        items.put("Flare_COVERED", new ImageIcon( "src/arctic_nightmare/resources/signalflare_covered.png"));        
         items.put("Food", new ImageIcon( "src/arctic_nightmare/resources/food_visible.png"));
         items.put("Food_COVERED", new ImageIcon( "src/arctic_nightmare/resources/food_covered.png"));
         items.put("snowpile0", new ImageIcon( "src/arctic_nightmare/resources/field_0snow.png"));
@@ -38,8 +40,6 @@ public class MediaAssociation {
         items.put("Rope_COVERED", new ImageIcon( "src/arctic_nightmare/resources/rope_covered.png"));        
         items.put("Shovel", new ImageIcon( "src/arctic_nightmare/resources/shovel_visible.png"));
         items.put("Shovel_COVERED", new ImageIcon( "src/arctic_nightmare/resources/shovel_covered.png"));
-        items.put("Flare", new ImageIcon( "src/arctic_nightmare/resources/signalflare_visible.png"));
-        items.put("Flare_COVERED", new ImageIcon( "src/arctic_nightmare/resources/signalflare_covered.png"));
         items.put("tent", new ImageIcon( "src/arctic_nightmare/resources/tent_set.png"));
         items.put("Tent", new ImageIcon( "src/arctic_nightmare/resources/tent_visible.png"));
         items.put("Tent_COVERED", new ImageIcon( "src/arctic_nightmare/resources/tent_covered.png"));