Changeset 114 for pycodeshooter/trunk

Timestamp:

01/21/12 04:46:57 (13 years ago)

Author:

atzm

Message:

• add bullet patterns, xreflect series

Location:

pycodeshooter/trunk/shooter

Files:

• bullet.js (modified) (10 diffs)
• system.js (modified) (2 diffs)
• trooper.js (modified) (1 diff)

pycodeshooter/trunk/shooter/bullet.js

@@ -14 +14 @@
  */
 
-var Bullet = function(size, color, frame, x, y, dir, speed) {
+var Bullet = function(size, color, frame, w, h, x, y, dir, speed) {
     this.size  = size;
     this.color = color;
     this.frame = frame;
+    this.w     = w;
+    this.h     = h;
     this.x     = x;
     this.y     = y;
@@ -66 +68 @@
 };
 
-var LinerBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new Bullet(size, color, frame, x, y, dir, speed);
+var LinerBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new Bullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.deltaBaseX = Math.cos(that.dir);
@@ -85 +87 @@
 };
 
-var AxisExtendBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new LinerBullet(size, color, frame, x, y, dir, speed);
+var XReflectLinerBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that  = new LinerBullet(size, color, frame, w, h, x, y, dir, speed);
+    var count = 0;
+
+    that.calcNext = function() {
+        var x = this.x + this.getDeltaX();
+        var y = this.y + this.getDeltaY();
+
+        if ((0 >= x || x >= this.w) && count < 5) {
+            count++;
+            this.dir += (2 - this.dir) - (this.dir - 1);
+            this.deltaBaseX = Math.cos(this.dir);
+            this.deltaBaseY = Math.sin(this.dir);
+            x = this.x + this.getDeltaX();
+            y = this.y + this.getDeltaY();
+        }
+
+        return [x, y];
+    };
+
+    return that;
+}
+
+var AxisExtendBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new LinerBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.dx = that.speed * that.deltaBaseX / 1.5;
@@ -105 +130 @@
 };
 
-var XYExtendBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new AxisExtendBullet(size, color, frame, x, y, dir, speed);
+var XYExtendBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new AxisExtendBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.i = 1;
@@ -119 +144 @@
 };
 
-var XExtendBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new AxisExtendBullet(size, color, frame, x, y, dir, speed);
+var XExtendBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new AxisExtendBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.i = 1;
@@ -133 +158 @@
 };
 
-var YExtendBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new AxisExtendBullet(size, color, frame, x, y, dir, speed);
+var YExtendBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new AxisExtendBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.i = 1;
@@ -147 +172 @@
 };
 
-var CurveBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new Bullet(size, color, frame, x, y, dir, speed);
+var CurveBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new Bullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.delta = 1 / (that.speed * 100);
     that.i     = 1;
 
+    that.getDir = function() {
+        return this.dir;
+    };
     that.calcNext = function() {
-        var x = this.x + Math.cos(this.dir) * this.i;
-        var y = this.y + Math.sin(this.dir) * this.i;
+        var d = this.getDir();
+        var x = this.x + Math.cos(d) * this.i;
+        var y = this.y + Math.sin(d) * this.i;
         this.dir += (this.delta / this.i) * this.getSign();
         this.i   += (this.delta / this.i);
@@ -164 +193 @@
 };
 
-var LeftCurveBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new CurveBullet(size, color, frame, x, y, dir, speed);
+var LeftCurveBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new CurveBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.getSign = function() {
@@ -174 +203 @@
 };
 
-var RightCurveBullet = function(size, color, frame, x, y, dir, speed) {
-    var that = new CurveBullet(size, color, frame, x, y, dir, speed);
+var RightCurveBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that = new CurveBullet(size, color, frame, w, h, x, y, dir, speed);
 
     that.getSign = function() {
@@ -184 +213 @@
 };
 
+var XReflectLeftCurveBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that  = new LeftCurveBullet(size, color, frame, w, h, x, y, dir, speed);
+    var count = 0;
+
+    that.getDir = function() {
+        var x = this.x + Math.cos(this.dir) * this.i;
+        var y = this.y + Math.sin(this.dir) * this.i;
+
+        if ((0 >= x || x >= this.w) && count < 5) {
+            count++;
+            this.dir += (2 - this.dir) - (this.dir - 1);
+        }
+
+        return this.dir;
+    };
+
+    return that;
+};
+
+var XReflectRightCurveBullet = function(size, color, frame, w, h, x, y, dir, speed) {
+    var that  = new RightCurveBullet(size, color, frame, w, h, x, y, dir, speed);
+    var count = 0;
+
+    that.getDir = function() {
+        var x = this.x + Math.cos(this.dir) * this.i;
+        var y = this.y + Math.sin(this.dir) * this.i;
+
+        if ((0 >= x || x >= this.w) && count < 5) {
+            count++;
+            this.dir += (2 - this.dir) - (this.dir - 1);
+        }
+
+        return this.dir;
+    };
+
+    return that;
+};
 
 var EnemyBullets = [LinerBullet,
+                    XReflectLinerBullet,
                     XYExtendBullet,
                     XExtendBullet,
                     YExtendBullet,
                     LeftCurveBullet,
-                    RightCurveBullet];
+                    RightCurveBullet,
+                    XReflectLeftCurveBullet,
+                    XReflectRightCurveBullet];

pycodeshooter/trunk/shooter/system.js

@@ -36 +36 @@
  */
 var DeathPiece = function(sizes, colors, x, y, dir, speed) {
-    var that = new LinerBullet(sizes[0], colors[0], null, x, y, dir, speed);
+    var that = new LinerBullet(sizes[0], colors[0], null,
+                               System.screen.width, System.screen.height,
+                               x, y, dir, speed);
 
     var sizeIdx  = -1;
@@ -112 +114 @@
         var s = Math.ceil(Math.random() * 5);
         System.backgroundObject.push(
-            new LinerBullet(size, color, null, x, 0, 0.5 * Math.PI, s));
+            new LinerBullet(size, color, null,
+                            System.screen.width, System.screen.height,
+                            x, 0, 0.5 * Math.PI, s));
     }
 

pycodeshooter/trunk/shooter/trooper.js

@@ -214 +214 @@
     this.addBullet = function(bulletType, size, color, frame, x, y, dir, speed) {
         this.bullets.push(
-            new bulletType(size, color, frame, this.x + x, this.y + y, dir, speed));
+            new bulletType(size, color, frame, this.w, this.h, this.x + x, this.y + y, dir, speed));
     };