diff --git a/src/Main.java b/src/Main.java index 9e104b2..23bc90e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -7,7 +7,7 @@ public class Main extends JFrame{ public static void main(String[] args) { JFrame frame = new JFrame("Tower Defense Refactor Mock GUI"); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.setSize(1340,640+23); + frame.setSize(640,640+23); int num = 6; int[][] nodes = new int[num][2]; nodes[0][0] = 1; @@ -31,18 +31,16 @@ public static void main(String[] args) { JPanel container = new JPanel(); - container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); + //container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); + container.setLayout(new BorderLayout(10,10)); MockGui mg = new MockGui(640,640,32, num, nodes); StatGui sg= new StatGui(0,0); - sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui - - /** - JLabel health = new JLabel("Health"); - health.setSize(100,100); - jp2.add(health);*/ - - container.add(mg); - container.add(sg); + //sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui + + //container.add(mg); + //container.add(sg); + container.add(mg, BorderLayout.CENTER); + container.add(sg, BorderLayout.PAGE_END); MapTowerDefense map = new MapTowerDefense(100, num, nodes, mg, sg); @@ -51,19 +49,8 @@ public static void main(String[] args) { sg.setup(); frame.add(container); - //frame.add(mg); frame.setVisible(true); - - - - //StatGui sg = new StatGui(100, 640); - //sg.setLocation(640, 0); - - //frame.add(sg); - - - //map.getTF().createBasicTower(14, 8); map.createMinion(MinionTypes.BASIC); mg.step(); diff --git a/src/StatGui.java b/src/StatGui.java index 5e07625..89c5344 100644 --- a/src/StatGui.java +++ b/src/StatGui.java @@ -93,7 +93,7 @@ public void actionPerformed(ActionEvent e){ } else if("select basic tower".equals(e.getActionCommand())){ BasicTowerbutton.setEnabled(true); - //set tower placer variable to place aoe tower + //set tower placer variable to place basic tower System.out.println("Basic b**ch tower selected!"); } } diff --git a/src/resources/images/Nexus Tower.png b/src/resources/images/Nexus Tower.png new file mode 100644 index 0000000..d67ba15 Binary files /dev/null and b/src/resources/images/Nexus Tower.png differ