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

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

diff --git a/index.php b/index.php
index 8b6593d..92af813 100644
--- a/index.php
+++ b/index.php
@@ -12,6 +12,10 @@
 
 <h1>The Littlest Battletank</h1>
 
+<div id="controls">
+    <label for="nbullets">Num Bullets</label> <input id="nbullets" name="nbullets" value="5" type="text">
+</div>
+
 <ul id="info" class="rounded">
     <li id="state"></li>
     <li><div class="fps-sparkline"></div></li>
diff --git a/src/tanks/game/game-map.js b/src/tanks/game/game-map.js
index 89a8884..bc4015b 100644
--- a/src/tanks/game/game-map.js
+++ b/src/tanks/game/game-map.js
@@ -52,6 +52,7 @@ Y(Game.prototype).extend({
             this.units.push(unit);
         }
         
+        
         return unit;
     },
     
@@ -72,15 +73,11 @@ Y(Game.prototype).extend({
         return agent;
     },
     
-    killAgent : function killAgent(agent){
-        delete this.byId[agent.id];
-        if (agent instanceof Ability)
-            this.abilities.remove(agent);
-        else
-            this.units.remove(agent);
-        
-        this.pathmap.removeBlocker(agent);
-        return agent;
+    killUnit : function killUnit(unit){
+        delete this.byId[unit.id];
+        this.units.remove(unit);
+        this.pathmap.removeBlocker(unit);
+        return unit;
     },
     
     moveAgentTo : function moveAgentTo(agent, x,y){
diff --git a/src/tanks/main-ui.js b/src/tanks/main-ui.js
index b719b68..bbf85d5 100644
--- a/src/tanks/main-ui.js
+++ b/src/tanks/main-ui.js
@@ -3,20 +3,67 @@
 function setupUI(){
     spark = LBT.loop.spark = new FpsSparkline(LBT.loop, '.fps-sparkline', 0,0);
     
-    // Draw grid, initial units
     LBT.root.draw();
     
-    setInterval(updateInfo, 1000);
-    updateInfo();
-    
     // Start button (click or return key)
     $(document).bind('keydown', 'return', toggleGame);
     $(document).bind('keydown', 'ctrl+o', toggleOverlay);
     
+    var bullets = new Y.YArray();
+    
+    $('#nbullets').bind('blur', function(){
+        var n = parseInt($('#nbullets').val());
+        
+        if ( isNaN(n) || n === bullets.size() ) return;
+        
+        while (n < bullets.size()) {
+            var i = rand(0, bullets.size()-1);
+            bullets.remove( bullets.attr(i).remove() );
+        }
+        
+        while (n > bullets.size())
+            bullets.push(spawnBullet());
+    });
+    
+    $('#nbullets').blur();
+    
+    // Draw grid, initial units
+    LBT.root.draw();
+    
+    setInterval(updateInfo, 1000);
+    updateInfo();
+    
     // Fix grid-size on resize
     // $(window).bind('resize', resizeGame);
 }
 
+
+function rand(a,b){ return a + Math.random()*(b-a); }
+function randOpenLoc(){
+    do {
+        var x = rand(0,COLUMNS*REF_SIZE)
+        ,   y = rand(0,ROWS*REF_SIZE);
+    } while ( LBT.pathmap.get(x,y, x+6,y+6).size() );
+    return new math.Vec(x,y);
+}
+
+function spawnBullet(x,y, atX,atY){
+    if (x === undefined && y === undefined) {
+        var loc = randOpenLoc();
+        x = loc.x; y = loc.y;
+    }
+    if (atX === undefined && atY === undefined) do {
+        atX = rand(0,COLUMNS*REF_SIZE);
+        atY = rand(0,ROWS*REF_SIZE);
+    } while ( atX === x && atY === y);
+    
+    T.setLocation(x,y);
+    var p = T.fireProjectile(atX,atY);
+    // console.log('spawnBullet(',x,y, atX,atY,') -->', p);
+    return p;
+}
+
+
 // Update performance info periodically
 function updateInfo(){
     var loop = LBT.loop
diff --git a/src/tanks/main.js b/src/tanks/main.js
index 93782b2..0c1ceb8 100644
--- a/src/tanks/main.js
+++ b/src/tanks/main.js
@@ -17,19 +17,21 @@ function main(){
     T = new Tank(0);
     LBT.addUnit(T, 1,2);
     
-    T.fireProjectile(5*sq,5*sq);
-    T.fireProjectile(1*sq,3*sq);
-    T.fireProjectile(6*sq,1.5*sq);
-    T.fireProjectile(0.5*sq,0.5*sq);
-    
-    T.setLocation(3*sq,3*sq);
-    T.fireProjectile(1*sq,1*sq);
-    
-    T.shape.hide();
     LBT.pathmap.removeBlocker(T);
+    T.shape.hide();
+    
+    // T.fireProjectile(5*sq,5*sq);
+    // T.fireProjectile(1*sq,3*sq);
+    // T.fireProjectile(6*sq,1.5*sq);
+    // T.fireProjectile(0.5*sq,0.5*sq);
+    // 
+    // T.setLocation(3*sq,3*sq);
+    // T.fireProjectile(1*sq,1*sq);
     
     P = new Player(LBT, T);
     
     setupUI();
+    
+    // T.setLocation(1*sq,2*sq);
 }
 
diff --git a/src/tanks/thing/bullet.js b/src/tanks/thing/bullet.js
index e169d96..1e80020 100644
--- a/src/tanks/thing/bullet.js
+++ b/src/tanks/thing/bullet.js
@@ -11,10 +11,10 @@ Bullet = new Y.Class('Bullet', Thing, {
         this.trajectory = new math.Line(loc.x,loc.y, x,y, this.stats.move*REF_SIZE/1000);
         this.setLocation(loc.x,loc.y);
     },
-    blocking : false,
+    blocking : true,
     elapsed : 0,
-    width  : 5,
-    height : 5,
+    width  : 6,
+    height : 6,
     
     stats : {
         move      : 2.0, // move speed (squares/sec)
@@ -53,7 +53,7 @@ Bullet = new Y.Class('Bullet', Thing, {
     
     _depth : 0,
     move : function move(){
-        var trj  = this.trajectory
+        var trj  = this.trajectory, p2 = trj.p2, goal = p2, _ng
         ,   to   = trj.parametric(this.elapsed)
         ,   test = this.game.pathmap.attemptMove(this, trj, to)
         ;
@@ -63,17 +63,17 @@ Bullet = new Y.Class('Bullet', Thing, {
             
             // Literal corner case :P
             if (test.corner) {
-                var to = this.loc, ng = trj.p1;
+                var to = this.loc, ng = _ng = trj.p1;
                 // this.trajectory = new math.Line(loc.x,loc.y, p1.x,p1.y, trj.tdist);
                 
                 
             // Normal reflection against one line
             } else {
                 to = test.to;
-                var wall = test.wall, p2 = trj.p2
+                var wall = test.wall
                 ,   bb = this.boundingBox
                 ,   goal = wall.isWithin(p2,bb) ? trj.near(p2.x+2*REF_SIZE, p2.y+2*REF_SIZE) : p2
-                ,   _ng, ng = _ng = math.reflect(goal, wall)
+                ,   ng = _ng = math.reflect(goal, wall)
                 ,   x1 = bb.x1, y1 = bb.y1
                 ,   tx = to.x,  ty = to.y
                 ,   cmp = Y.op.cmp
@@ -87,17 +87,17 @@ Bullet = new Y.Class('Bullet', Thing, {
             this.trajectory = new math.Line(to.x,to.y, ng.x,ng.y, trj.tdist);
             
             if (this._depth) {
-                console.log('['+this._depth+' '+TICKS+'] '+this+' reflected by', test.what);
+                console.log('['+this._depth+' '+TICKS+'] '+this+' reflected by', (test.corner ? 'corner' : test.what));
                 console.log('  to='+to+',  goal='+goal+(p2.equals(goal) ? '' : ' <~ '+p2));
                 console.log('  --> new goal='+ng+(ng.equals(_ng) ? '' : ' <~ '+_ng));
                 console.log('  --> trajectory='+this.trajectory);
             }
             
             this.render(this.game.level).draw();
-            this.elapsed = ELAPSED;
+            this.elapsed = 0; //ELAPSED;
             
             if (this._depth++ < 5)
-                return this.move();
+                return this; // this.move();
             
             console.log('Reflection limit reached!');
             this._depth = 0;
diff --git a/src/tanks/thing/tank.js b/src/tanks/thing/tank.js
index 7695136..6d22245 100644
--- a/src/tanks/thing/tank.js
+++ b/src/tanks/thing/tank.js
@@ -1,6 +1,7 @@
 
 Tank = new Y.Class('Tank', Thing, {
     projectile : Bullet,
+    blocking: true,
     
     // Bounding box size
     width  : REF_SIZE*0.7,
diff --git a/src/tanks/thing/thing.js b/src/tanks/thing/thing.js
index d274472..c2119b8 100644
--- a/src/tanks/thing/thing.js
+++ b/src/tanks/thing/thing.js
@@ -27,6 +27,7 @@ Thing = new Evt.Class('Thing', {
     
     loc : null,
     boundingBox : null,
+    blocking : true,
     
     // Rotation (rads)
     rotation : 0,
@@ -37,10 +38,17 @@ Thing = new Evt.Class('Thing', {
     
     
     destroy : function destroy(){
-        if (this.dead) return;
+        if (this.dead) return this;
         
         this.dead = true;
         this.fire('destroy', this);
+        return this;
+    },
+    
+    remove : function remove(){
+        if (this.shape) this.shape.remove();
+        if (this.game)  this.game.killUnit(this);
+        return this;
     },
     
     setLocation : function setLocation(x,y){
diff --git a/src/tanks/ui/player.js b/src/tanks/ui/player.js
index aecc829..dced277 100644
--- a/src/tanks/ui/player.js
+++ b/src/tanks/ui/player.js
@@ -78,15 +78,6 @@ Player = new Y.Class('Player', {
     },
     
     act : function act(){
-        var t = this.tank;
-        if (t.dead) return this;
-        
-        var r = TWO_PI * (TICKS % 30)/30;
-        // console.log('tank.shape.rotate(', r, ')');
-        // t.shape.rotate(r);
-    },
-    
-    act_ : function act_(){
         if (this.tank.dead) return this;
         
         var active = this.activeKeys;