- Num Bullets +

config

bullets

fps
frame
fps
frame
objects
units
bullets
objects
units
bullets

').css({ +// 'position':'relative', +// 'width':'100%', +// 'top':0, 'left':0 +// }).appendTo('#controls')[0], '0 0'); +// // .attachTo(window, '10 10'); +// } diff --git a/src/tanks/main.js b/src/tanks/main.js index 0c1ceb8..c55ecda 100644 --- a/src/tanks/main.js +++ b/src/tanks/main.js @@ -14,24 +14,9 @@ function main(){ new Wall(3*sq,6*sq, 1*sq,1*sq) ); - T = new Tank(0); - LBT.addUnit(T, 1,2); - - 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); - + T = LBT.addUnit(new Tank(0), 1,2); P = new Player(LBT, T); setupUI(); - - // T.setLocation(1*sq,2*sq); } diff --git a/src/tanks/map/loc.js b/src/tanks/map/loc.js index 5ac58e3..ae77649 100644 --- a/src/tanks/map/loc.js +++ b/src/tanks/map/loc.js @@ -28,8 +28,8 @@ Loc = new Y.Class('Loc', math.Vec, { }, moveByAngle : function moveByAngle(theta, v){ - var x = this.x + v*Math.sin(theta) - , y = this.y + v*Math.cos(theta); + var x = this.x + v*Math.cos(theta) + , y = this.y + v*Math.sin(theta); return new Loc(x,y); }, @@ -72,9 +72,9 @@ Y(Loc).extend({ dirToAngle : function dirToAngle(dir){ switch (dir) { case Loc.RIGHT: return 0; - case Loc.UP: return HALF_PI; + case Loc.UP: return PI_AND_HALF; case Loc.LEFT: return PI; - case Loc.DOWN: return PI_AND_HALF; + case Loc.DOWN: return HALF_PI; default: throw new Error("wtf direction is "+dir+"??"); } diff --git a/src/tanks/map/pathmap.js b/src/tanks/map/pathmap.js index 8633bf2..19ead73 100644 --- a/src/tanks/map/pathmap.js +++ b/src/tanks/map/pathmap.js @@ -32,41 +32,15 @@ PathMap = new Y.Class('PathMap', QuadTree, { }, attemptMove : function attemptMove(obj, trj, to){ - var wall, blocker, what, bb = obj.boundingBox + var wall, blocker, what + , clamp = math.clamp + , bb = obj.boundingBox , maxW = this.width, maxH = this.height , w = bb.width, h = bb.height , x1 = to.x, y1 = to.y , x2 = x1+w, y2 = y1+h ; - // Check for collision with the walls - // if (x1 < 0 || x2 > maxW || y1 < 0 || y2 > maxH){ - // blocker = this.game.level; - // what = 'LevelWall on the '; - // - // if (x1 < 0) { - // what = 'left'; - // wall = this.walls.left; - // to = trj.pointAtX(0); - // - // } else if (x2 > maxW) { - // what = 'right'; - // wall = this.walls.right; - // to = trj.pointAtX(maxW-w); - // - // } else if (y1 < 0) { - // what = 'top'; - // wall = this.walls.top; - // to = trj.pointAtY(0); - // - // } else if (y2 > maxH) { - // what = 'bottom'; - // wall = this.walls.bottom; - // to = trj.pointAtY(maxH-h); - // } - // - // } - // Check for pathmap collisions var blockers = this.get(x1,y1, x2,y2).remove(obj); if (blockers.size() > 1){ @@ -98,6 +72,10 @@ PathMap = new Y.Class('PathMap', QuadTree, { } } + to.setXY( + clamp(to.x, 2,maxW-2), + clamp(to.y, 2,maxH-2) ); + what += ' at '+wall; return { 'ok':!wall, 'to':to, 'wall':wall, 'blocker':blocker, 'what':what }; }, @@ -110,23 +88,28 @@ PathMap = new Y.Class('PathMap', QuadTree, { , h = this.height *SCALE , canvas = $('.overlay', gridEl)[0]; - if (!canvas) + if (!canvas) { canvas = $('

The Littlest Battletank

The Littlest Battletank

config