Changeset 7111

Timestamp:

02/25/08 02:26:51 (5 years ago)

Author:

omega

Message:

あらしがニコ厨を食べるようにした。

Location:

lang/d/koke/trunk

Files:

• build.bat (modified) (1 diff)
• character.d (modified) (11 diffs)
• gamecore.d (modified) (1 diff)
• resource/image/char.bmp (modified) (previous)

lang/d/koke/trunk/build.bat

@@ -14 +14 @@
 :RUN
 koke.exe
-#make -fMakefile.dmd.win32 obj-clean
+make -fMakefile.dmd.win32 obj-clean
 goto END
 

lang/d/koke/trunk/character.d

@@ -168 +168 @@
                                 if(motion == MOTION.NORMAL){
                                         int t = Hell_randInt(0,100);
-                                        if(t < configparser.getint("NICOCHU_TURN_RATIO")){
+                                        if(t < configparser.getint("NICOCHU_TURN_RATIO")){      // 芝の濃い方に高確率で振り向く
                                                 int gl = cast(int)map.getGrassLevel(x-1,y);
                                                 int gr = cast(int)map.getGrassLevel(x+1,y);
@@ -211 +211 @@
                         case TYPE.RAINBOW_RAY:
                                 if(motion == MOTION.NORMAL) setMotion(MOTION.WALK);
+                                if( gamemain.map.isMap( getDestX() , getDestY() , MapChip.TYPE.FENCE)){
+                                        exist = false;
+                                }
                                 destroyNeighbor();
                                 break;
@@ -237 +240 @@
                         case TYPE.ARASHI:
                                 if(motion == MOTION.NORMAL){
-                                        if(eatMovie()){
+                                        if(eatCharacter(TYPE.NICOCHU)){
+                                                setMotion(MOTION.EATING2);
+                                        }else if(eatMovie()){
                                                 setMotion(MOTION.EATING2);
                                         }else{
@@ -253 +258 @@
                                 break;
                 }
+                actBreed();
                 actCharacter();
         }
@@ -271 +277 @@
                         
                         // 移動先の確認
-                        int x = cast(int)(position.x + vecx[cast(int)direction]);
-                        int y = cast(int)(position.y + vecy[cast(int)direction]);
-                        if( !gamemain.map.isMovable(x,y) && isBlocking() ){
+                        if( !gamemain.map.isMovable(getDestX() , getDestY()) && isBlocking() ){
                                 move_fraction = 0;
                                 setMotion(MOTION.NORMAL);
@@ -291 +295 @@
                         t++;
                         direction = cast(DIRECTION) Hell_randInt(0,DIRECTION.MAX);
-                        int x = cast(int)(position.x + vecx[direction]);
-                        int y = cast(int)(position.y + vecy[direction]);
-                        chk = gamemain.map.isMovable(x,y);
+                        chk = gamemain.map.isMovable(getDestX() , getDestY());
                 }while(!chk && t < 32);
         }
@@ -338 +340 @@
         }
         
-        // 芝を食うの図
-        bool eatGrass(){
-                int x = cast(int)position.x , y = cast(int)position.y;
-                
-                if(move_fraction != 0) return false;
-                if(gamemain.map.getGrassLevel(x,y) < 1) return false;   // レベル1以上の芝しか食べない
-                
-                // 芝を食う
-                life += gamemain.map.getGrassLevel(x,y) * 2;
-                if(life >= type_life_max[type]) {
+        // 増える系処理
+        void actBreed(){
+                if(move_fraction != 0 || motion == MOTION.NORMAL) return false;
+                
+                TYPE child_type = TYPE.NONE;
+                switch (type){
+                // ニコ厨
+                case TYPE.NICOCHU:
+                        child_type = TYPE.NICOCHU;
+                        // 一定率で"あらし"になる
+                        if(Hell_randInt(0,100) < configparser.getint("ARASHI_TRANSFORM_RATIO")){
+                                child_type = TYPE.ARASHI;
+                        }
+                        break;
+                
+                // あらし
+                case TYPE.ARASHI:
+                        child_type = TYPE.ARASHI;
+                        break;
+                        
+                default:
+                        break;
+                }
+                
+                // 実際の増える処理
+                if(child_type != TYPE.NONE && life >= type_life_max[type]) {
                         // ライフ上限を超えたらライフを半分にして増殖
                         life /= 2;
                         
-                        TYPE ty = TYPE.NICOCHU;
-                        // 一定率で"あらし"になる
-                        if(Hell_randInt(0,100) < configparser.getint("ARASHI_TRANSFORM_RATIO")){
-                                ty = TYPE.ARASHI;
-                        }
-                        
-                        Character c = gamemain.charpool.set( new Vec3(position.x , position.y , 0) , ty);
+                        Character c = gamemain.charpool.set( new Vec3(position.x , position.y , 0) , child_type);
                         if(c){
                                 c.life = life;
@@ -363 +375 @@
                                         c.direction = cast(DIRECTION) Hell_randInt( 0 , DIRECTION.MAX );
                                 }
-                                
-                        }
-                }
+                        }
+                }
+        }
+        
+        // 芝を食うの図
+        bool eatGrass(){
+                int x = cast(int)position.x , y = cast(int)position.y;
+                
+                if(move_fraction != 0) return false;
+                if(gamemain.map.getGrassLevel(x,y) < 1) return false;   // レベル1以上の芝しか食べない
+                
+                // 芝を食う
+                life += gamemain.map.getGrassLevel(x,y) * 2;
                 gamemain.map.setGrass(x,y,0);
                 return true;
@@ -391 +413 @@
                                 
                                 return true;
+                        }
+                }
+                return false;
+        }
+        
+        // キャラを食べる
+        bool eatCharacter(TYPE type , bool all_dir = false){
+                int x = cast(int)position.x , y = cast(int)position.y;
+                
+                if(move_fraction != 0) return false;
+                for(int t = 0 ; t < cast(int)DIRECTION.MAX ; t++){
+                        if(all_dir == false && direction != cast(DIRECTION)t) continue; 
+                        
+                        int px = x + cast(int)vecx[t];
+                        int py = y + cast(int)vecy[t];
+                        Character ch[] = gamemain.charpool.getCharacterAtMap(px,py);
+                        foreach(inout c;ch){
+                                if(c && c.exist && c.type == type){
+                                        // キャラクタを食べる
+                                        direction = cast(DIRECTION)t;
+                                        life += c.life;
+                                        
+                                        c.destroy();
+                                        return true;
+                                }
                         }
                 }
@@ -550 +597 @@
         }
         
