無人機動兵器ダンジョン探索ゲーム JAVAベース
ダンジョン探索中のステータス表示にソフトウェアチップパネル状態を追加
| @@ -24,7 +24,7 @@ | ||
| 24 | 24 | */ |
| 25 | 25 | public final class CarnageHack extends Panel implements ActionListener { |
| 26 | 26 | |
| 27 | - public static final String version = "CarnageHack2 1.2.0 alpha"; | |
| 27 | + public static final String version = "CarnageHack2 V1.3.0 alpha"; | |
| 28 | 28 | public static final ResourceBundle resource; |
| 29 | 29 | public static CHArrayList main_weapon_list; |
| 30 | 30 | public static CHArrayList sub_weapon_list; |
| @@ -0,0 +1,115 @@ | ||
| 1 | +package CarnageHack; | |
| 2 | + | |
| 3 | +import java.awt.Canvas; | |
| 4 | +import java.awt.Color; | |
| 5 | +import java.awt.Dimension; | |
| 6 | +import java.awt.Graphics; | |
| 7 | +import java.awt.Image; | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * ソフトウェアトレース表示パネル | |
| 11 | + * | |
| 12 | + * @author fukui | |
| 13 | + */ | |
| 14 | +public class OkeSoftTracePanel extends Canvas { | |
| 15 | + | |
| 16 | + static final Color baseColor = new Color(0, 0, 0); | |
| 17 | + static final Color greenChipColor = new Color(0, 127, 0); | |
| 18 | + static final Color redChipColor = new Color(127, 0, 0); | |
| 19 | + static final Color greenFocusChipColor = new Color(0, 255, 0); | |
| 20 | + static final Color redFocusChipColor = new Color(255, 0, 0); | |
| 21 | + static final Color normalCodeColor = new Color(0, 0, 127); | |
| 22 | + static final Color condCodeColor = new Color(127, 0, 127); | |
| 23 | + Oke.ChipTrace traceData[]; | |
| 24 | + OkeSoftData software; | |
| 25 | + | |
| 26 | + /** | |
| 27 | + * コンストラクタ | |
| 28 | + * | |
| 29 | + */ | |
| 30 | + OkeSoftTracePanel() { | |
| 31 | + super(); | |
| 32 | + traceData = null; | |
| 33 | + software = null; | |
| 34 | + } | |
| 35 | + | |
| 36 | + @Override | |
| 37 | + public Dimension getPreferredSize() { | |
| 38 | + return new Dimension(OkeSoftData.CHIPMAXX * 10 + 4, | |
| 39 | + OkeSoftData.CHIPMAXY * 10 + 4); | |
| 40 | + } | |
| 41 | + | |
| 42 | + @Override | |
| 43 | + public Dimension getMinimumSize() { | |
| 44 | + return new Dimension(OkeSoftData.CHIPMAXX * 10 + 4, | |
| 45 | + OkeSoftData.CHIPMAXY * 10 + 4); | |
| 46 | + } | |
| 47 | + | |
| 48 | + @Override | |
| 49 | + public void update(Graphics g) { | |
| 50 | + paint(g); | |
| 51 | + } | |
| 52 | + | |
| 53 | + @Override | |
| 54 | + public void paint(Graphics g) { | |
| 55 | + int x; | |
| 56 | + int y; | |
| 57 | + int nwidth = OkeSoftData.CHIPMAXX * 10 + 4; | |
| 58 | + int nheight = OkeSoftData.CHIPMAXY * 10 + 4; | |
| 59 | + Image offscreen = createImage(nwidth, nheight); | |
| 60 | + Graphics offg = offscreen.getGraphics(); | |
| 61 | + offg.setColor(baseColor); | |
| 62 | + offg.fillRect(0, 0, nwidth, nheight); | |
| 63 | + offg.setColor(Color.YELLOW); | |
| 64 | + for (y = 0; y < OkeSoftData.CHIPMAXY; y++) { | |
| 65 | + for (x = 0; x < OkeSoftData.CHIPMAXX; x++) { | |
| 66 | + offg.drawRect(x * 10 + 2, y * 10 + 2, 10, 10); | |
| 67 | + } | |
| 68 | + } | |
| 69 | + if (software != null) { | |
| 70 | + for (y = 0; y < OkeSoftData.CHIPMAXY; y++) { | |
| 71 | + for (x = 0; x < OkeSoftData.CHIPMAXX; x++) { | |
| 72 | + OkeSoftChip chip = software.get(x, y); | |
| 73 | + if (chip.nullchip() == false) { | |
| 74 | + offg.setColor(software.get(x, y).is_condchip() | |
| 75 | + ? condCodeColor : normalCodeColor); | |
| 76 | + offg.fillRect(x * 10 + 2 + 1, y * 10 + 2 + 1, 8, 8); | |
| 77 | + } | |
| 78 | + } | |
| 79 | + } | |
| 80 | + } | |
| 81 | + if (traceData != null) { | |
| 82 | + int i; | |
| 83 | + int nmax = traceData.length - 1; | |
| 84 | + for (i = 0; i < nmax; i++) { | |
| 85 | + offg.setColor(traceData[i].get_branch() | |
| 86 | + ? redChipColor : greenChipColor); | |
| 87 | + offg.fillRect(traceData[i].get_position_x() * 10 + 2 + 1, | |
| 88 | + traceData[i].get_position_y() * 10 + 2 + 1, 8, 8); | |
| 89 | + } | |
| 90 | + if (i > 0) { | |
| 91 | + //最終チップだけフォーカス表示 | |
| 92 | + offg.setColor(traceData[i].get_branch() | |
| 93 | + ? redFocusChipColor : greenFocusChipColor); | |
| 94 | + offg.fillRect(traceData[i].get_position_x() * 10 + 2 + 1, | |
| 95 | + traceData[i].get_position_y() * 10 + 2 + 1, 8, 8); | |
| 96 | + } | |
| 97 | + } | |
| 98 | + g.drawImage(offscreen, 0, 0, this); | |
| 99 | + } | |
| 100 | + | |
| 101 | + /** | |
| 102 | + * トレース対象のOKEを設定 | |
| 103 | + * | |
| 104 | + * @param p トレース対象OKE | |
| 105 | + */ | |
| 106 | + public void set_trace(Oke p) { | |
| 107 | + if (p != null) { | |
| 108 | + traceData = p.get_trace(); | |
| 109 | + software = p.get_software(); | |
| 110 | + } else { | |
| 111 | + traceData = null; | |
| 112 | + } | |
| 113 | + repaint(); | |
| 114 | + } | |
| 115 | +} |
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | package CarnageHack; |
| 2 | 2 | |
| 3 | 3 | import java.io.*; |
| 4 | +import java.util.ArrayList; | |
| 4 | 5 | |
| 5 | 6 | /** |
| 6 | 7 | * OKEデータ |
| @@ -130,6 +131,96 @@ | ||
| 130 | 131 | int lastdamage; |
| 131 | 132 | int destroycount; |
| 132 | 133 | |
| 134 | +// <editor-fold defaultstate="collapsed" desc="ChipTrace class"> | |
| 135 | + public class ChipTrace implements Cloneable { | |
| 136 | + | |
| 137 | + int chipx; | |
| 138 | + int chipy; | |
| 139 | + boolean bbranch; //trueの時赤矢印 | |
| 140 | + | |
| 141 | + ChipTrace() { | |
| 142 | + chipx = -1; | |
| 143 | + chipy = -1; | |
| 144 | + bbranch = false; | |
| 145 | + } | |
| 146 | + | |
| 147 | + ChipTrace(int x, int y, boolean b) { | |
| 148 | + chipx = x; | |
| 149 | + chipy = y; | |
| 150 | + bbranch = b; | |
| 151 | + } | |
| 152 | + | |
| 153 | + @Override | |
| 154 | + public String toString() { | |
| 155 | + StringBuilder retstr = new StringBuilder(); | |
| 156 | + retstr.append(chipx); | |
| 157 | + retstr.append(','); | |
| 158 | + retstr.append(chipy); | |
| 159 | + retstr.append(','); | |
| 160 | + retstr.append(bbranch ? "RED" : "GREEN"); | |
| 161 | + return retstr.toString(); | |
| 162 | + } | |
| 163 | + | |
| 164 | + @Override | |
| 165 | + protected Object clone() throws CloneNotSupportedException { | |
| 166 | + ChipTrace s = (ChipTrace) super.clone(); | |
| 167 | + s.chipx = chipx; | |
| 168 | + s.chipy = chipy; | |
| 169 | + s.bbranch = bbranch; | |
| 170 | + return s; | |
| 171 | + } | |
| 172 | + | |
| 173 | + /** | |
| 174 | + * トレースチップ座標設定 | |
| 175 | + * | |
| 176 | + * @param x チップX座標 | |
| 177 | + * @param y チップY座標 | |
| 178 | + */ | |
| 179 | + public void set_position(int x, int y) { | |
| 180 | + chipx = x; | |
| 181 | + chipy = y; | |
| 182 | + } | |
| 183 | + | |
| 184 | + /** | |
| 185 | + * トレースチップ座標X取得 | |
| 186 | + * | |
| 187 | + * @return 取得した座標 | |
| 188 | + */ | |
| 189 | + public int get_position_x() { | |
| 190 | + return chipx; | |
| 191 | + } | |
| 192 | + | |
| 193 | + /** | |
| 194 | + * トレースチップ座標Y取得 | |
| 195 | + * | |
| 196 | + * @return 取得した座標 | |
| 197 | + */ | |
| 198 | + public int get_position_y() { | |
| 199 | + return chipy; | |
| 200 | + } | |
| 201 | + | |
| 202 | + /** | |
| 203 | + * 分岐状態設定 | |
| 204 | + * | |
| 205 | + * @param b 分岐状態(trueの時赤矢印) | |
| 206 | + */ | |
| 207 | + public void set_branch(boolean b) { | |
| 208 | + bbranch = b; | |
| 209 | + } | |
| 210 | + | |
| 211 | + /** | |
| 212 | + * 分岐状態取得 | |
| 213 | + * | |
| 214 | + * @return 取得した分岐状態 | |
| 215 | + */ | |
| 216 | + public boolean get_branch() { | |
| 217 | + return bbranch; | |
| 218 | + } | |
| 219 | + }; | |
| 220 | +// </editor-fold> | |
| 221 | + | |
| 222 | + ArrayList<ChipTrace> traceList; | |
| 223 | + | |
| 133 | 224 | /** |
| 134 | 225 | * コンストラクタ |
| 135 | 226 | * |
| @@ -165,6 +256,7 @@ | ||
| 165 | 256 | recalc_speed(); |
| 166 | 257 | backpack = new CHArrayList(); |
| 167 | 258 | fuel = hardware.get_fueltank().get_fuel(); |
| 259 | + traceList = new ArrayList<ChipTrace>(); | |
| 168 | 260 | } |
| 169 | 261 | |
| 170 | 262 | /** |
| @@ -221,6 +313,7 @@ | ||
| 221 | 313 | speed_count = 0; |
| 222 | 314 | tempture = 0; |
| 223 | 315 | recalc_speed(); |
| 316 | + traceList = new ArrayList<ChipTrace>(); | |
| 224 | 317 | } |
| 225 | 318 | |
| 226 | 319 | /** |
| @@ -255,10 +348,13 @@ | ||
| 255 | 348 | if (hp == 0 || software == null) { |
| 256 | 349 | return; |
| 257 | 350 | } |
| 351 | + traceList.clear(); | |
| 258 | 352 | for (i = 0; i < nspeed; i++) { |
| 259 | 353 | int narrow; |
| 260 | 354 | OkeSoftChip chip = software.get(chipx, chipy); |
| 355 | + ChipTrace tr = new ChipTrace(chipx, chipy, false); | |
| 261 | 356 | if (chip == null || chip.nullchip() == true) { |
| 357 | + traceList.add(tr); | |
| 262 | 358 | if (chipx == 0 && chipy == 0) { |
| 263 | 359 | //?? invalid software |
| 264 | 360 | action = ACTION_SELFDESTRUCT; |
| @@ -272,10 +368,13 @@ | ||
| 272 | 368 | if (chip.exec(dungeon, this) == false) { |
| 273 | 369 | //green arrow |
| 274 | 370 | narrow = chip.get_green_arrow(); |
| 371 | + tr.set_branch(false); | |
| 275 | 372 | } else { |
| 276 | 373 | //red arrow |
| 277 | 374 | narrow = chip.get_red_arrow(); |
| 375 | + tr.set_branch(true); | |
| 278 | 376 | } |
| 377 | + traceList.add(tr); | |
| 279 | 378 | if (chipx == -1 && chipy == -1) { |
| 280 | 379 | //change software |
| 281 | 380 | chipx = 0; |
| @@ -1371,6 +1470,15 @@ | ||
| 1371 | 1470 | } |
| 1372 | 1471 | |
| 1373 | 1472 | /** |
| 1473 | + * 現在のソフトウェア番号 | |
| 1474 | + * | |
| 1475 | + * @return ソフトウェア番号 | |
| 1476 | + */ | |
| 1477 | + public int get_current_software() { | |
| 1478 | + return current_software; | |
| 1479 | + } | |
| 1480 | + | |
| 1481 | + /** | |
| 1374 | 1482 | * 機体ステータスの処理パラメータ取得 |
| 1375 | 1483 | * |
| 1376 | 1484 | * @return 現在の処理パラメータ |
| @@ -1397,6 +1505,17 @@ | ||
| 1397 | 1505 | return chipy; |
| 1398 | 1506 | } |
| 1399 | 1507 | |
| 1508 | + /** | |
| 1509 | + * ソフトウェアトレースリストの取得 | |
| 1510 | + * | |
| 1511 | + * @return 取得したトレース配列 | |
| 1512 | + */ | |
| 1513 | + public ChipTrace[] get_trace() { | |
| 1514 | + ChipTrace dummy[] = new ChipTrace[1]; | |
| 1515 | + ChipTrace ret[] = traceList.toArray(dummy); | |
| 1516 | + return ret; | |
| 1517 | + } | |
| 1518 | + | |
| 1400 | 1519 | } |
| 1401 | 1520 | //EOF |
| 1402 | 1521 |
| @@ -88,6 +88,7 @@ | ||
| 88 | 88 | protected String param; |
| 89 | 89 | OkeSoftExec code; |
| 90 | 90 | OkeSoftPanel spanel; |
| 91 | + boolean bcondchip; | |
| 91 | 92 | |
| 92 | 93 | /** |
| 93 | 94 | * コンストラクタ |
| @@ -98,6 +99,7 @@ | ||
| 98 | 99 | green_arrow = ARROW_NONE; |
| 99 | 100 | red_arrow = ARROW_NONE; |
| 100 | 101 | spanel = null; |
| 102 | + bcondchip = false; | |
| 101 | 103 | } |
| 102 | 104 | |
| 103 | 105 | /** |
| @@ -111,6 +113,7 @@ | ||
| 111 | 113 | |
| 112 | 114 | /** |
| 113 | 115 | * オブジェクト複製 |
| 116 | + * | |
| 114 | 117 | * @return オブジェクトのコピー |
| 115 | 118 | * @throws CloneNotSupportedException |
| 116 | 119 | */ |
| @@ -122,6 +125,7 @@ | ||
| 122 | 125 | wkchip.green_arrow = green_arrow; |
| 123 | 126 | wkchip.red_arrow = red_arrow; |
| 124 | 127 | wkchip.code = code; |
| 128 | + wkchip.bcondchip = bcondchip; | |
| 125 | 129 | return wkchip; |
| 126 | 130 | } |
| 127 | 131 |
| @@ -128,7 +132,7 @@ | ||
| 128 | 132 | /** |
| 129 | 133 | * チップ内容が存在するかを確認 |
| 130 | 134 | * |
| 131 | - * @return 内容が存在するときtrue | |
| 135 | + * @return 内容が存在するとfalse | |
| 132 | 136 | */ |
| 133 | 137 | public boolean nullchip() { |
| 134 | 138 | return (code == null); |
| @@ -141,101 +145,136 @@ | ||
| 141 | 145 | param = ""; |
| 142 | 146 | if (chipid.equals("NOP") == true) { |
| 143 | 147 | code = softNop; |
| 148 | + bcondchip = false; | |
| 144 | 149 | } else if (chipid.equals("FORWARD") == true) { |
| 145 | 150 | code = softMove; |
| 146 | 151 | param = Integer.toString(OkeSoftMove.FORWARD); |
| 152 | + bcondchip = false; | |
| 147 | 153 | } else if (chipid.equals("BACKWARD") == true) { |
| 148 | 154 | code = softMove; |
| 149 | 155 | param = Integer.toString(OkeSoftMove.BACKWARD); |
| 156 | + bcondchip = false; | |
| 150 | 157 | } else if (chipid.equals("RIGHT") == true) { |
| 151 | 158 | code = softMove; |
| 152 | 159 | param = Integer.toString(OkeSoftMove.RIGHT); |
| 160 | + bcondchip = false; | |
| 153 | 161 | } else if (chipid.equals("LEFT") == true) { |
| 154 | 162 | code = softMove; |
| 155 | 163 | param = Integer.toString(OkeSoftMove.LEFT); |
| 164 | + bcondchip = false; | |
| 156 | 165 | } else if (chipid.equals("STOP") == true) { |
| 157 | 166 | code = softMove; |
| 158 | 167 | param = Integer.toString(OkeSoftMove.STOP); |
| 168 | + bcondchip = false; | |
| 159 | 169 | } else if (chipid.equals("TRIGHT") == true) { |
| 160 | 170 | code = softTurn; |
| 161 | 171 | param = Integer.toString(OkeSoftTurn.RIGHT); |
| 172 | + bcondchip = false; | |
| 162 | 173 | } else if (chipid.equals("TLEFT") == true) { |
| 163 | 174 | code = softTurn; |
| 164 | 175 | param = Integer.toString(OkeSoftTurn.LEFT); |
| 176 | + bcondchip = false; | |
| 165 | 177 | } else if (chipid.equals("JFORWARD") == true) { |
| 166 | 178 | code = softJump; |
| 167 | 179 | param = Integer.toString(OkeSoftJump.FORWARD); |
| 180 | + bcondchip = false; | |
| 168 | 181 | } else if (chipid.equals("JBACKWARD") == true) { |
| 169 | 182 | code = softJump; |
| 170 | 183 | param = Integer.toString(OkeSoftJump.BACKWARD); |
| 184 | + bcondchip = false; | |
| 171 | 185 | } else if (chipid.equals("JRIGHT") == true) { |
| 172 | 186 | code = softJump; |
| 173 | 187 | param = Integer.toString(OkeSoftJump.RIGHT); |
| 188 | + bcondchip = false; | |
| 174 | 189 | } else if (chipid.equals("JLEFT") == true) { |
| 175 | 190 | code = softJump; |
| 176 | 191 | param = Integer.toString(OkeSoftJump.LEFT); |
| 192 | + bcondchip = false; | |
| 177 | 193 | } else if (chipid.equals("SEARCHE") == true) { |
| 178 | 194 | param = "0,90,20"; |
| 179 | 195 | code = softSearchE; |
| 196 | + bcondchip = true; | |
| 180 | 197 | } else if (chipid.equals("SEARCHW") == true) { |
| 181 | 198 | param = "0,90,20"; |
| 182 | 199 | code = softSearchW; |
| 200 | + bcondchip = true; | |
| 183 | 201 | } else if (chipid.equals("SEARCHB") == true) { |
| 184 | 202 | param = "0,90,20"; |
| 185 | 203 | code = softSearchB; |
| 204 | + bcondchip = true; | |
| 186 | 205 | } else if (chipid.equals("SEARCHP") == true) { |
| 187 | 206 | param = "0,90,20"; |
| 188 | 207 | code = softSearchP; |
| 208 | + bcondchip = true; | |
| 189 | 209 | } else if (chipid.equals("SEARCHS") == true) { |
| 190 | 210 | param = "0,90,20,UP"; |
| 191 | 211 | code = softSearchS; |
| 212 | + bcondchip = true; | |
| 192 | 213 | } else if (chipid.equals("MFIRE") == true) { |
| 193 | 214 | param = "0,90,20"; |
| 194 | 215 | code = softFireMain; |
| 216 | + bcondchip = false; | |
| 195 | 217 | } else if (chipid.equals("SFIRE") == true) { |
| 196 | 218 | param = "0,90,20,1"; |
| 197 | 219 | code = softFireSub; |
| 220 | + bcondchip = false; | |
| 198 | 221 | } else if (chipid.equals("OPTION") == true) { |
| 199 | 222 | code = softOption; |
| 223 | + bcondchip = false; | |
| 200 | 224 | } else if (chipid.equals("FIGHT") == true) { |
| 201 | 225 | code = softFight; |
| 226 | + bcondchip = false; | |
| 202 | 227 | } else if (chipid.equals("PRONE") == true) { |
| 203 | 228 | code = softProne; |
| 229 | + bcondchip = false; | |
| 204 | 230 | } else if (chipid.equals("STAIRS") == true) { |
| 205 | 231 | code = softStairs; |
| 232 | + bcondchip = false; | |
| 206 | 233 | } else if (chipid.equals("GET") == true) { |
| 207 | 234 | code = softGet; |
| 235 | + bcondchip = false; | |
| 208 | 236 | } else if (chipid.equals("REMAIN") == true) { |
| 209 | 237 | param = "MAIN WEAPON,>=,0"; |
| 210 | 238 | code = softRemain; |
| 239 | + bcondchip = true; | |
| 211 | 240 | } else if (chipid.equals("FUEL") == true) { |
| 212 | 241 | param = ">=,0"; |
| 213 | 242 | code = softFuel; |
| 214 | 243 | } else if (chipid.equals("HP") == true) { |
| 244 | + bcondchip = true; | |
| 215 | 245 | param = ">=,0"; |
| 216 | 246 | code = softHp; |
| 247 | + bcondchip = true; | |
| 217 | 248 | } else if (chipid.equals("HEAT") == true) { |
| 218 | 249 | param = ">=,0"; |
| 219 | 250 | code = softHeat; |
| 251 | + bcondchip = true; | |
| 220 | 252 | } else if (chipid.equals("COUNTER") == true) { |
| 221 | 253 | param = "A,=,0"; |
| 222 | 254 | code = softCounter; |
| 255 | + bcondchip = false; | |
| 223 | 256 | } else if (chipid.equals("COND") == true) { |
| 224 | 257 | param = "A,==,0"; |
| 225 | 258 | code = softCond; |
| 259 | + bcondchip = true; | |
| 226 | 260 | } else if (chipid.equals("PARTSINFO") == true) { |
| 227 | 261 | param = "0,==,MAIN WEAPON"; |
| 228 | 262 | code = softPartsInfo; |
| 263 | + bcondchip = true; | |
| 229 | 264 | } else if (chipid.equals("DROP") == true) { |
| 230 | 265 | param = "0"; |
| 231 | 266 | code = softDropParts; |
| 267 | + bcondchip = false; | |
| 232 | 268 | } else if (chipid.equals("RANDOM") == true) { |
| 233 | 269 | param = "1,6"; |
| 234 | 270 | code = softRandom; |
| 271 | + bcondchip = true; | |
| 235 | 272 | } else if (chipid.equals("CHANGE") == true) { |
| 236 | 273 | code = softChange; |
| 274 | + bcondchip = false; | |
| 237 | 275 | } else { |
| 238 | 276 | code = null; |
| 277 | + bcondchip = false; | |
| 239 | 278 | } |
| 240 | 279 | } |
| 241 | 280 |
| @@ -248,6 +287,7 @@ | ||
| 248 | 287 | green_arrow = ARROW_NONE; |
| 249 | 288 | red_arrow = ARROW_NONE; |
| 250 | 289 | code = null; |
| 290 | + bcondchip = false; | |
| 251 | 291 | } |
| 252 | 292 | |
| 253 | 293 | /** |
| @@ -369,6 +409,15 @@ | ||
| 369 | 409 | } |
| 370 | 410 | |
| 371 | 411 | /** |
| 412 | + * チップが条件チップかどうか? | |
| 413 | + * | |
| 414 | + * @return 条件チップの時にtrue | |
| 415 | + */ | |
| 416 | + public boolean is_condchip() { | |
| 417 | + return bcondchip; | |
| 418 | + } | |
| 419 | + | |
| 420 | + /** | |
| 372 | 421 | * ソフトウェア実行 |
| 373 | 422 | * |
| 374 | 423 | * @param dungeon ダンジョンデータ |
| @@ -441,6 +490,7 @@ | ||
| 441 | 490 | code = null; |
| 442 | 491 | green_arrow = ARROW_NONE; |
| 443 | 492 | red_arrow = ARROW_NONE; |
| 493 | + bcondchip = false; | |
| 444 | 494 | } catch (NumberFormatException e) { |
| 445 | 495 | chipid = ""; |
| 446 | 496 | param = ""; |
| @@ -447,6 +497,7 @@ | ||
| 447 | 497 | code = null; |
| 448 | 498 | green_arrow = ARROW_NONE; |
| 449 | 499 | red_arrow = ARROW_NONE; |
| 500 | + bcondchip = false; | |
| 450 | 501 | } |
| 451 | 502 | } |
| 452 | 503 | } |
| @@ -1,8 +1,9 @@ | ||
| 1 | 1 | package CarnageHack; |
| 2 | 2 | |
| 3 | 3 | import java.awt.Dialog; |
| 4 | +import java.awt.GridBagConstraints; | |
| 5 | +import java.awt.GridBagLayout; | |
| 4 | 6 | import java.awt.Label; |
| 5 | -import java.awt.GridLayout; | |
| 6 | 7 | |
| 7 | 8 | /** |
| 8 | 9 | * OKEステータスウィンドウ |
| @@ -28,6 +29,7 @@ | ||
| 28 | 29 | Label counterD; |
| 29 | 30 | Label counterE; |
| 30 | 31 | Label counterF; |
| 32 | + OkeSoftTracePanel tracepanel; | |
| 31 | 33 | private static final long serialVersionUID = 32; |
| 32 | 34 | |
| 33 | 35 | /** |
| @@ -37,8 +39,10 @@ | ||
| 37 | 39 | */ |
| 38 | 40 | OkeStatusWindow(Oke p) { |
| 39 | 41 | super(CarnageHack.getFrame(), "Status", false); |
| 42 | + GridBagLayout glayout = new GridBagLayout(); | |
| 43 | + GridBagConstraints gconst = new GridBagConstraints(); | |
| 40 | 44 | oke = p; |
| 41 | - setLayout(new GridLayout(0, 1)); | |
| 45 | + setLayout(glayout); | |
| 42 | 46 | position = new Label(); |
| 43 | 47 | hp = new Label(); |
| 44 | 48 | fuel = new Label(); |
| @@ -55,25 +59,54 @@ | ||
| 55 | 59 | counterD = new Label(); |
| 56 | 60 | counterE = new Label(); |
| 57 | 61 | counterF = new Label(); |
| 62 | + tracepanel = new OkeSoftTracePanel(); | |
| 63 | + gconst.fill = GridBagConstraints.BOTH; | |
| 64 | + gconst.gridwidth = 1; | |
| 65 | + gconst.gridheight = 16; | |
| 66 | + gconst.weightx = 1.0; | |
| 67 | + gconst.weighty = 1.0; | |
| 68 | + glayout.setConstraints(tracepanel, gconst); | |
| 69 | + add(tracepanel); | |
| 70 | + gconst.gridwidth = GridBagConstraints.REMAINDER; | |
| 71 | + gconst.gridheight = 1; | |
| 72 | + gconst.weightx = 0; | |
| 73 | + gconst.weighty = 0; | |
| 74 | + glayout.setConstraints(position, gconst); | |
| 58 | 75 | add(position); |
| 76 | + glayout.setConstraints(hp, gconst); | |
| 59 | 77 | add(hp); |
| 78 | + glayout.setConstraints(fuel, gconst); | |
| 60 | 79 | add(fuel); |
| 80 | + glayout.setConstraints(heat, gconst); | |
| 61 | 81 | add(heat); |
| 82 | + glayout.setConstraints(main_bullette, gconst); | |
| 62 | 83 | add(main_bullette); |
| 84 | + glayout.setConstraints(sub_bullette, gconst); | |
| 63 | 85 | add(sub_bullette); |
| 86 | + glayout.setConstraints(software, gconst); | |
| 64 | 87 | add(software); |
| 88 | + glayout.setConstraints(status, gconst); | |
| 65 | 89 | add(status); |
| 90 | + glayout.setConstraints(option, gconst); | |
| 66 | 91 | add(option); |
| 92 | + glayout.setConstraints(backpack, gconst); | |
| 67 | 93 | add(backpack); |
| 94 | + glayout.setConstraints(counterA, gconst); | |
| 68 | 95 | add(counterA); |
| 96 | + glayout.setConstraints(counterB, gconst); | |
| 69 | 97 | add(counterB); |
| 98 | + glayout.setConstraints(counterC, gconst); | |
| 70 | 99 | add(counterC); |
| 100 | + glayout.setConstraints(counterD, gconst); | |
| 71 | 101 | add(counterD); |
| 102 | + glayout.setConstraints(counterE, gconst); | |
| 72 | 103 | add(counterE); |
| 104 | + glayout.setConstraints(counterF, gconst); | |
| 73 | 105 | add(counterF); |
| 74 | 106 | update(); |
| 107 | + pack(); | |
| 75 | 108 | setLocation(410, 0); |
| 76 | - setSize(200, 300); | |
| 109 | + setSize(getPreferredSize()); | |
| 77 | 110 | setVisible(true); |
| 78 | 111 | } |
| 79 | 112 |
| @@ -143,7 +176,8 @@ | ||
| 143 | 176 | heat.setText("HEAT:" + oke.get_tempture()); |
| 144 | 177 | main_bullette.setText("MAIN:" + oke.get_bullette(0)); |
| 145 | 178 | sub_bullette.setText("SUB:" + oke.get_bullette(1)); |
| 146 | - software.setText("CHIP X:" + oke.get_chipx() + " Y:" + oke.get_chipy()); | |
| 179 | + software.setText("SOFTWARE:" + oke.get_current_software() | |
| 180 | + + " CHIP X:" + oke.get_chipx() + " Y:" + oke.get_chipy()); | |
| 147 | 181 | switch (oke.get_status()) { |
| 148 | 182 | case Oke.STATUS_NORMAL: |
| 149 | 183 | status_str = "NORMAL"; |
| @@ -220,6 +254,7 @@ | ||
| 220 | 254 | counterD.setText("D = " + oke.get_counter("D")); |
| 221 | 255 | counterE.setText("E = " + oke.get_counter("E")); |
| 222 | 256 | counterF.setText("F = " + oke.get_counter("F")); |
| 257 | + tracepanel.set_trace(oke); | |
| 223 | 258 | } |
| 224 | 259 | |
| 225 | 260 | /** |
| @@ -229,6 +264,6 @@ | ||
| 229 | 264 | */ |
| 230 | 265 | public void set_oke(Oke p) { |
| 231 | 266 | oke = p; |
| 232 | - repaint(); | |
| 267 | + invalidate(); | |
| 233 | 268 | } |
| 234 | 269 | } |