Commit: 47 - CarnageHack (svn)

無人機動兵器ダンジョン探索ゲーム JAVAベース

Commit MetaInfo

• Revision: 47 (tree)
• Time: 2015-07-28 18:03:57
• Author: manjihq

Log Message

ソフトウェアサイズを16×16に拡大
それにともないソフトウェア編集画面をスクロール表示対応
ソフトウェア編集画面の位置だけでなく大きさも保存するように変更

Change Summary

• modified: CarnageHack2/trunk/src/CarnageHack/CarnageHack.java
• modified: CarnageHack2/trunk/src/CarnageHack/OkeSoftData.java
• modified: CarnageHack2/trunk/src/CarnageHack/OkeSoftPanel.java

Incremental Difference

--- CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 46)
+++ CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 47)
@@ -43,6 +43,7 @@
     public static Point defaultpos;
     public static Point chiptablepos;
     public static Point softtablepos;
+    public static Dimension softtablesz;
     public static Point hardwarepos;
     public static Point stockpos;
     private static Frame frame;
@@ -77,8 +78,9 @@
         update_timer = 10;
         dungeonpos = new Point();
         defaultpos = new Point();
-        chiptablepos = new Point(OkeSoftData.CHIPMAXX * 40 + 8 + 16, 0);
+        chiptablepos = new Point(328 + 16, 0);
         softtablepos = new Point();
+        softtablesz = new Dimension();
         hardwarepos = new Point();
         stockpos = new Point(320, 0);
     }
@@ -449,32 +451,33 @@
         return bauto;
     }
 
+    private void edit_software(int nsoft, String title, OkeSoftData sd) {
+        //build up software
+        Dialog dialog = new Dialog(frame, title, false);
+        OkeSoftPanel softpanel
+                = new OkeSoftPanel(this, frame, dialog, sd);
+        ScrollPane scrpane = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
+        current_edit_soft = nsoft;
+        scrpane.add(softpanel);
+        scrpane.setSize(328, 328);
+        dialog.add(scrpane);
+        dialog.pack();
+        dialog.setLocation(softtablepos);
+        if (softtablesz.width != 0 && softtablesz.height != 0) {
+            dialog.setSize(softtablesz);
+        }
+        frame.setEnabled(false);
+        dialog.setVisible(true);
+    }
+
     public void actionPerformed(ActionEvent e) {
         String cmd = e.getActionCommand();
         if (cmd.equals("SOFTWARE") == true) {
             //build up software
-            Dialog dialog = new Dialog(frame, resource.getString(
-                    "buttonSOFTWARE_A"), false);
-            OkeSoftPanel softpanel
-                    = new OkeSoftPanel(this, frame, dialog, software);
-            current_edit_soft = 1;
-            dialog.add(softpanel);
-            dialog.pack();
-            dialog.setLocation(softtablepos);
-            frame.setEnabled(false);
-            dialog.setVisible(true);
+            edit_software(1, resource.getString("buttonSOFTWARE_A"), software);
         } else if (cmd.equals("SOFTWARE2") == true) {
             //build up software 2
-            Dialog dialog = new Dialog(frame, resource.getString(
-                    "buttonSOFTWARE_B"), false);
-            OkeSoftPanel softpanel
-                    = new OkeSoftPanel(this, frame, dialog, software2);
-            current_edit_soft = 2;
-            dialog.add(softpanel);
-            dialog.pack();
-            dialog.setLocation(softtablepos);
-            frame.setEnabled(false);
-            dialog.setVisible(true);
+            edit_software(2, resource.getString("buttonSOFTWARE_B"), software2);
         } else if (cmd.equals("HARDWARE") == true) {
             //build up hardware
             Dialog dialog = new Dialog(frame, resource.getString(
@@ -562,6 +565,7 @@
             dialog.setVisible(true);
             dialog.getLocation(stockpos);
         } else if (cmd.equals("EXIT") == true) {
+            save_setup();
             frame.dispose();
         }
     }
@@ -920,6 +924,10 @@
                     int x = Integer.parseInt(field[1]);
                     int y = Integer.parseInt(field[2]);
                     softtablepos.setLocation(x, y);
+                } else if (field[0].endsWith("SOFTTABLESIZE") == true) {
+                    int hx = Integer.parseInt(field[1]);
+                    int hy = Integer.parseInt(field[2]);
+                    softtablesz.setSize(hx, hy);
                 } else if (field[0].endsWith("CHIPTABLE") == true) {
                     int x = Integer.parseInt(field[1]);
                     int y = Integer.parseInt(field[2]);
@@ -972,6 +980,10 @@
             wkline = "SOFTTABLE," + softtablepos.x + "," + softtablepos.y;
             w.write(wkline, 0, wkline.length());
             w.newLine();
+            wkline = "SOFTTABLESIZE," + softtablesz.width + ","
+                    + softtablesz.height;
+            w.write(wkline, 0, wkline.length());
+            w.newLine();
             wkline = "CHIPTABLE," + chiptablepos.x + "," + chiptablepos.y;
             w.write(wkline, 0, wkline.length());
             w.newLine();

--- CarnageHack2/trunk/src/CarnageHack/OkeSoftData.java	(revision 46)
+++ CarnageHack2/trunk/src/CarnageHack/OkeSoftData.java	(revision 47)
@@ -9,8 +9,8 @@
  */
 public class OkeSoftData {
 
-    static final int CHIPMAXX = 7;
-    static final int CHIPMAXY = 7;
+    static final int CHIPMAXX = 16;
+    static final int CHIPMAXY = 16;
     protected OkeSoftChip chips[][];
     String filename;
 

--- CarnageHack2/trunk/src/CarnageHack/OkeSoftPanel.java	(revision 46)
+++ CarnageHack2/trunk/src/CarnageHack/OkeSoftPanel.java	(revision 47)
@@ -629,6 +629,7 @@
     @Override
     public void windowClosing(WindowEvent e) {
         parent.getLocation(CarnageHack.softtablepos);
+        parent.getSize(CarnageHack.softtablesz);
         chiptable.getLocation(CarnageHack.chiptablepos);
         chiptable.dispose();
         mainframe.setEnabled(true);
@@ -640,6 +641,7 @@
         String cmd = e.getActionCommand();
         if (cmd.equals("OK") == true) {
             parent.getLocation(CarnageHack.softtablepos);
+            parent.getSize(CarnageHack.softtablesz);
             chiptable.getLocation(CarnageHack.chiptablepos);
             chiptable.dispose();
             mainframe.setEnabled(true);