+        // マップ表示時の座標
         double toMapXf(){
                 return position.x + move_fraction * vecx[cast(int)direction];
@@ -555 +603 @@
         double toMapYf(){
                 return position.y + move_fraction * vecy[cast(int)direction];
+        }
+        
+        // 移動先XY
+        int getDestX(){
+                return cast(int)(position.x + vecx[direction]);
+        }
+        int getDestY(){
+                return cast(int)(position.y + vecy[direction]);
         }
 }

lang/d/koke/trunk/gamecore.d

@@ -201 +201 @@
                                 // 運営レーザー　コマンド
                                 mray_timer++;
-                                if(mray_timer > MRAY_TIMER_SECOND_TARGET){
+                                if(mray_timer > MRAY_TIMER_SECOND_TARGET && mray_timer % 3 == 0){
                                         shake_power = 16;
-                                        Character c = charpool.set( new Vec3(cursor_x , cursor_y , 0) , Character.TYPE.EXPLODE);
-                                        c.destroyMap(cursor_x , cursor_y , Hell_randInt(0,5) , true);   // 一次的な対応
-                                        c.setMotion(Character.MOTION.VANISH);
+                                        Character c = charpool.set( new Vec3(cursor_x , cursor_y , 0) , Character.TYPE.EXPLODE); /* 一次的な対応 */
+                                        if(c){
+                                                c.destroyMap(cursor_x , cursor_y , Hell_randInt(0,5) , true);
+                                                c.setMotion(Character.MOTION.VANISH);
+                                        }
                                 }
                                 break;