Commit: 48 - CarnageHack (svn)

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

Commit MetaInfo

• Revision: 48 (tree)
• Time: 2015-08-21 18:01:19
• Author: manjihq

Log Message

プレイヤー以外の機体も階段降りて新しい階に移動出来るようにしてみた

Change Summary

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

Incremental Difference

--- CarnageHack2/trunk/src/CarnageHack/OkeDungeon.java	(revision 47)
+++ CarnageHack2/trunk/src/CarnageHack/OkeDungeon.java	(revision 48)
@@ -167,7 +167,7 @@
         }
         floor.add(dungeon);
         if (usebone == false) {
-            plot_init_enemy();
+            plot_init_enemy(current_floor);
         }
         pcOke = pc;
         viewBaseOke = pcOke;
@@ -414,6 +414,39 @@
     }
 
     /**
+     * 新しいフロアを生成
+     *
+     * @return 階数
+     */
+    public int generate_floor() {
+        int new_floor = floor.size();
+        DungeonFloor dungeon;
+        boolean usebone;
+        dungeon = load_bone_file();
+        if (dungeon == null) {
+            dungeon = new DungeonFloor(new_floor);
+            usebone = false;
+        } else {
+            usebone = true;
+        }
+        floor.add(dungeon);
+        if (usebone == false) {
+            plot_init_enemy(new_floor);
+        }
+        if (higefloor == new_floor) {
+            //plot hige
+            do {
+                higex = (int) (Math.random() * (DungeonFloor.FLOOR_X - 2))
+                        + 1;
+                higey = (int) (Math.random() * (DungeonFloor.FLOOR_Y - 2))
+                        + 1;
+            } while (dungeon.iswall(higex, higey) == true);
+            dungeon.clear_downstairs();
+        }
+        return new_floor;
+    }
+
+    /**
      * 階数を一つ降りる
      *
      * @return 移動後の階数
@@ -422,31 +455,9 @@
         DungeonFloor dungeon;
         current_floor++;
         if (current_floor >= floor.size()) {
-            boolean usebone;
-            dungeon = load_bone_file();
-            if (dungeon == null) {
-                dungeon = new DungeonFloor(current_floor);
-                usebone = false;
-            } else {
-                usebone = true;
-            }
-            floor.add(dungeon);
-            if (usebone == false) {
-                plot_init_enemy();
-            }
-            if (higefloor == current_floor) {
-                //plot hige
-                do {
-                    higex = (int) (Math.random() * (DungeonFloor.FLOOR_X - 2))
-                            + 1;
-                    higey = (int) (Math.random() * (DungeonFloor.FLOOR_Y - 2))
-                            + 1;
-                } while (dungeon.iswall(higex, higey) == true);
-                dungeon.clear_downstairs();
-            }
-        } else {
-            dungeon = (DungeonFloor) floor.get(current_floor);
+            current_floor = generate_floor();
         }
+        dungeon = (DungeonFloor) floor.get(current_floor);
         pcOke.set_x(dungeon.get_up_stairsx());
         pcOke.set_y(dungeon.get_up_stairsy());
         pcOke.set_floor(current_floor);
@@ -995,7 +1006,7 @@
         if (turn_count == 1800) {
             turn_count = 0;
             if (CarnageHack.dice100() > 70) {
-                plot_init_enemy();
+                plot_init_enemy(current_floor);
             }
         }
         if (pcOke.isdead() == true || pcOke.get_fuel() == 0) {
@@ -1027,11 +1038,12 @@
      * ＯＫＥデータを管理リストへ追加
      *
      * @param p ＯＫＥデータ
+     * @param n 階数
      */
-    public void addOke(Oke p) {
+    public void addOke(Oke p, int n) {
         int x;
         int y;
-        DungeonFloor dungeon = (DungeonFloor) floor.get(current_floor);
+        DungeonFloor dungeon = (DungeonFloor) floor.get(n);
         do {
             x = (int) (Math.random() * (DungeonFloor.FLOOR_X - 2)) + 1;
             y = (int) (Math.random() * (DungeonFloor.FLOOR_Y - 2)) + 1;
@@ -1038,21 +1050,23 @@
         } while (dungeon.iswall(x, y) == true);
         p.set_x(x);
         p.set_y(y);
-        p.set_floor(current_floor);
+        p.set_floor(n);
         oke.add(p);
     }
 
     /**
      * 敵ＯＫＥを発生させる
+     *
+     * @param n
      */
-    public void makeNewOke() {
+    public void makeNewOke(int n) {
         Oke p = new Oke(Oke.IFF_ENEMY,
-                (int) (Math.random() * (current_floor + 1) * 100) + (current_floor
-                / 5 + 1) * 100,
+                (int) (Math.random() * (n + 1) * 100)
+                + (n / 5 + 1) * 100,
                 CarnageHack.makeNewHard(),
                 CarnageHack.makeNewSoft(this),
                 null);
-        addOke(p);
+        addOke(p, n);
     }
 
     /**
@@ -1092,11 +1106,12 @@
     /**
      * 敵ＯＫＥの初期配備
      */
-    private void plot_init_enemy() {
-        int nmax = (int) (Math.random() * ((current_floor / 5) + 1) * 3) + 1;
+    private void plot_init_enemy(int nfloor) {
+        int nmax;
         int i;
+        nmax = (int) (Math.random() * ((nfloor / 5) + 1) * 3) + 1;
         for (i = 0; i < nmax; i++) {
-            makeNewOke();
+            makeNewOke(nfloor);
         }
     }
 

--- CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 47)
+++ CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 48)
@@ -605,10 +605,14 @@
             } else {
                 df = dungeon.get_floor(floor + 1);
                 if (df != null) {
-                    x = df.get_up_stairsx();
-                    y = df.get_up_stairsy();
                     floor++;
+                } else {
+                    //new floor
+                    floor = dungeon.generate_floor();
+                    df = dungeon.get_floor(floor);
                 }
+                x = df.get_up_stairsx();
+                y = df.get_up_stairsy();
             }
             action = ACTION_NONE;
             status = STATUS_NORMAL;