Changeset 109 for pycodeshooter/trunk/shooter

Timestamp:

01/18/12 00:01:24 (12 years ago)

Author:

atzm

Message:

imaging support

Location:

pycodeshooter/trunk/shooter

Files:

• system.js (modified) (4 diffs)
• trooper.js (modified) (3 diffs)

pycodeshooter/trunk/shooter/system.js

@@ -22 +22 @@
     },
     "message":          null,
+    "enemyImages":      new Array(),
     "enemies":          new Array(),
     "players":          new Array(),
@@ -194 +195 @@
 }
 
+function addEnemyImage(image) {
+    System.enemyImages.push(image);
+}
+
 function addEnemy(enemyData) {
     var actList = EnemyActionLists[enemyData.mtime % EnemyActionLists.length];
@@ -242 +247 @@
         enemyData.name,
         new actList(acts),
+        System.enemyImages[enemyData.hitpoint % System.enemyImages.length],
         size,
         size,
@@ -373 +379 @@
         playerData.name,
         new ActionList([new ManualAction(new ManualShot())]),
+        playerData.image,
         playerData.size,
         playerData.hitsize,

pycodeshooter/trunk/shooter/trooper.js

@@ -71 +71 @@
 };
 
-var Trooper = function(name, actList, size, hitSize, color, hitColor,
+var Trooper = function(name, actList, image, size, hitSize, color, hitColor,
                        x, y, w, h, life, speed, numBombs, bombColors, barrages) {
 
@@ -78 +78 @@
     this.name       = name;
     this.actList    = actList;
+    this.image      = image;
     this.size       = size;
     this.hitSize    = hitSize;
@@ -185 +186 @@
 
         // draw trooper
-        ctx.beginPath();
-        ctx.fillStyle = this.color;
-        ctx.arc(this.x, this.y, this.size, 0, Math.PI * 2.0, true);
-        ctx.fill();
-        ctx.closePath();
-
+        if (this.image) {
+            var w = this.image.width * (this.size / this.image.height);
+            var h = this.size;
+            var x = this.x - (w / 2);
+            var y = this.y - (h / 2);
+            ctx.drawImage(this.image, x, y, w, h);
+        }
+        else {
+            ctx.beginPath();
+            ctx.fillStyle = this.color;
+            ctx.arc(this.x, this.y, this.size, 0, Math.PI * 2.0, true);
+            ctx.fill();
+            ctx.closePath();
+        }
+
+        // draw hit area
         if (this.color != this.hitColor || this.size != this.hitSize) {
             ctx.beginPath();