Changeset 96

Timestamp:

01/22/11 20:15:17 (14 years ago)

Author:

atzm

Message:

• add barrage patterns
• fixed a trivial bug

Location:

pycodeshooter/trunk/shooter

Files:

• barrage.js (modified) (6 diffs)
• system.js (modified) (4 diffs)
• trooper.js (modified) (5 diffs)

pycodeshooter/trunk/shooter/barrage.js

@@ -36 +36 @@
         return false;
     };
+    this.posX = function() {
+        return 0;
+    };
+    this.posY = function() {
+        return 0;
+    };
 };
 
@@ -49 +55 @@
 
         trooper.addBullet(this.bullet, this.size, this.color,
-                          0, 0, dir * Math.PI, this.speed);
-
-        for (i = 2; i < this.way + 1; i++) {
+                          this.posX(), this.posY(),
+                          dir * Math.PI, this.speed);
+
+        for (var i = 2; i < this.way + 1; i++) {
             var d = 0.5 / i;
 
             trooper.addBullet(this.bullet, this.size, this.color,
-                              0, 0, (dir - d) * Math.PI, this.speed);
+                              this.posX(), this.posY(),
+                              (dir - d) * Math.PI, this.speed);
             trooper.addBullet(this.bullet, this.size, this.color,
-                              0, 0, (dir + d) * Math.PI, this.speed);
+                              this.posX(), this.posY(),
+                              (dir + d) * Math.PI, this.speed);
         }
 
@@ -87 +96 @@
         var angle = this.angle(trooper, enemy) - (this.delta * this.way / 2);
 
-        for (i = 0; i < this.way; i++) {
+        for (var i = 0; i < this.way; i++) {
             trooper.addBullet(this.bullet, this.size, this.color,
-                              0, 0, angle * Math.PI, this.speed);
+                              this.posX(), this.posY(),
+                              angle * Math.PI, this.speed);
             angle += this.delta;
         }
@@ -136 +146 @@
 
         trooper.addBullet(this.bullet, this.size, this.color,
-                          0, 0, this.curAngle * Math.PI, this.speed);
+                          this.posX(), this.posY(),
+                          this.curAngle * Math.PI, this.speed);
 
         this.curAngle += this.delta;
@@ -216 +227 @@
         return true;
     };
+    return that;
+};
+
+var MultiRounderBarrage = function(bullet, size, color,
+                                   interval, speed, way, dir,
+                                   klass, radius, num) {
+    if (radius == null) {
+        radius = size * way;
+        if (radius > 50)
+            radius = 50;
+    }
+
+    if (num == null)
+        num = Math.ceil((1 / way) * 50);
+
+    var start = 0.25;
+
+    this.initBarrage = function() {
+        this.brrg = new Array();
+        this.flag = new Array();
+
+        var w = Math.ceil(way / num);
+
+        for (var i = 0; i < num; i++) {
+            var b = new klass(bullet, size, color,
+                              interval, speed, w, dir);
+
+            b.r = radius;
+            b.posX = function() {
+                start += 1 / (num * 2);
+                this.a = i * (1 / num) + start;
+                return this.r * Math.cos(2 * Math.PI * this.a);
+            };
+
+            b.posY = function() {
+                return this.r * Math.sin(2 * Math.PI * this.a);
+            };
+
+            this.brrg.push(b);
+            this.flag.push(false);
+        }
+    };
+
+    this.update = function(trooper, enemy) {
+        for (var i = 0; i < this.brrg.length; i++) {
+            if (!this.flag[i])
+                this.flag[i] = this.brrg[i].update(trooper, enemy);
+        }
+        for (var i = 0; i < this.flag.length; i++) {
+            if (!this.flag[i])
+                return false;
+        }
+        this.initBarrage();
+        return true;
+    };
+
+    this.initBarrage();
+};
+
+var MultiRounderArchBarrage = function(bullet, size, color,
+                                       interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, ArchBarrage);
+    return that;
+};
+
+var MultiRounderCircularBarrage = function(bullet, size, color,
+                                           interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, CircularBarrage);
+    return that;
+};
+
+var MultiRounderDelayedArchBarrage = function(bullet, size, color,
+                                              interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, DelayedArchBarrage);
+    return that;
+};
+
+var MultiRounderDelayedCircularBarrage = function(bullet, size, color,
+                                                  interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, DelayedCircularBarrage);
+    return that;
+};
+
+var MultiRounderDelayedRecursiveArchBarrage = function(bullet, size, color,
+                                                       interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, DelayedRecursiveArchBarrage);
+    return that;
+};
+
+var MultiRounderDelayedRecursiveCircularBarrage = function(bullet, size, color,
+                                                           interval, speed, way, dir) {
+    var that = new MultiRounderBarrage(bullet, size, color, interval, speed,
+                                       way, dir, DelayedRecursiveCircularBarrage);
     return that;
 };
