Commit: 44 - CarnageHack (svn)

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

Commit MetaInfo

• Revision: 44 (tree)
• Time: 2015-07-24 17:38:19
• Author: manjihq

Log Message

タイルの基本サイズをブランクフロアタイルから取得、基本サイズに応じて各種タイルを変形して表示するようにした
弾丸タイルを他のタイルと同じ大きさに表示する様に変更

Change Summary

• modified: CarnageHack2/trunk/src/CarnageHack/CarnageHack.java
• modified: CarnageHack2/trunk/src/CarnageHack/CHviewSplash.java
• modified: CarnageHack2/trunk/src/CarnageHack/DungeonFloor.java
• modified: CarnageHack2/trunk/src/CarnageHack/OkeBullette.java
• modified: CarnageHack2/trunk/src/CarnageHack/OkeDungeon.java
• modified: CarnageHack2/trunk/src/CarnageHack/FloorTile.java

Incremental Difference

--- CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/CarnageHack.java	(revision 44)
@@ -25,7 +25,7 @@
  */
 public final class CarnageHack extends Panel implements ActionListener {
 
-    public static final String version = "CarnageHack2 V1.4.0 alpha";
+    public static final String version = "CarnageHack2 V1.5.0 alpha";
     public static final ResourceBundle resource;
     public static CHArrayList main_weapon_list;
     public static CHArrayList sub_weapon_list;

--- CarnageHack2/trunk/src/CarnageHack/CHviewSplash.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/CHviewSplash.java	(revision 44)
@@ -49,10 +49,12 @@
     public void paint(Graphics g) {
         int y = 0;
         int n;
+        int cx;
         n = FloorTile.startup_image(g, 0, y, 256, this);
-        y += ((n / 16) + 1) * 16;
+        cx = 256 / FloorTile.tileBaseX;
+        y += ((n / cx) + 1) * FloorTile.tileBaseY;
         n = OkeDungeon.startup_image(g, 0, y, 256, this);
-        y += ((n / 16) + 1) * 16;
+        y += ((n / cx) + 1) * FloorTile.tileBaseY;
         n = OkeSoftChipPanel.startup_image(g, 0, y, 256, this);
         y += ((n / 8) + 1) * 32;
         g.drawImage(banner, 0, y, this);

--- CarnageHack2/trunk/src/CarnageHack/DungeonFloor.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/DungeonFloor.java	(revision 44)
@@ -428,9 +428,11 @@
             for (y = 0; y < cy; y++) {
                 if (x + bx > 0 && x + bx < FLOOR_X && y + by > 0 && y + by
                         < FLOOR_Y) {
-                    tile[x + bx][y + by].draw(g, x * 16, y * 16, compo);
+                    tile[x + bx][y + by].draw(g, x * FloorTile.tileBaseX,
+                            y * FloorTile.tileBaseY, compo);
                 } else {
-                    wall.draw(g, x * 16, y * 16, compo);
+                    wall.draw(g, x * FloorTile.tileBaseX,
+                            y * FloorTile.tileBaseY, compo);
                 }
             }
         }

--- CarnageHack2/trunk/src/CarnageHack/OkeBullette.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/OkeBullette.java	(revision 44)
@@ -292,7 +292,9 @@
                 break;
         }
         if (icon != null) {
-            g.drawImage(icon, (x - bx) * 16, (y - by) * 16, compo);
+            g.drawImage(icon, (x - bx) * FloorTile.tileBaseX,
+                    (y - by) * FloorTile.tileBaseY,
+                    FloorTile.tileBaseX, FloorTile.tileBaseY, compo);
         }
     }
 }

--- CarnageHack2/trunk/src/CarnageHack/OkeDungeon.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/OkeDungeon.java	(revision 44)
@@ -70,11 +70,13 @@
         for (i = 0; i < 8; i++) {
             tsukikage[i]
                     = tk.getImage(obj.getClass().
-                            getResource("tile/tsukikage" + dir_word[i] + ".png"));
+                            getResource("tile/tsukikage" + dir_word[i]
+                                    + ".png"));
             mt.addImage(tsukikage[i], 0);
             tsukikage2[i]
                     = tk.getImage(obj.getClass().
-                            getResource("tile/tsukikage2" + dir_word[i] + ".png"));
+                            getResource("tile/tsukikage2" + dir_word[i]
+                                    + ".png"));
             mt.addImage(tsukikage2[i], 0);
         }
         explosion
@@ -96,35 +98,38 @@
             ImageObserver obs) {
         int i;
         int n = 0;
-        g.drawImage(hige, x, y, obs);
-        x += 16;
+        g.drawImage(hige, x, y, FloorTile.tileBaseX, FloorTile.tileBaseY, obs);
+        x += FloorTile.tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += FloorTile.tileBaseY;
         }
         n++;
