Members/e085711: webGL/dandy/resources/Character_state.js comparison

comparison webGL/dandy/resources/Character_state.js @ 13:4684e849866c

upload

author	NOBUYASU Oshiro
date	Sat, 17 Jul 2010 01:26:32 +0900
parents	61febc94fa62
children	a2b31fe50d9d

comparison

equal deleted inserted replaced

-:61febc94fa62
+:4684e849866c
 else p.state = chara_state5;
 //PutSprite(count, p.x, p.y, p.charano);
 return p;
 }
-chara_state6 = function character_state7(p)
+chara_state6 = function character_state6(p)
 {
 p.y += p.vy;
 p.x += p.vx;
 if(p.y + 96 < jiki.y
 && p.y + 128 > jiki.y)
 // stage1 boss patern
 chara_state8 = function character_state8( p )
 {
 if(p.y < 520*d_y)
 	{
-	    p.y -= p.vy;
+	    p.y += p.vy;
+	    tekino0 = p;
+	    count++;
 	    /*
-	    tekino0 = p;
 	    kyeenmyno = p;
-	    count++;
 	    DefSpriteEx(p.charano, 16*4, 32*4);
 	    PutSpriteEx(p.charano, (p.x * 4), (p.y * 4), 0.2, 0.2, 1);
 	    */
 	    p.dt1 = 512;
 	    p.s = 0.125;
 	    p.state = chara_state8;
 	    return p;
 	}
 return p;
 }
 chara_state9 = function character_state9( p )
 {
 if(p.s <= 2)
 	{
 	    p.s += 0.05
-	    p.y += 0.12;
+	    p.y -= 12*d_y;
 	    count++;
 	    //	    DefSpriteEx(54, 16*4, 32*4);
 	    //	    PutSpriteEx(54, (p.x * 4), (p.y * 4), p.x, p.x, 1);
 	    p.state = chara_state9;
 	    return p;
 	}
 count++;
-rinkx = p.x;
+rinkx = p.x/d_x;
-rinky = p.y;
+rinky = p.y/d_y;
 //    DefSpriteEx(54, 16,32);
 //    PutSpriteEx(54, p.x, p.y, p.s, p.s, 1);
 //    Putenemy(5, rinkx - 16, rinky -16, 1, 0, chara_state10);
 //    Putenemy(5, rinkx - 16, rinky -16, -1, 0, chara_state10);
-PutBoss(2, rinkx - 16, rinky -16, 1, 0, chara_state10);
-PutBoss(2, rinkx - 16, rinky -16, -1, 0, chara_state10);
+PutBoss(2, rinkx - 16*d_x, rinky -16*d_y, 1, 0, chara_state10);
+PutBoss(2, rinkx - 16*d_x, rinky -16*d_y, -1, 0, chara_state10);
 p.state = chara_state11;
 p.dt1 = 8192;
 return p;
 return p;
 }
 chara_state12 = function character_state12( p )
 {
-if(fastebos > 60+60)
+if(fastebos > 60*60)
 	{
-	    if(p.y > 70+boss[1].h)
+	    //	    if(p.y > 70+boss[1].h)
+	    if(p.y > (240+32)*d_y)
 		{
 		    p.state = delete_chara;
 		}
-	    p.y += 0.3;
+	    p.y += 0.3*d_y;
-	    rinky += 0.3;
+	    rinky += 0.3*d_y;
 	    count++;
 	    //	    DefSpriteEx(54, 16, 32);
 	    //	    PutSpriteEx(54, p.x, p.y, 2, 2, 1);
 	    p.state = chara_state12;
 	    return p;
 	}
 if(p.dt1 <= 60)
 	{
-	    if(jiki.x + 15 -rinkx < -5)
+	    if(jiki.x + 15*d_x -rinkx < -5*d_x)
 		{
-		    p.vx = -0.3;
+		    p.vx = -0.3 * d_x;
 		}
-	    else if(jiki.x + 15 - rinkx > 5)
+	    else if(jiki.x + 15*d_x - rinkx > 5*d_x)
 		{
-		    p.vx = +0.8;
+		    p.vx = +0.8 * d_x;
 		}
 	    else p.vx = 0;
 	    rinkx = p.x;
 	    rinky = p.y;
 	}
 if((p.dt1 > 60) && (p.dt1 <= 70))
 	{
 	    if(p.dt1 % 2 == 1)
 		{
-		    //		    Puttama(0, rinkx - 16, rinky);
+		    Puttama(0, rinkx - 16 , rinky);
-		    //		    Puttama(0, rinkx, rinky);
+		    Puttama(0, rinkx, rinky);
-		    //		    Puttama(0, rinkx + 16, rinky);
+		    Puttama(0, rinkx + 16, rinky);
 		}
 	}
 if((p.dt1 > 180) && (p.dt1 <= 240))
 	{
 	    if(p.dt1 % 2 == 1)
 		{
 		    rinkf2 = 1;
-		    //		    Puttama(2, rinkx - 16, p.y -32);
+		    Puttama(2, rinkx - 16, p.y -32);
-		    //		    Puttama(3, rinkx + 32 - 16, p.y - 32);
+		    Puttama(3, rinkx + 32 - 16, p.y - 32);
 		}
 	    else
 		{
 		    rinkf2 = 2;
 		}
 	    //	    PutSprite(count, rinkx - 16, rinky + 32, 58 + p.dt1 %4)
 	}
 if((p.dt1 > 300) && (p.dt1 <= 400))
 	{
 	    rinkf2 = 3;
-	    if(jiki.x + 15 - rinkx < -5)
+	    if(jiki.x + 15*d_x - rinkx < -5*d_x)
 		{
-		    p.vx = -1;
+		    p.vx = -1 * d_x;
 		}
-	    else if(jiki.x + 15 - rinkx > 5)
+	    else if(jiki.x + 15*d_x - rinkx > 5*d_x)
 		{
-		    p.vx = +1;
+		    p.vx = +1 * d_x;
 		}
 	    else p.vx = 0;
 	    p.x += p.vx;
 	    rinkx = p.x;
 	    rinky = p.y;
-//	    Puttama(4, rinkx - 8, rinky + 16);
+	    Puttama(4, rinkx - 8, rinky + 16);
 	}
 if((p.dt1 > 400) && (p.dt1 <= 500))
 	{
 	    rinkf2 = 4;
-	    if(jiki.x + 15 - rinkx > 5)
+	    if(jiki.x + 15*d_x - rinkx > 5*d_x)
 		{
-		    p.vx = -1;
+		    p.vx = -1*_dx;
 		}
-	    else if(jiki.x + 15 - rinkx >5)
+	    else if(jiki.x + 15*d_x - rinkx > 5*d_x)
 		{
-		    p.vx = +1;
+		    p.vx = +1*d_x;
 		}
 	    else p.vx = 0;
 	    p.x += p.vx;
 	    rinkx = p.x;
 	    rinky = p.y;
 	}
 if(p.dt1 > 500)
 	{
 	    rinkf2 = 5;
-	    if(jiki.x + 15 - rinkx < -5)
+	    if(jiki.x + 15*d_x - rinkx < -5*d_x)
 		{
-		    p.vx = -1;
+		    p.vx = -1*d_x;
 		}
-	    else if(jiki.x + 15 - rinkx > 5)
+	    else if(jiki.x + 15*d_x - rinkx > 5*d_x)
 		{
-		    p.vx = +1;
+		    p.vx = +1*d_x;
 		}
 	    else p.vx = 0;
 	    p.x += p.vx;
 	    rinkx = p.x;
 	    rinky = p.y;
 chara_state13 = function character_state13(p)
 {
 if(tekino0.flag == false)
 	{
-	    //	    Bom(p.x, p.y);
+	    Bom(p.x, p.y);
 	    p.flag = false;
 	    p.state = delete_chara;
 	    p.collision = noaction;
 	    return p;
 	}
-p.x += rinkx - p.dt1;
+p.x += rinkx*d_x - p.dt1*d_x;
-p.y += rinky -p.dt2;
+p.y += rinky*d_y -p.dt2*d_y;
 p.dt1 = rinkx;
 p.dt2 = rinky;
 if(rinkf2 == 1)
 	{
-	    if(p.x > rinkx)
+	    if(p.x > rinkx * d_x)
 		{
 		    Puttama(2, p.x + 32, p.y);
 		}
 	}
 if(rinkf2 == 4)
 	    count++;
 	    //	    PutSprite(count, p.x, p.y + 56, 58+filpcount % 4);
 	}
 if(rinkf2 == 5)
 	{
-	    if(p.x > rinkx)
+	    if(p.x > rinkx*d_x)
 		{
-		    //		    Puttama(5, p.x + 8, p.y + 24);
+		    Puttama(5, p.x + 8 , p.y + 24);
 		}
-	    if(p.x < rinkx)
+	    if(p.x < rinkx*d_x)
 		{
-		    //		    Puttama(5, p.x + 8, p.y + 24);
+		    Puttama(5, p.x + 8, p.y + 24);
 		}
 	}
 return p;
 }
+chara_state20 = function character_state(p)
+{
+p.x += p.vx;
+p.y += p.vy;
+p.vx -= 0.5*d_x;
+p.vy += 0.4*d_y;
+return p;
+}
+chara_state21 = function character_state(p)
+{
+p.x += p.vx;
+p.y += p.vy;
+p.vx += 0.5*d_x;
+p.vy += 0.4*d_y;
+return p;
+}