@@ -226 +335 @@
                      DelayedCircularBarrage,
                      DelayedRecursiveArchBarrage,
-                     DelayedRecursiveCircularBarrage];
+                     DelayedRecursiveCircularBarrage,
+                     MultiRounderArchBarrage,
+                     MultiRounderCircularBarrage,
+                     MultiRounderDelayedArchBarrage,
+                     MultiRounderDelayedCircularBarrage,
+                     MultiRounderDelayedRecursiveArchBarrage,
+                     MultiRounderDelayedRecursiveCircularBarrage];

pycodeshooter/trunk/shooter/system.js

@@ -68 +68 @@
 
     var newObjs = new Array();
-    for (i = 0; i < System.backgroundObject.length; i++) {
+    for (var i = 0; i < System.backgroundObject.length; i++) {
         System.backgroundObject[i].next();
         System.backgroundObject[i].draw(ctx);
@@ -93 +93 @@
 
     var newObjs = new Array();
-    for (i = 0; i < System.deathPieces.length; i++) {
+    for (var i = 0; i < System.deathPieces.length; i++) {
         System.deathPieces[i].next();
         System.deathPieces[i].draw(ctx);
@@ -328 +328 @@
     setMessage(System.message, "ActionsIdx:");
 
-    for (i = 0; i < numAct; i++) {
+    for (var i = 0; i < numAct; i++) {
         var idx = (bossData.agility + i) % EnemyActions.length;
         acts.push(new EnemyActions[idx](new shot()));
 
-        addMessage(System.message, String(idx) + ",");
+        addMessage(System.message, String(idx) + "(" +
+                   String(bossData.hitpoint % EnemyShots.length) + "),");
     }
 
     addMessage(System.message, "<br>");
 
-    for (i = 0; i < numBrrg; i++) {
-        var idx     = (bossData.skills.length + i) % EnemyBarrages.length;
+    for (var i = 0; i < numBrrg; i++) {
+        var idx     = (bossData.skillpoint + i) % EnemyBarrages.length;
         var brrgCls = EnemyBarrages[idx];
 
@@ -344 +345 @@
                    "BarragesIdx:" + String(idx) + " / BulletsIdx:");
 
-        for (k = 0; k < numBlt; k++) {
+        for (var k = 0; k < numBlt; k++) {
             var iidx = (bossData.skills.length + i + k) % EnemyBullets.length;
-            var ss   = Math.ceil(bossData.luck / 3);
+            var ss   = Math.ceil(bossData.luck / 5);
             brrgs.push(
                 new brrgCls(

pycodeshooter/trunk/shooter/trooper.js

@@ -37 +37 @@
         // judge bullet
         var delIdx = new Array();
-        for (i = 0; i < enemy.bullets.length; i++) {
+        for (var i = 0; i < enemy.bullets.length; i++) {
             if (touch(this.x, this.y, this.size,
                       enemy.bullets[i].x, enemy.bullets[i].y, enemy.bullets[i].size))
@@ -130 +130 @@
         // update/delete my bullets
         delIdx = new Array();
-        for (i = 0; i < this.bullets.length; i++) {
+        for (var i = 0; i < this.bullets.length; i++) {
             this.bullets[i].next();
 
@@ -140 +140 @@
         // judge/delete hit bullets
         delIdx = new Array();
-        for (i = 0; i < enemy.bullets.length; i++) {
+        for (var i = 0; i < enemy.bullets.length; i++) {
             if (touch(this.x, this.y, this.size,
                       enemy.bullets[i].x, enemy.bullets[i].y, enemy.bullets[i].size))
@@ -165 +165 @@
 
         // draw bullets
-        for (i = 0; i < this.bullets.length; i++)
+        for (var i = 0; i < this.bullets.length; i++)
             this.bullets[i].draw(ctx);
     };
@@ -180 +180 @@
         var newBullets = new Array();
 
-        for (i = 0; i < idx.length; i++)
+        for (var i = 0; i < idx.length; i++)
             this.bullets[idx[i]] = null;
 
-        for (i = 0; i < this.bullets.length; i++)
+        for (var i = 0; i < this.bullets.length; i++)
             if (this.bullets[i])
                 newBullets.push(this.bullets[i]);