From: dsc <david.schoonover@gmail.com>
Date: Wed, 10 Nov 2010 16:25:57 +0000 (-0800)
Subject: Adds random bullet spawns, makes them collide.
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=d91c90356c493cc639c734ff1534137f498e5728;p=tanks.git

Adds random bullet spawns, makes them collide.
---

diff --git a/index.php b/index.php
index 92af813..af12c2d 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
 <h1>The Littlest Battletank</h1>
 
 <div id="controls">
-    <label for="nbullets">Num Bullets</label> <input id="nbullets" name="nbullets" value="5" type="text">
+    <label for="nbullets">Num Bullets</label> <input id="nbullets" name="nbullets" value="15" type="text">
 </div>
 
 <ul id="info" class="rounded">
diff --git a/src/tanks/main-ui.js b/src/tanks/main-ui.js
index bbf85d5..a929878 100644
--- a/src/tanks/main-ui.js
+++ b/src/tanks/main-ui.js
@@ -17,7 +17,7 @@ function setupUI(){
         if ( isNaN(n) || n === bullets.size() ) return;
         
         while (n < bullets.size()) {
-            var i = rand(0, bullets.size()-1);
+            var i = Math.round(rand(0, bullets.size()-1));
             bullets.remove( bullets.attr(i).remove() );
         }
         
@@ -31,8 +31,9 @@ function setupUI(){
     LBT.root.draw();
     
     setInterval(updateInfo, 1000);
-    updateInfo();
+    // updateInfo();
     
+    toggleGame();
     // Fix grid-size on resize
     // $(window).bind('resize', resizeGame);
 }
diff --git a/src/tanks/thing/bullet.js b/src/tanks/thing/bullet.js
index 1e80020..9db727e 100644
--- a/src/tanks/thing/bullet.js
+++ b/src/tanks/thing/bullet.js
@@ -27,6 +27,13 @@ Bullet = new Y.Class('Bullet', Thing, {
             Thing.fillStats(this.stats) );
     },
     
+    remove : function remove(){
+        if (this.shape) this.shape.remove();
+        if (this.tline) this.tline.remove();
+        if (this.game)  this.game.killUnit(this);
+        return this;
+    },
+    
     createCooldowns : Y.op.nop,
     
     // setLocation : function setLocation(x,y){
diff --git a/src/tanks/thing/tank.js b/src/tanks/thing/tank.js
index 6d22245..cc34319 100644
--- a/src/tanks/thing/tank.js
+++ b/src/tanks/thing/tank.js
@@ -1,7 +1,7 @@
 
 Tank = new Y.Class('Tank', Thing, {
     projectile : Bullet,
-    blocking: true,
+    blocking: false,
     
     // Bounding box size
     width  : REF_SIZE*0.7,