提交: 34 - CarnageHack (svn)

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

Commit MetaInfo

• 修订版: 34 (tree)
• 时间: 2015-07-06 21:44:18
• 作者: manjihq

Log Message

パーツ一覧を整列して表示するように変更
機体の旋回速度を調整

更改概述

• modified: CarnageHack2/trunk/src/CarnageHack/Oke.java
• modified: CarnageHack2/trunk/src/CarnageHack/CHArrayList.java
• modified: CarnageHack2/trunk/src/CarnageHack/CarnageHack.java

差异

--- CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 33)
+++ CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 34)
@@ -250,7 +250,7 @@
         destroycount = 0;
         chipx = 0;
         chipy = 0;
-        turn_rate = 5;
+        turn_rate = 1;
         speed_count = 0;
         tempture = 0;
         recalc_speed();
@@ -309,7 +309,7 @@
         option_status = OPTION_NO_USE;
         chipx = 0;
         chipy = 0;
-        turn_rate = 5;
+        turn_rate = 1;
         speed_count = 0;
         tempture = 0;
         recalc_speed();
@@ -751,21 +751,22 @@
         } else {
             speed_count = speed;
         }
+        if (status == STATUS_TURN) {
+            if (param == TURN_LEFT) {
+                deg -= turn_rate;
+                if (deg < 0) {
+                    deg += 360;
+                }
+            } else {
+                deg += turn_rate;
+                if (deg >= 360) {
+                    deg -= 360;
+                }
+            }
+        }
         if (speed_count == speed) {
             option_status = OPTION_NO_USE;
-            if (status == STATUS_TURN) {
-                if (param == TURN_LEFT) {
-                    deg -= turn_rate;
-                    if (deg < 0) {
-                        deg += 360;
-                    }
-                } else {
-                    deg += turn_rate;
-                    if (deg >= 360) {
-                        deg -= 360;
-                    }
-                }
-            } else if (status == STATUS_GET) {
+            if (status == STATUS_GET) {
                 int dx = x + move_deltax[get_direction()][MOVE_FORWARD];
                 int dy = y + move_deltay[get_direction()][MOVE_FORWARD];
                 get_item_task(dungeon, dx, dy);

--- CarnageHack2/trunk/src/CarnageHack/CHArrayList.java	(revision 33)
+++ CarnageHack2/trunk/src/CarnageHack/CHArrayList.java	(revision 34)
@@ -1,6 +1,7 @@
 package CarnageHack;
 
 import java.lang.reflect.Array;
+import java.util.Arrays;
 
 /**
  * 配列クラス
@@ -165,6 +166,20 @@
         }
         return array;
     }
+
+    /**
+     * 要素をソートする
+     */
+    public void sort() {
+        int i;
+        Object wk[];
+        wk = new Object[current_size];
+        toArray(wk);
+        Arrays.sort(wk);
+        for (i = 0; i < current_size; i++) {
+            Array.set(data, i, wk[i]);
+        }
+    }
 }
 
 //EOF

--- CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 33)
+++ CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 34)
@@ -24,7 +24,7 @@
  */
 public final class CarnageHack extends Panel implements ActionListener {
 
-    public static final String version = "CarnageHack2 V1.3.0 alpha";
+    public static final String version = "CarnageHack2 V1.3.1 alpha";
     public static final ResourceBundle resource;
     public static CHArrayList main_weapon_list;
     public static CHArrayList sub_weapon_list;
@@ -288,6 +288,8 @@
                 wk += field[0];
                 collected_parts.add(wk);
             }
+            collected_parts.sort();
+            parts.sort();
         }
     }
 
@@ -766,6 +768,7 @@
             while ((wkline = r.readLine()) != null) {
                 parts.add(wkline);
             }
+            parts.sort();
             r.close();
         } catch (IOException e) {
             CHutil.MessageBox(resource.getString("newUser"),