Commit: 43 - CarnageHack (svn)

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

Commit MetaInfo

• Revision: 43 (tree)
• Time: 2015-07-24 17:35:48
• Author: manjihq

Log Message

敵に接触したときの処理を障害物に接触した時と同様にした
被弾タイマーが1少なかったため被弾状態にならないケースがあったのを修正

Change Summary

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

Incremental Difference

--- CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 42)
+++ CarnageHack2/trunk/src/CarnageHack/Oke.java	(revision 43)
@@ -815,19 +815,18 @@
                                 //hit oke!
                                 x = org_x;
                                 y = org_y;
-                                subx = 0;
-                                suby = 0;
                                 if (status == STATUS_FIGHT) {
                                     //hit punch to target
-                                    int firepower
-                                            = 100 - hardware.get_armor().get_armor();
+                                    int firepower = 100
+                                            - hardware.get_armor().get_armor();
                                     if (firepower <= 0) {
                                         firepower = 1;
                                     }
                                     firepower *= 10;
-                                    target.dec_hp(firepower, this, DAMAGE_FIGHT);
+                                    target.dec_hp(firepower, this,
+                                            DAMAGE_FIGHT);
+                                    break;
                                 }
-                                break;
                             } else if (status == STATUS_STAIRS) {
                                 if (updown_stairs_task(dungeon) == true) {
                                     deltax = 0;
@@ -990,7 +989,7 @@
         lastattacker = p;
         lastdamage = reason;
         status = STATUS_DAMAGED;
-        ntimer = n / 50 + 1;
+        ntimer = n / 50 + 2;
         deltax = CHutil.sin(deg + 180);
         deltay = -CHutil.cos(deg + 180);
     }