-        g.drawImage(explosion, x, y, obs);
-        x += 16;
+        g.drawImage(explosion, x, y, FloorTile.tileBaseX, FloorTile.tileBaseY,
+                obs);
+        x += FloorTile.tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += FloorTile.tileBaseY;
         }
         n++;
         for (i = 0; i < 8; i++) {
-            g.drawImage(tsukikage[i], x, y, obs);
-            x += 16;
+            g.drawImage(tsukikage[i], x, y,
+                    FloorTile.tileBaseX, FloorTile.tileBaseY, obs);
+            x += FloorTile.tileBaseX;
             if (x >= cx) {
                 x = 0;
-                y += 16;
+                y += FloorTile.tileBaseY;
             }
             n++;
         }
         for (i = 0; i < 8; i++) {
-            g.drawImage(tsukikage2[i], x, y, obs);
-            x += 16;
+            g.drawImage(tsukikage2[i], x, y,
+                    FloorTile.tileBaseX, FloorTile.tileBaseY, obs);
+            x += FloorTile.tileBaseX;
             if (x >= cx) {
                 x = 0;
-                y += 16;
+                y += FloorTile.tileBaseY;
             }
             n++;
         }
@@ -278,8 +283,8 @@
         int x;
         int y;
         Dimension winsize = getSize();
-        int view_x = winsize.width / 16;
-        int view_y = winsize.height / 16;
+        int view_x = winsize.width / FloorTile.tileBaseX;
+        int view_y = winsize.height / FloorTile.tileBaseY;
         Image offscreen = createImage(winsize.width, winsize.height);
         Graphics g = offscreen.getGraphics();
         nowdraw = true;
@@ -330,7 +335,9 @@
                 if (x >= basex && x < basex + view_x && y >= basey && y < basey
                         + view_y) {
                     g.drawImage(icon,
-                            (x - basex) * 16, (y - basey) * 16, this);
+                            (x - basex) * FloorTile.tileBaseX,
+                            (y - basey) * FloorTile.tileBaseY,
+                            FloorTile.tileBaseX, FloorTile.tileBaseY, this);
                 }
             }
         }
@@ -351,7 +358,9 @@
         //
         //draw higeoyaji
         if (havehige == false && higefloor == current_floor) {
-            g.drawImage(hige, (higex - basey) * 16, (higey - basey) * 16, this);
+            g.drawImage(hige, (higex - basey) * FloorTile.tileBaseX,
+                    (higey - basey) * FloorTile.tileBaseY,
+                    FloorTile.tileBaseX, FloorTile.tileBaseY, this);
         }
         //
         nowdraw = false;
@@ -1210,8 +1219,8 @@
             }
         } else if ((e.getModifiers() & (MouseEvent.BUTTON2_MASK
                 | MouseEvent.BUTTON3_MASK)) != 0) {
-            int x = dungeon.get_basex() + e.getX() / 16;
-            int y = dungeon.get_basey() + e.getY() / 16;
+            int x = dungeon.get_basex() + e.getX() / FloorTile.tileBaseX;
+            int y = dungeon.get_basey() + e.getY() / FloorTile.tileBaseY;
             if (e.isShiftDown() == true) {
                 dungeon.set_lockview(false);
                 dungeon.set_viewoke(x, y);
@@ -1218,8 +1227,8 @@
             } else {
                 Dimension winsize;
                 winsize = dungeon.getSize();
-                x -= winsize.width / 16 / 2;
-                y -= winsize.height / 16 / 2;
+                x -= winsize.width / FloorTile.tileBaseX / 2;
+                y -= winsize.height / FloorTile.tileBaseY / 2;
                 dungeon.set_lockview(true);
                 dungeon.set_base(x, y);
             }

--- CarnageHack2/trunk/src/CarnageHack/FloorTile.java	(revision 43)
+++ CarnageHack2/trunk/src/CarnageHack/FloorTile.java	(revision 44)
@@ -1,6 +1,5 @@
 package CarnageHack;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -24,6 +23,8 @@
     static Image upstairs;
     static Image downstairs;
     static Image parts;
+    static public int tileBaseX = 16;
+    static public int tileBaseY = 16;
     int id;
     CHArrayList item;
 
@@ -62,32 +63,42 @@
     static public int startup_image(Graphics g, int x, int y, int cx,
             ImageObserver obs) {
         int n = 0;
+        int basex = blank.getWidth(obs);
+        int basey = blank.getHeight(obs);
+        if (basex != -1) {
+            //取得できるはずだが念のため取得できた時にタイル幅を更新
+            tileBaseX = basex;
+        }
+        if (basey != -1) {
+            //取得できるはずだが念のため取得できた時にタイル長を更新
+            tileBaseY = basey;
+        }
         g.drawImage(blank, x, y, obs);
-        x += 16;
+        x += tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += tileBaseY;
         }
         n++;
         g.drawImage(wall, x, y, obs);
-        x += 16;
+        x += tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += tileBaseY;
         }
         n++;
         g.drawImage(upstairs, x, y, obs);
-        x += 16;
+        x += tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += tileBaseY;
         }
         n++;
         g.drawImage(downstairs, x, y, obs);
-        x += 16;
+        x += tileBaseX;
         if (x >= cx) {
             x = 0;
-            y += 16;
+            y += tileBaseY;
         }
         n++;
         g.drawImage(parts, x, y, obs);
@@ -172,7 +183,8 @@
             }
         }
         if (icon != null) {
-            g.drawImage(icon, x, y, compo);
+            g.drawImage(icon, x, y, FloorTile.tileBaseX, FloorTile.tileBaseY,
+                    compo);
         }
     }
 }