提交: 32 - CarnageHack (svn)

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

Commit MetaInfo

• 修订版: 32 (tree)
• 时间: 2015-06-26 18:05:45
• 作者: manjihq

Log Message

ハードウェア設計画面の調整
ステータス表示のソフトチップ部分で例外が発生するのを修正

更改概述

• modified: CarnageHack2/trunk/src/CarnageHack/OkeSoftTracePanel.java
• modified: CarnageHack2/trunk/src/CarnageHack/OkeHardPanel.java

差异

--- CarnageHack2/trunk/src/CarnageHack/OkeSoftTracePanel.java	(revision 31)
+++ CarnageHack2/trunk/src/CarnageHack/OkeSoftTracePanel.java	(revision 32)
@@ -84,8 +84,8 @@
             for (y = 0; y < OkeSoftData.CHIPMAXY; y++) {
                 for (x = 0; x < OkeSoftData.CHIPMAXX; x++) {
                     OkeSoftChip chip = software.get(x, y);
-                    if (chip.nullchip() == false) {
-                        offg.setColor(software.get(x, y).is_condchip()
+                    if (chip != null && chip.nullchip() == false) {
+                        offg.setColor(chip.is_condchip()
                                 ? condCodeColor : normalCodeColor);
                         offg.fillRect(x * viewChipWidth + 2 + 1,
                                 y * viewChipHeight + 2 + 1,

--- CarnageHack2/trunk/src/CarnageHack/OkeHardPanel.java	(revision 31)
+++ CarnageHack2/trunk/src/CarnageHack/OkeHardPanel.java	(revision 32)
@@ -63,12 +63,14 @@
         setLayout(layout);
 
         gbc.fill = GridBagConstraints.BOTH;
+        gbc.ipadx = 4;
+        gbc.gridwidth = 1;
         gbc.weightx = 1.0;
         label = new Label(
                 CarnageHack.resource.getString("hardwareMAIN_WEAPON"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this,
                 "MAINWEAPON"));
@@ -77,16 +79,18 @@
         set_combo(choice, main_weapon_list);
         main_bullette_max = hardware.get_main_bullette();
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.CENTER;
+        gbc.weightx = 0;
         main_weapon_status = new Label();
         layout.setConstraints(main_weapon_status, gbc);
         add(main_weapon_status);
         gbc.gridwidth = 1;
+        gbc.weightx = 1.0;
         label = new Label(CarnageHack.resource.getString("hardwareBULLETTE"));
         layout.setConstraints(label, gbc);
         add(label);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
         gbc.fill = GridBagConstraints.NONE;
         gbc.anchor = GridBagConstraints.WEST;
         text = new TextField(Integer.toString(main_bullette_max), 5);
@@ -103,11 +107,10 @@
         gbc.weightx = 1.0;
         gbc.fill = GridBagConstraints.BOTH;
         gbc.anchor = GridBagConstraints.CENTER;
-        label
-                = new Label(CarnageHack.resource.getString("hardwareSUB_WEAPON"));
+        label = new Label(CarnageHack.resource.getString("hardwareSUB_WEAPON"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this,
                 "SUBWEAPON"));
@@ -116,16 +119,18 @@
         set_combo(choice, sub_weapon_list);
         sub_bullette_max = hardware.get_sub_bullette();
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.CENTER;
+        gbc.weightx = 0;
         sub_weapon_status = new Label();
         layout.setConstraints(sub_weapon_status, gbc);
         add(sub_weapon_status);
         gbc.gridwidth = 1;
+        gbc.weightx = 1.0;
         label = new Label(CarnageHack.resource.getString("hardwareBULLETTE"));
         layout.setConstraints(label, gbc);
         add(label);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
         gbc.fill = GridBagConstraints.NONE;
         gbc.anchor = GridBagConstraints.WEST;
         text = new TextField(Integer.toString(sub_bullette_max), 5);
@@ -145,7 +150,7 @@
         label = new Label(CarnageHack.resource.getString("hardwareCPU"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this, "CPU"));
         layout.setConstraints(choice, gbc);
@@ -152,7 +157,8 @@
         add(choice);
         set_combo(choice, cpu_list);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
         cpu_status = new Label();
         layout.setConstraints(cpu_status, gbc);
         add(cpu_status);
@@ -165,7 +171,7 @@
         label = new Label(CarnageHack.resource.getString("hardwareENGINE"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this, "ENGINE"));
         layout.setConstraints(choice, gbc);
@@ -172,7 +178,8 @@
         add(choice);
         set_combo(choice, engine_list);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
         engine_status = new Label();
         layout.setConstraints(engine_status, gbc);
         add(engine_status);
@@ -185,7 +192,7 @@
         label = new Label(CarnageHack.resource.getString("hardwareARMOR"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this, "ARMOR"));
         layout.setConstraints(choice, gbc);
@@ -192,7 +199,8 @@
         add(choice);
         set_combo(choice, armor_list);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
         armor_status = new Label();
         layout.setConstraints(armor_status, gbc);
         add(armor_status);
@@ -205,7 +213,7 @@
         label = new Label(CarnageHack.resource.getString("hardwareFUELTANK"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this, "FUELTANK"));
         layout.setConstraints(choice, gbc);
@@ -212,7 +220,8 @@
         add(choice);
         set_combo(choice, fueltank_list);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
         fueltank_status = new Label();
         layout.setConstraints(fueltank_status, gbc);
         add(fueltank_status);
@@ -225,7 +234,7 @@
         label = new Label(CarnageHack.resource.getString("hardwareOPTION"));
         layout.setConstraints(label, gbc);
         add(label);
-        gbc.weightx = 1.0;
+        gbc.anchor = GridBagConstraints.WEST;
         choice = new Choice();
         choice.addItemListener(new OkeHardPanelChoiceEvent(this, "OPTION"));
         layout.setConstraints(choice, gbc);
@@ -232,7 +241,8 @@
         add(choice);
         set_combo(choice, option_list);
         gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 1.0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
         option_status = new Label();
         layout.setConstraints(option_status, gbc);
         add(option_status);
@@ -271,8 +281,6 @@
         layout.setConstraints(dummy, gbc);
         add(dummy);
 
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weightx = 0.0;
         dummy = new Panel();   //ダミー
         layout.setConstraints(dummy, gbc);
         add(dummy);
@@ -417,9 +425,6 @@
             wk += "("
                     + CarnageHack.resource.getString("hardwareMOBILTY")
                     + nspeed + ")";
-            for (i = wk.length(); i <= 80; i++) {
-                wk += " ";
-            }
             total_weight.setText(wk);
         }
     }
@@ -610,6 +615,9 @@
             }
         }
         update_total_weight();
+        if (getParent() != null) {
+            getParent().validate();
+        }
     }
 
     public void action(TextField text, String cmd) {