# HG changeset patch
# User NOBUYASU Oshiro
# Date 1279339017 -32400
# Node ID 527eac9a7d0bfbbc97f6e0b27309c84011b786c2
# Parent  7f68fc18554a6dbff9d6c1f3c3a6c896440692d3
update

diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/dandy4.html
--- a/webGL/dandy/dandy4.html	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/dandy4.html	Sat Jul 17 12:56:57 2010 +0900
@@ -135,7 +135,7 @@
 				ctx.perspectiveMatrix = new CanvasMatrix4();
 				ctx.perspectiveMatrix.lookat(0,0,-60, 0, 0, 0, 0, 1, 0);
 				ctx.perspectiveMatrix.ortho(ortho.left, ortho.right, ortho.top, -ortho.bottom, 0, 10000);
-				//				ctx.perspectiveMatrix.ortho(-600, 600, 600, -600, 0, 10000);
+//				ctx.perspectiveMatrix.ortho(-600, 600, 600, -600, 0, 10000);
 			}
 			
 			
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/Character_state.js
--- a/webGL/dandy/resources/Character_state.js	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/Character_state.js	Sat Jul 17 12:56:57 2010 +0900
@@ -376,7 +376,7 @@
 }
 
 
-chara_state20 = function character_state(p)
+chara_state20 = function character_state20(p)
 {
     p.x += p.vx;
     p.y += p.vy;
@@ -397,34 +397,47 @@
 chara_state22 = function character_state22(p)
 {
     sf = Math.random() % 4;
+    sf = parseInt(sf);
     if((sf == 0) || (sf == 1))
 	{
-	    p.x = -35;
-	    p.y = Math.random() % (120 - 35);
-	    p.vx = (Math.random() % 4 + 1);
-	    p.vy = Math.random() % 3 + 1;
+	    p.x = -35*d_x;
+	    p.y = Math.random() % (120 - 35)*d_y;
+	    p.vx = (Math.random() % 4 + 1)*d_x;
+	    p.vy = ( Math.random() % 3 + 1 )*d_y;
 	    p.state = chara_state23;
 	}
     if((sf == 2))
 	{
-	    p.x = Math.random() % 290;
-	    p.y = -30;
-	    p.vx = Math.random() % 3 - 1;
-	    p.vy = (Math.random() % 4 + 1);
+	    p.x = ( Math.random() % 290 )*d_x;
+	    p.y = -30 * d_y;
+	    p.vx = ( Math.random() % 3 - 1 )*d_x;
+	    p.vy = ( (Math.random() % 4 + 1) )*d_y;
 	    p.state = chara_state23;
 	}
     if(sf == 3)
 	{
-	    p.x = 320;
-	    p.y = Math.random() % (120 - 35);
-	    p.vx = (Math.random() % 4 + 1) * -1;
-	    p.vy = Math.random() % 3 -1;
+	    p.x = ( 320 )*d_x;
+	    p.y = ( Math.random() % (120 - 35) )*d_y;
+	    p.vx = ( (Math.random() % 4 + 1) * -1 ) *d_x;
+	    p.vy = ( Math.random() % 3 -1 ) *d_y;
 	    p.state = chara_state23;
 	}
     return p;
 }
 
+chara_state23 = function character_state32(p)
+{
+    /*本当はこの 2 行だけ
+    p=asteroid(p);
+    return p;
+    */
 
+    //
+    p.x += p.vx;
+    p.y += p.vy;
+    p.state = chara_state23;
+    return p;
+}
 
 chara_state400 = function character_state400(p)
 {
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/Character_state.js~
--- a/webGL/dandy/resources/Character_state.js~	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/Character_state.js~	Sat Jul 17 12:56:57 2010 +0900
@@ -396,7 +396,7 @@
 
 chara_state22 = function character_state22(p)
 {
-    sf = rand() % 4;
+    sf = Math.random() % 4;
     if((sf == 0) || (sf == 1))
 	{
 	    p.x = -35;
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/parse.js
--- a/webGL/dandy/resources/parse.js	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/parse.js	Sat Jul 17 12:56:57 2010 +0900
@@ -130,7 +130,7 @@
 
 function pushEnemy(gl, enemy)
 {
-    enemy.push(gl.chara["meteo"]);
+    enemy.push(gl.chara["missile"]);
     enemy.push(gl.chara["enemy_greencrab"]);
     enemy.push(gl.chara["enemy_plane"]);
     enemy.push(gl.chara["gunbattery"]);
@@ -139,7 +139,7 @@
     enemy.push(gl.effect["tama_s_01"]);
     enemy.push(gl.effect["tama_s_02"]);
     enemy.push(gl.effect["tama_s_03"]);
-    enemy.push(gl.effect["tama_s_04"]);
+    enemy.push(gl.chara["meteo"]);
     enemy.push(gl.effect["tama_l_02"]);
     enemy.push(gl.effect["tama_l_03"]);
     enemy.push(gl.chara["enemy_lightning"]);
@@ -148,7 +148,7 @@
     enemy.push(gl.chara["enemy_lasersplosh.003"]);
     enemy.push(gl.chara["missile"]);
     enemy.push(gl.chara["spacefish"]);
-
+    enemy.push(gl.effect["tama_s_04"]);
 }
 
 
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/parse.js~
--- a/webGL/dandy/resources/parse.js~	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/parse.js~	Sat Jul 17 12:56:57 2010 +0900
@@ -132,7 +132,7 @@
 {
     enemy.push(gl.chara["meteo"]);
     enemy.push(gl.chara["enemy_greencrab"]);
-    enemy.push(gl.chara["missile"]);
+    enemy.push(gl.chara["enemy_plane"]);
     enemy.push(gl.chara["gunbattery"]);
     enemy.push(gl.effect["enemy_redbullet"]);
     enemy.push(gl.effect["enemy_bluebullet"]);
@@ -146,7 +146,7 @@
     enemy.push(gl.chara["enemy_lasersplosh.001"]);
     enemy.push(gl.chara["enemy_lasersplosh.002"]);
     enemy.push(gl.chara["enemy_lasersplosh.003"]);
-    enemy.push(gl.chara["enemy_plane"]);
+    enemy.push(gl.chara["missile"]);
     enemy.push(gl.chara["spacefish"]);
 
 }
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/schedule.js
--- a/webGL/dandy/resources/schedule.js	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/schedule.js	Sat Jul 17 12:56:57 2010 +0900
@@ -189,8 +189,8 @@
 				Putenemy(3, Math.random() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
 				break;
 			case FRAME_RATE * 78:
-				//	Putenemy(41, rand() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
-				Putenemy(17, rand() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
+				//	Putenemy(41, Math.random() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
+				Putenemy(17, Math.random() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
 			case FRAME_RATE * 100:
 				//	Putenemy(41, 256, -128, 0, 1, chara_state7);
 				//	Putenemy(41, 1280 - 256 - 128, -128, 0, 1, chara_state7);
@@ -241,7 +241,7 @@
 				for(var i=0; Boolean(active_chara_list.enemy[i]); i++)
 				{
 					var p = active_chara_list.enemy[i];
-					p.f = false;
+					p.flag = false;
 					p.state = delete_chara;
 					p.collision = noaction;
 				}
@@ -310,7 +310,8 @@
 				Putenemy(2, 1024, -128, 0, 1, chara_state4);
 				break;
 			case FRAME_RATE * 21:
-				Putenemy(42, 0, 384, 0, 0, chara_state401);
+			    //				Putenemy(42, 0, 384, 0, 0, chara_state401);
+				Putenemy(17, 0, 384, 0, 0, chara_state401);
 				break;
 			case FRAME_RATE * 23:
 				Putenemy(9, 0, 0, 0, 0, chara_state22);
@@ -331,8 +332,10 @@
 				Putenemy(9, 0, 0, 0, 0, chara_state22);
 				break;
 			case FRAME_RATE * 29:
-				Putenemy(41, 256, 0, 0, 1, chara_state5);
-				Putenemy(41, 1280 - 256 - 128, 0, 0, 1, chara_state5);
+			    //				Putenemy(41, 256, 0, 0, 1, chara_state5);
+			    //				Putenemy(41, 1280 - 256 - 128, 0, 0, 1, chara_state5);
+				Putenemy(16, 256, 0, 0, 1, chara_state5);
+				Putenemy(16, 1280 - 256 - 128, 0, 0, 1, chara_state5);
 				Putenemy(9, 0, 0, 0, 3, chara_state22);
 				break;
 			case FRAME_RATE * 30:
@@ -342,9 +345,14 @@
 				Putenemy(9, 0, 0, 0, 0, chara_state22);
 				break;
 			case FRAME_RATE * 32:
+			    /*
 				Putenemy(42, 1280, 256, 0, -1, chara_state402);
 				Putenemy(42, 1280, 384, 0, 0, chara_state402);
 				Putenemy(42, 1280, 512, 0, -1, chara_state402);
+			    */
+				Putenemy(17, 1280, 256, 0, -1, chara_state402);
+				Putenemy(17, 1280, 384, 0, 0, chara_state402);
+				Putenemy(17, 1280, 512, 0, -1, chara_state402);
 				Putenemy(9, 0, 0, 0, 0, chara_state22);
 				break;
 			case FRAME_RATE * 33:
@@ -361,32 +369,40 @@
 				break;
 			case FRAME_RATE * 43:
 				for (i = 0; i < 7; i++) {
-					Putenemy(43, Math.random() % 2560, -i * 16, 0, Math.random() % 4, chara_state400);
-				}
+				    //					Putenemy(43, Math.random() % 2560, -i * 16, 0, Math.random() % 4, chara_state400);
+					Putenemy(4, Math.random() % 2560, -i * 16, 0, Math.random() % 4, chara_state400);				}
 				break;
 			case FRAME_RATE * 44:
 				for (i = 0; i < 9; i++) {
-					Putenemy(43, Math.random() % 2560, -i * 12, 0, Math.random() % 4, chara_state400);
+				    //					Putenemy(43, Math.random() % 2560, -i * 12, 0, Math.random() % 4, chara_state400);
+					Putenemy(4, Math.random() % 2560, -i * 12, 0, Math.random() % 4, chara_state400);
 				}
 				break;
 			case FRAME_RATE * 45:
 				for (i = 0; i < 5; i++) {
-					Putenemy(43, Math.random() % 640, 0, 0, Math.random() % 4, chara_state400);
+				    //					Putenemy(43, Math.random() % 640, 0, 0, Math.random() % 4, chara_state400);
+					Putenemy(4, Math.random() % 640, 0, 0, Math.random() % 4, chara_state400);
 				}
 				break;
 			case FRAME_RATE * 48:
-				Putenemy(41, 88, 0, 0, 2, chara_state3);
-				Putenemy(41, 176, 0, 0, 3, chara_state3);
+			    //				Putenemy(41, 88, 0, 0, 2, chara_state3);
+			    //				Putenemy(41, 176, 0, 0, 3, chara_state3);
+				Putenemy(16, 88, 0, 0, 2, chara_state3);
+				Putenemy(16, 176, 0, 0, 3, chara_state3);
 				break;
 			case FRAME_RATE * 50:
-				Putenemy(41, 266, 0, 0, 3, chara_state4);
+			    //				Putenemy(41, 266, 0, 0, 3, chara_state4);
+				Putenemy(16, 266, 0, 0, 3, chara_state4);
 				break;
 			case FRAME_RATE * 51:
-				Putenemy(41, 352, 0, 0, 3, chara_state5);
+			    //				Putenemy(41, 352, 0, 0, 3, chara_state5);
+				Putenemy(16, 352, 0, 0, 3, chara_state5);
 				break;
 			case FRAME_RATE * 52:
-				Putenemy(40, 840, 0, 4, 0, chara_state6);
-				Putenemy(40, 928, 0, 4, 0, chara_state7);
+			    //				Putenemy(40, 840, 0, 4, 0, chara_state6);
+			    //				Putenemy(40, 928, 0, 4, 0, chara_state7);
+				Putenemy(3, 840, 0, 4, 0, chara_state6);
+				Putenemy(3, 928, 0, 4, 0, chara_state7);
 				Putenemy(9, 976, 0, 4, 0, chara_state22);
 				break;
 				
diff -r 7f68fc18554a -r 527eac9a7d0b webGL/dandy/resources/schedule.js~
--- a/webGL/dandy/resources/schedule.js~	Sat Jul 17 08:15:28 2010 +0900
+++ b/webGL/dandy/resources/schedule.js~	Sat Jul 17 12:56:57 2010 +0900
@@ -12,7 +12,7 @@
 				//	SoundPlay(0);
 				break;
 			case FRAME_RATE * 2:
-				filpcount = FRAME_RATE * 120;
+			    //				filpcount = FRAME_RATE * 120;
 				Putenemy(1, 120, -128, 0, 4, chara_state0);
 				break;
 			case FRAME_RATE * 3:
@@ -247,18 +247,16 @@
 				}
 				//	Putenemy(4, 520, -128, 0, 1, chara_state8); // 1面ボスをPutenemy   
 				PutBoss(4, 520, -128, 0, 1, chara_state8);
-		}
+		} //switch文終了
 		
 		if(filpcount > FRAME_RATE * 130) {
 			if( !Boolean(active_chara_list.enemy[0])) {
-				alert("stage = 1");
 				stage = 1;
 				filpcount = 0;
 			}
 		}
     }
 	
-	
 	if( stage == 1) {
 		switch (filpcount) {
 			case 1: