Changeset 98

Timestamp:

01/22/11 21:12:25 (14 years ago)

Author:

atzm

Message:

move bomb colors definition

Location:

pycodeshooter/trunk/shooter

Files:

• system.js (modified) (2 diffs)
• trooper.js (modified) (2 diffs)

pycodeshooter/trunk/shooter/system.js

@@ -297 +297 @@
         playerData.speed,
         playerData.numbombs,
+        ["rgba(255,0,0,0.3)", "rgba(0,0,255,0.3)"],
         [new LinerBarrage(YExtendBullet,
                           playerData.shotsize,
@@ -381 +382 @@
         Math.log(bossData.agility + 0.1) * 3,
         0,
+        ["rgba(255,0,0,0.3)", "rgba(0,0,255,0.3)"],
         brrgs
     );

pycodeshooter/trunk/shooter/trooper.js

@@ -68 +68 @@
 
 var Trooper = function(name, actList, size, hitSize, color, hitColor,
-                       x, y, w, h, life, speed, numBombs, barrages) {
-
-    this.bullets  = new Array();
-    this.bomb     = null;
-    this.name     = name;
-    this.actList  = actList;
-    this.size     = size;
-    this.hitSize  = hitSize;
-    this.color    = color;
-    this.hitColor = hitColor;
-    this.x        = x;
-    this.y        = y;
-    this.w        = w;
-    this.h        = h;
-    this.life     = life;
-    this.speed    = speed;
-    this.numBombs = numBombs;
-    this.barrages = barrages;
+                       x, y, w, h, life, speed, numBombs, bombColors, barrages) {
+
+    this.bullets    = new Array();
+    this.bomb       = null;
+    this.name       = name;
+    this.actList    = actList;
+    this.size       = size;
+    this.hitSize    = hitSize;
+    this.color      = color;
+    this.hitColor   = hitColor;
+    this.x          = x;
+    this.y          = y;
+    this.w          = w;
+    this.h          = h;
+    this.life       = life;
+    this.speed      = speed;
+    this.numBombs   = numBombs;
+    this.bombColors = bombColors;
+    this.barrages   = barrages;
 
     this.move = function(x, y) {
@@ -206 +207 @@
     this.addBomb = function() {
         if (!this.bomb && this.numBombs > 0) {
-            this.bomb = new Bomb(this.x, this.y, this.w, this.h, this.size * 2, 10,
-                                 ["rgba(255,0,0,0.3)", "rgba(0,0,255,0.3)"]);
+            this.bomb = new Bomb(this.x, this.y, this.w, this.h,
+                                 this.size * 2, 10, this.bombColors);
             this.numBombs--;
         }