Adds levels to config.

diff --git a/data/types/buffs.yaml b/data/types/buffs.yaml
index 9109b53..4757a85 100644 (file)
--- a/data/types/buffs.yaml
+++ b/data/types/buffs.yaml
@@ -1,5 +1,6 @@
 # Buff definitions
 name: buff
+lookup: .tanks.data.buffs
 defaults:
     symbol: tanks/effects/buff.Buff
     timeout: -1 # the Infinity literal is not valid JSON

diff --git a/data/types/weapons.yaml b/data/types/bullets.yaml
similarity index 100%
rename from data/types/weapons.yaml
rename to data/types/bullets.yaml

diff --git a/data/types/items.yaml b/data/types/items.yaml
index 4d7a2de..8565072 100644 (file)
--- a/data/types/items.yaml
+++ b/data/types/items.yaml
@@ -1,5 +1,6 @@
 # Item definitions
 name: item
+lookup: .tanks.data.items
 defaults:
     symbol: tanks/thing/item.Item
 types:

diff --git a/data/types/levels.yaml b/data/types/levels.yaml
index e69de29..a31d9cd 100644 (file)
--- a/data/types/levels.yaml
+++ b/data/types/levels.yaml
@@ -0,0 +1,50 @@
+# Level definitions
+name: level
+lookup: .tanks.data.levels
+defaults:
+    symbol: tanks/map/level.Level
+types:
+    test:
+        name: Da Test
+        desc: A test level.
+        width: 500
+        height: 500
+        # bounds: [[-1,-1], [501,-1], [501,351], [351,351], [351,501], [-1,501]]
+        # bounds:
+        #     top:    [[-50,-50, 600,50]]
+        #     left:   [[-50,0, 50,500]]
+        #     right:  [[501,0, 551,351], [351,351, 401,501]]
+        #     bottom: [[-50,501, 401,551]]
+        bounds:
+          - [-50,-50, 600,50]
+          - [-50,0, 50,500]
+          - [501,0, 50,500]
+          - [-50,501, 600,50]
+          # - [351,351, 200,200]
+        walls:
+          - [300,50, 50,200] # [x,y, w,h]
+          - [300,350, 50,100]
+          - [50,350, 100,100]
+          - [150,300, 50,50]
+          - [100,100, 50,50]
+        units:
+          - type: player
+            align: 1
+            loc: [275,475]
+          - type: blue
+            align: 1
+            loc: [175,475]
+          - type: green
+            align: 2
+            loc: [25,375]
+          - type: green
+            align: 2
+            loc: [75,25]
+          - type: green
+            align: 2
+            loc: [425,75]
+        items: []
+        events: []
+        art:
+            bg: ''
+            doodads: []

diff --git a/data/types/units.yaml b/data/types/units.yaml
index 331bc54..5b725bb 100644 (file)
--- a/data/types/units.yaml
+++ b/data/types/units.yaml
@@ -1,5 +1,6 @@
 # Unit definitions
 name: unit
+lookup: .tanks.data.units
 defaults:
     symbol: tanks/thing/thing.Thing
     level: 1
@@ -26,7 +27,7 @@ types:
         name: Player
         desc: "Don't hate the Player, hate the--Wait. No, that's fine."
         tags: [ 'tank' ]
-        symbol: tanks/thing/player.PlayerTank
+        symbol: tanks/thing/player.Player
         stats:
             hp    : 1
             move  : 0.90

diff --git a/pavement.py b/pavement.py
index cfc0082..da4fbb4 100755 (executable)
--- a/pavement.py
+++ b/pavement.py
@@ -19,6 +19,7 @@ def commonjs(*args, **kw):
         if v is not True: kwargs.append(str(v))
     return sh('commonjs %s' % ' '.join( SRC_DIRS + kwargs + list(args)), capture=capture)
 
+
 @task
 def data():
     "Convert all yaml files to json."

diff --git a/src/Y/types/array.cjs b/src/Y/types/array.cjs
index faca9e6..a05c7c7 100644 (file)
--- a/src/Y/types/array.cjs
+++ b/src/Y/types/array.cjs
@@ -2,7 +2,7 @@ var Y           = require('Y/y').Y
 ,   del         = require('Y/delegate')
 ,   type        = require('Y/type')
 ,   op          = require('Y/op')
