Changeset 109

Timestamp:

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

Author:

atzm

Message:

imaging support

Location:

pycodeshooter/trunk

Files:

• images (added)
• images/logo.png (added)
• images/ma1s.gif (added)
• images/ma2s.gif (added)
• images/ma5s.gif (added)
• images/ma6s.gif (added)
• images/ma7s.gif (added)
• images/man1s.gif (added)
• images/man2s.gif (added)
• images/man3s.gif (added)
• images/man4s.gif (added)
• images/man5s.gif (added)
• images/man6s.gif (added)
• images/man7s.gif (added)
• images/man8s.gif (added)
• images/man9s.gif (added)
• images/pin9s.gif (added)
• images/so1s.gif (added)
• images/so2s.gif (added)
• images/so3s.gif (added)
• images/so4s.gif (added)
• images/so8s.gif (added)
• images/so9s.gif (added)
• index.html (modified) (5 diffs)
• logo.png (deleted)
• shooter/system.js (modified) (4 diffs)
• shooter/trooper.js (modified) (3 diffs)

pycodeshooter/trunk/index.html

@@ -19 +19 @@
         var player = {
             "name":         document.getElementById("name").value,
+            "image":        document.getElementById("p_img0"),
             "size":         parseInt(document.getElementById("size").value),
             "hitsize":      parseInt(document.getElementById("hitsize").value),
@@ -60 +61 @@
                 clearInterval(titleIntervalId);
                 titleIntervalId = 0;
+
+                var imgs = document.getElementsByTagName("img");
+                for (var i = 0; i < imgs.length; i++) {
+                    if (imgs[i].getAttribute("id").match(/^e_img/)) {
+                        addEnemyImage(imgs[i]);
+                    }
+                }
+
                 startGame();
             }
+
             addEnemy(list[this[this.selectedIndex].value]);
         };
@@ -116 +126 @@
                 <br />
                 <canvas id="screen" width="320" height="480"></canvas>
-                <input type="hidden" value="7"  id="size" />
+                <input type="hidden" value="20" id="size" />
                 <input type="hidden" value="1"  id="hitsize" />
                 <input type="hidden" value="5"  id="speed" />
@@ -124 +134 @@
                 <input type="hidden" value="3"  id="shotlevel" />
                 <input type="hidden" value="/etc/pycodebattler/?mode=json" id="api" />
-                <img src="logo.png" style="visibility: hidden;" id="logoimg" />
+                <img src="images/logo.png" style="visibility: hidden;" id="logoimg" />
+
+                <img src="images/ma1s.gif"  style="visibility: hidden;" id="p_img0"  />
+                <img src="images/ma2s.gif"  style="visibility: hidden;" id="p_img1"  />
+                <img src="images/ma5s.gif"  style="visibility: hidden;" id="e_img0"  />
+                <img src="images/ma6s.gif"  style="visibility: hidden;" id="e_img1"  />
+                <img src="images/ma7s.gif"  style="visibility: hidden;" id="e_img2"  />
+                <img src="images/man1s.gif" style="visibility: hidden;" id="e_img3"  />
+                <img src="images/man2s.gif" style="visibility: hidden;" id="e_img4"  />
+                <img src="images/man3s.gif" style="visibility: hidden;" id="e_img5"  />
+                <img src="images/man4s.gif" style="visibility: hidden;" id="e_img6"  />
+                <img src="images/man5s.gif" style="visibility: hidden;" id="e_img7"  />
+                <img src="images/man6s.gif" style="visibility: hidden;" id="e_img8"  />
+                <img src="images/man7s.gif" style="visibility: hidden;" id="e_img9"  />
+                <img src="images/man8s.gif" style="visibility: hidden;" id="e_img10" />
+                <img src="images/man9s.gif" style="visibility: hidden;" id="e_img11" />
+                <img src="images/pin9s.gif" style="visibility: hidden;" id="e_img12" />
+                <img src="images/so1s.gif"  style="visibility: hidden;" id="e_img13" />
+                <img src="images/so2s.gif"  style="visibility: hidden;" id="e_img14" />
+                <img src="images/so3s.gif"  style="visibility: hidden;" id="e_img15" />
+                <img src="images/so4s.gif"  style="visibility: hidden;" id="e_img16" />
+                <img src="images/so8s.gif"  style="visibility: hidden;" id="e_img17" />
+                <img src="images/so9s.gif"  style="visibility: hidden;" id="e_img18" />
               </p>
             </form>
@@ -185 +217 @@
           <li><a href="http://trac.atzm.org/index.cgi/browser/pycodeshooter">pycodeshooter</a></li>
         </ul>
+
+        <p>åˆ©ç”šçŽ æç­‰</p>
+        <ul style="font-size: small;">
+          <li><a href="http://www.civillink.net/">ãƒ•ãƒªãƒŒçŽ æã®æ¥å€¢æ¥äºº</a></li>
+        </ul>
       </div>
     </div>

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();