無人機動兵器ダンジョン探索ゲーム 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 V1.3.1 alpha"; | |
| 27 | + public static final String version = "CarnageHack2 V1.3.2 alpha"; | |
| 28 | 28 | public static final ResourceBundle resource; |
| 29 | 29 | public static CHArrayList main_weapon_list; |
| 30 | 30 | public static CHArrayList sub_weapon_list; |
| @@ -237,12 +237,12 @@ | ||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | /** |
| 240 | - * 出撃に伴うパーツの在庫更新 | |
| 240 | + * 設定された機体で出撃可能かどうかをチェック | |
| 241 | 241 | * |
| 242 | - * @return 出撃成功時にtrue | |
| 242 | + * @return 出撃可能な時にtrue | |
| 243 | 243 | */ |
| 244 | - boolean update_parts() { | |
| 245 | - if (haveparts(main_weapon_list, | |
| 244 | + boolean check_oke_parts() { | |
| 245 | + return !(haveparts(main_weapon_list, | |
| 246 | 246 | hardware.get_mainweapon().get_name()) == false |
| 247 | 247 | || haveparts(sub_weapon_list, |
| 248 | 248 | hardware.get_subweapon().get_name()) == false |
| @@ -254,7 +254,16 @@ | ||
| 254 | 254 | || haveparts(fueltank_list, |
| 255 | 255 | hardware.get_fueltank().get_name()) == false |
| 256 | 256 | || haveparts(option_list, |
| 257 | - hardware.get_option().get_name()) == false) { | |
| 257 | + hardware.get_option().get_name()) == false); | |
| 258 | + } | |
| 259 | + | |
| 260 | + /** | |
| 261 | + * 出撃に伴うパーツの在庫更新 | |
| 262 | + * | |
| 263 | + * @return 出撃成功時にtrue | |
| 264 | + */ | |
| 265 | + boolean update_parts() { | |
| 266 | + if (check_oke_parts() == false) { | |
| 258 | 267 | return false; |
| 259 | 268 | } |
| 260 | 269 | delete_parts(hardware.get_mainweapon().get_name(), |
| @@ -341,7 +350,7 @@ | ||
| 341 | 350 | if (software != null && software.get(0, 0) != null && hardware |
| 342 | 351 | != null) { |
| 343 | 352 | //go to dungeon! |
| 344 | - if (update_parts() == false) { //delete used parts | |
| 353 | + if (check_oke_parts() == false) { //check used parts | |
| 345 | 354 | //don't have parts |
| 346 | 355 | CHutil.MessageBox(resource.getString("noParts"), |
| 347 | 356 | resource.getString("noPartsTitle"), |
| @@ -353,6 +362,13 @@ | ||
| 353 | 362 | null, true) == false) { |
| 354 | 363 | return; |
| 355 | 364 | } |
| 365 | + if (update_parts() == false) { | |
| 366 | + //huh? | |
| 367 | + CHutil.MessageBox(resource.getString("noParts"), | |
| 368 | + resource.getString("noPartsTitle"), | |
| 369 | + null, false); | |
| 370 | + return; | |
| 371 | + } | |
| 356 | 372 | save_data(); //save data now! :D |
| 357 | 373 | collected_parts.clear(); |
| 358 | 374 | //process dungeon... |