-,   mixInto     = require('Y/utils').mixInto
+,   proxy       = require('Y/utils').proxy
 ,   YCollection = require('Y/types/collection').YCollection
 
 ,   _Array        = Array
@@ -19,15 +19,15 @@ YCollection.subclass('YArray', function(YArray){
     
     var newYArray = YArray.instantiate.bind(YArray);
     
-    mixInto({ target:YArray, donor:_Array, context:'_o',
+    proxy({ target:YArray, donor:_Array, context:'_o',
         names:'indexOf lastIndexOf shift join'.split(' ') });
-    mixInto({ target:YArray, donor:_Array, context:'_o', chain:true,
+    proxy({ target:YArray, donor:_Array, context:'_o', chain:true,
         names:'push unshift sort splice reverse'.split(' ') });
-    mixInto({ target:YArray, donor:_Array, context:'_o', fnFirst:true, wrap:newYArray,
+    proxy({ target:YArray, donor:_Array, context:'_o', fnFirst:true, wrap:newYArray,
         names:'map forEach filter'.split(' ') });
-    mixInto({ target:YArray, donor:_Array, context:'_o', fnFirst:true,
+    proxy({ target:YArray, donor:_Array, context:'_o', fnFirst:true,
         names:['reduce', 'some', 'every'] });
-    mixInto({ target:YArray, donor:_Array, context:'_o', wrap:newYArray,
+    proxy({ target:YArray, donor:_Array, context:'_o', wrap:newYArray,
         names:['slice'] });
     
     

diff --git a/src/Y/types/string.cjs b/src/Y/types/string.cjs
index 4680f40..da020f3 100644 (file)
--- a/src/Y/types/string.cjs
+++ b/src/Y/types/string.cjs
@@ -1,5 +1,5 @@
 var YCollection = require('Y/types/collection').YCollection
-,   mixInto = require('Y/utils').mixInto
+,   proxy = require('Y/utils').proxy
 ,   op    = require('Y/op')
 ,   core  = require('Y/core')
 ,   del   = require('Y/delegate')
@@ -13,9 +13,9 @@ exports['YString'] =
 YCollection.subclass('YString', function(YString){
     
     var newYString = YString.instantiate.bind(YString);
-    mixInto({ target:YString, donor:String, context:'_o', wrap:newYString,
+    proxy({ target:YString, donor:String, context:'_o', wrap:newYString,
         names:'slice substr substring concat replace toLowerCase toUpperCase'.split(' ') });
-    mixInto({ target:YString, donor:String, context:'_o',
+    proxy({ target:YString, donor:String, context:'_o',
         names:'split indexOf lastIndexOf charAt charCodeAt'.split(' ') });
     
     function trim(val){

diff --git a/src/Y/utils.cjs b/src/Y/utils.cjs
index a20ad09..85bbb16 100644 (file)
--- a/src/Y/utils.cjs
+++ b/src/Y/utils.cjs
@@ -32,8 +32,8 @@ function bindAll(o, names){
 
 
 var 
-This   = mixInto['This']   = {},
-Target = mixInto['Target'] = {},
+This   = proxy['This']   = {},
+Target = proxy['Target'] = {},
 defaults = {
     /**
      * {Object|Function} target Required. Target object onto which methods will be added. If this a Function, it's prototype will be used.
@@ -51,10 +51,10 @@ defaults = {
     'names' : null,
     
     /**
-     * {mixInto.This|mixInto.Target|String} [context=mixInto.This]
+     * {proxy.This|proxy.Target|String} [context=proxy.This]
      * Sets the call context for the function.
-     *  - {mixInto.This}: (Default) Use runtime `this` as context.
-     *  - {mixInto.Target}: Use `target` as context.
+     *  - {proxy.This}: (Default) Use runtime `this` as context.
+     *  - {proxy.Target}: Use `target` as context.
      *  - {String}: Names a property on `this` to use. If specified and property is false-y, `this` is used.
      */
     'context' : This,
@@ -81,7 +81,7 @@ defaults = {
      */
     'fnFirst' : false
 };
-function mixInto(options){
+function proxy(options){
     var o = core.extend({}, defaults, options)
     ,   target = o.target
     ,   donor  = o.donor
@@ -123,4 +123,4 @@ function mixInto(options){
 }
 
 exports['bindAll'] = bindAll;
-exports['mixInto'] = mixInto;
+exports['proxy'] = proxy;

diff --git a/src/evt.cjs b/src/evt.cjs
index 42532bc..b74b7d8 100644 (file)
--- a/src/evt.cjs
+++ b/src/evt.cjs
@@ -90,7 +90,13 @@ function ConstructorTemplate() {
         
         var initialise = instance.__initialise__;
         if ( isFunction(initialise) )
-            return initialise.apply(instance, args);
+            initialise.apply(instance, args);
+        
+        cls.fire('created', instance, {
+            'instance' : instance,
+            'cls'      : cls,
+            'args'     : Y(args)
+        });
     }
     
     return instance;
@@ -199,12 +205,6 @@ function Class(className, Parent, members){
     
     eval(constructor);
     
-    // Copy Class statics
-    // for (var i=0, L=classStatics.length; i<L; ++i) {
-    //     var k = classStatics[i];
-    //     NewClass[k] = ClassFactory[k];
-    // }
-    
     // Copy parent methods, then add new instance methods
     for (var k in parentMembers)
         if ( hasOwn.call(parentMembers,k) )
@@ -268,6 +268,7 @@ function Class(className, Parent, members){
                 setDesc(prototype, k, getDesc(members,k));
     }
     
+    NewClass.instantiate = instantiate.partial(NewClass);
     // prototype.__bind__ = Y([]).concat(prototype.__bind__||[], SuperClass.fn.__bind__||[]).unique();
     
     // Notify mixins to let them finish up any customization

diff --git a/src/ezl/layer/layer.cjs b/src/ezl/layer/layer.cjs
index 1f2bd73..97dcdd3 100644 (file)
--- a/src/ezl/layer/layer.cjs
+++ b/src/ezl/layer/layer.cjs
@@ -103,6 +103,9 @@ Y.subclass('Layer', {
         this.remove();
         this.dirty = true;
         
+        if ( !(parent instanceof Layer) && (parent.shape instanceof Layer) )
+            parent = parent.shape;
+        
         // Layer? Add self as new child, fix DOM
         if ( parent instanceof Layer ) {
             this.parent = parent;
@@ -124,6 +127,7 @@ Y.subclass('Layer', {
             this.parent.children.remove(this);
         this.parent = null;
         this.layer.remove();
+        return this;
     },
     
     /**
@@ -170,6 +174,9 @@ Y.subclass('Layer', {
         if (w === undefined && h === undefined)
             return new Vec(this.layerWidth,this.layerHeight);
         
+        if (w === null) w = this.layerWidth;
+        if (h === null) h = this.layerHeight;
+        
         this.layerWidth  = w;
         this.layerHeight = h;
         
@@ -187,7 +194,7 @@ Y.subclass('Layer', {
         });
         this.canvas.css({
             'width' : cw,           'height' : ch,
-            'margin-left' : -nb.x,  'top' : -nb.y
+            'margin-left' : -nb.x,  'margin-top' : -nb.y
         });
         var el = this.canvas[0];
         el.width  = cw;

diff --git a/src/ezl/util/data/datafile.cjs b/src/ezl/util/data/datafile.cjs
index 87c40a3..2bbf1f3 100644 (file)
--- a/src/ezl/util/data/datafile.cjs
+++ b/src/ezl/util/data/datafile.cjs
@@ -27,18 +27,19 @@ new evt.Class('DataFile', {
     resolve : function resolve(spec){
         var nameParts = spec.split('.')
         ,   modName = nameParts.shift()
-        ;
-        if (!(modName && modName.length && nameParts.length))
-            this.die('Cannot resolve symbol: '+spec);
+        ,   module ;
         
-        var module = require(modName)
-        ,   symbol = getNested(module, nameParts)
-        ;
+        if (!modName)
+            module = window;
+        else
+            module = require(modName);
+        
+        if (!nameParts.length)
+            this.die('Cannot resolve symbol: '+spec);
         
+        var symbol = getNested(module, nameParts)
         if (!symbol)
             this.die('Unable to locate class specified by symbol (symbol="'+spec+'", module='+module+' --> '+symbol+')!');
-        if (!Y.isFunction(symbol.speciate))
-            this.die('Cannot create types from data (symbol-class '+symbol+' from "'+spec+'" is not Speciated)!');
         
         return symbol;
     },
@@ -49,7 +50,9 @@ new evt.Class('DataFile', {
         // console.group('DataFile: processing '+this.path);
         
         var types = Y(data.types)
-        ,   defaults = data.defaults || {};
+        ,   defaults = data.defaults || {}
+        ,   lookup = this.resolve(data.lookup)
+        ;
         if (!(types && Y.isFunction(types.forEach)))
             this.die('Specified types are not iterable! '+data.types);
         
@@ -62,8 +65,14 @@ new evt.Class('DataFile', {
                 this.die('No symbol defined for type "'+id+'" at '+this.path+'!');
             
             delete props.symbol;
-            var base = this.resolve(symbol)
-            ,   type = base.speciate(id, props);
+            var base = this.resolve(symbol);
+            
+            if (!Y.isFunction(base.speciate))
+                this.die('Cannot create types from data (symbol-class '+base+' from "'+symbol+'" is not Speciated)!');
+            
+            var type = base.speciate(id, props);
+            lookup[id] = type;
+            
             // console.log('Added type '+id+':', type);
         }, this);
         

diff --git a/src/ezl/util/tree/quadtree.cjs b/src/ezl/util/tree/quadtree.cjs
index 6f1b489..5b22c8b 100644 (file)
--- a/src/ezl/util/tree/quadtree.cjs
+++ b/src/ezl/util/tree/quadtree.cjs
@@ -53,6 +53,10 @@ Y.subclass('QuadTree', {
         this.clear();
     },
     
+    resize : function resize(x1,y1, x2,y2){
+        Rect.call(this, x1,y1, x2,y2);
+        return this;
+    },
     
     /**
      * Determines if the given Rect overlaps with this tree,

diff --git a/src/tanks/config.cjs b/src/tanks/config.cjs
index 91c40d3..23c4a96 100644 (file)
--- a/src/tanks/config.cjs
+++ b/src/tanks/config.cjs
@@ -18,6 +18,7 @@ exports['defaults'] = {
     ui : {
         createGridCanvas   : true,
         createGridTable    : false,
+        overlayOnPause     : true,
         showGridCoords     : false,
         showAttackCooldown : false,
         showCountdown      : (document.location.host.toString() !== 'tanks.woo')
@@ -47,7 +48,7 @@ config.addEventListener('set:pathing.gridSquare', function(evt){
 /// Load Data Files ///
 
 var files = 
-    'types/buffs types/items types/units' // types/level levels game
+    'types/buffs types/items types/units types/levels' // levels game
         .split(' ')
         .map(function(type){
             return new DataFile('build/data/'+type+'.json');

diff --git a/src/tanks/game.cjs b/src/tanks/game.cjs
index d397fcd..5d8b883 100644 (file)
--- a/src/tanks/game.cjs
+++ b/src/tanks/game.cjs
@@ -13,7 +13,10 @@ var Y         = require('Y').Y
 ,   PathMapUI = require('tanks/ui/pathmapui').PathMapUI
 
 ,   Level  = map.Level
-,   Thing  = thing.Thing, Tank = thing.Tank, Bullet = thing.Bullet
+,   Thing  = thing.Thing
+,   Tank   = thing.Tank
+,   Bullet = thing.Bullet
+,   Player = thing.Player
 ,
 
 
@@ -40,28 +43,29 @@ Y.subclass('Game', {
         this.viewport = $(viewport || GRID_ELEMENT);
         this.loop = new EventLoop(FRAME_RATE, this);
         
-        this.root = 
-        this.grid = 
+        this.root =
+        this.grid =
             new Grid(COLUMNS,ROWS, REF_SIZE)
                 .appendTo(this.viewport);
         this.level =
-            new Level(this, COLUMNS*REF_SIZE, ROWS*REF_SIZE)
+            Level.create('test', this, CAPACITY, REF_SIZE)
                 .appendTo(this.root);
         
-        var pathmap = this.pathmap = this.level.pathmap;
-        pathmap.ui = new PathMapUI(this, pathmap);
-        this.level.append(pathmap.ui);
+        this.pathmap = this.level.pathmap;
+        this.pathmap.ui = new PathMapUI(this, this.pathmap);
+        this.root.append(this.pathmap.ui);
         
-        Thing.addEventListener('init',    this.addThing);
+        // automatically keep track of units
+        Thing.addEventListener('created', this.addThing);
         Thing.addEventListener('destroy', this.killThing);
-        
         this.addEventListener('tick', this.tick);
         
+        this.level.setup();
         this.fire('ready', this);
     },
     
     destroy : function destroy(){
-     &nb