Changeset 97 for pycodeshooter

Timestamp:

01/22/11 21:00:02 (14 years ago)

Author:

atzm

Message:

modified atari hantei

Location:

pycodeshooter/trunk

Files:

• index.html (modified) (2 diffs)
• shooter/system.js (modified) (2 diffs)
• shooter/trooper.js (modified) (4 diffs)

pycodeshooter/trunk/index.html

@@ -20 +20 @@
             "name":         document.getElementById("name").value,
             "size":         parseInt(document.getElementById("size").value),
+            "hitsize":      parseInt(document.getElementById("hitsize").value),
             "speed":        parseInt(document.getElementById("speed").value),
             "hitpoint":     parseInt(document.getElementById("hitpoint").value),
@@ -114 +115 @@
                 <br />
                 <canvas id="screen" width="320" height="480"></canvas>
-                <input type="hidden" value="5"  id="size" />
+                <input type="hidden" value="7"  id="size" />
+                <input type="hidden" value="1"  id="hitsize" />
                 <input type="hidden" value="5"  id="speed" />
                 <input type="hidden" value="7"  id="shotsize" />

pycodeshooter/trunk/shooter/system.js

@@ -287 +287 @@
         new ActionList([new ManualAction(new ManualShot())]),
         playerData.size,
+        playerData.hitsize,
         "#33F",
+        "#F33",
         System.screen.width / 2,
         System.screen.height - System.screen.height / 7,
@@ -369 +371 @@
         new actList(acts),
         Math.ceil(50 * (1 / bossData.defense)),
+        Math.ceil(50 * (1 / bossData.defense)),
+        "#F33",
         "#F33",
         System.screen.width / 2,

pycodeshooter/trunk/shooter/trooper.js

@@ -67 +67 @@
 };
 
-var Trooper = function(name, actList, size, color, x, y, w, h,
-                       life, speed, numBombs, barrages) {
+var Trooper = function(name, actList, size, hitSize, color, hitColor,
+                       x, y, w, h, life, speed, numBombs, barrages) {
 
     this.bullets  = new Array();
@@ -75 +75 @@
     this.actList  = actList;
     this.size     = size;
+    this.hitSize  = hitSize;
     this.color    = color;
+    this.hitColor = hitColor;
     this.x        = x;
     this.y        = y;
@@ -141 +143 @@
         delIdx = new Array();
         for (var i = 0; i < enemy.bullets.length; i++) {
-            if (touch(this.x, this.y, this.size,
+            if (touch(this.x, this.y, this.hitSize,
                       enemy.bullets[i].x, enemy.bullets[i].y, enemy.bullets[i].size))
                 delIdx.push(i);
@@ -164 +166 @@
         ctx.closePath();
 
+        if (this.color != this.hitColor || this.size != this.hitSize) {
+            ctx.beginPath();
+            ctx.fillStyle = this.hitColor;
+            ctx.arc(this.x, this.y, this.hitSize, 0, Math.PI * 2.0, true);
+            ctx.fill();
+            ctx.closePath();
+        }
+
         // draw bullets
         for (var i = 0; i < this.bullets.length; i++)