Adds properties for reflectivity and inventory; fills in Item collision code.

diff --git a/src/ezl/index.cjs b/src/ezl/index.cjs
index 0b952af..112295b 100644 (file)
--- a/src/ezl/index.cjs
+++ b/src/ezl/index.cjs
@@ -6,12 +6,13 @@
 var Y = require('Y').Y;
 
 Y.extend(exports, {
-    'Layer'  : require('ezl/layer').Layer,
-    
+    'math'   : require('ezl/math'),
     'loc'    : require('ezl/loc'),
+    'util'   : require('ezl/util'),
+    
     'loop'   : require('ezl/loop'),
-    'math'   : require('ezl/math'),
+    
+    'layer'  : require('ezl/layer'),
     'shape'  : require('ezl/shape'),
-    'util'   : require('ezl/util'),
     'widget' : require('ezl/widget')
 });

diff --git a/src/tanks/abilities/buff.cjs b/src/ezl/layer/html.cjs
similarity index 100%
copy from src/tanks/abilities/buff.cjs
copy to src/ezl/layer/html.cjs

diff --git a/src/tanks/abilities/index.cjs b/src/ezl/layer/index.cjs
similarity index 100%
copy from src/tanks/abilities/index.cjs
copy to src/ezl/layer/index.cjs

diff --git a/src/ezl/layer.cjs b/src/ezl/layer/layer.cjs
similarity index 98%
rename from src/ezl/layer.cjs
rename to src/ezl/layer/layer.cjs
index 21f150f..75d5408 100644 (file)
--- a/src/ezl/layer.cjs
+++ b/src/ezl/layer/layer.cjs
@@ -1,16 +1,14 @@
 //#ensure "jquery"
-
-var undefined
-,   Y   = require('Y').Y
-,   Vec = require('ezl/math/vec').Vec
-,   loc = require('ezl/loc')
-,   Loc = loc.Loc
-,   BoundingBox = loc.BoundingBox
-,   Animation = require('ezl/loop/fx').Animation
+var Y           = require('Y').Y
+,   Vec         = require('ezl/math/vec').Vec
+,   Loc         = require('ezl/loc/loc').Loc
+,   BoundingBox = require('ezl/loc/boundingbox').BoundingBox
+,   Animation   = require('ezl/loop/fx').Animation
 , 
+
 CONTEXT_ATTRS  = Y('globalAlpha globalCompositeOperation strokeStyle fillStyle lineWidth lineCap lineJoin miterLimit shadowOffsetX shadowOffsetY shadowBlur shadowColor'.split(' ')),
 FAUX_ACCESSORS = Y('width height position stroke fill origin rotate scale translate title'.split(' '))
-,_X = 0, _Y = 1
+, _X = 0, _Y = 1
 ,
 
 

diff --git a/src/tanks/abilities/buff.cjs b/src/ezl/layer/text.cjs
similarity index 100%
copy from src/tanks/abilities/buff.cjs
copy to src/ezl/layer/text.cjs

diff --git a/src/ezl/shape/circle.cjs b/src/ezl/shape/circle.cjs
index 733148a..909ee8d 100644 (file)
--- a/src/ezl/shape/circle.cjs
+++ b/src/ezl/shape/circle.cjs
@@ -1,5 +1,4 @@
-var Y = require('Y').Y
-,   Shape = require('ezl/shape/shape').Shape
+var Shape = require('ezl/shape/shape').Shape
 ,
 
 Circle =

diff --git a/src/ezl/shape/line.cjs b/src/ezl/shape/line.cjs
index e007377..d347c7a 100644 (file)
--- a/src/ezl/shape/line.cjs
+++ b/src/ezl/shape/line.cjs
@@ -2,7 +2,7 @@
 
 var Y     = require('Y').Y
 ,   math  = require('ezl/math')
-,   Layer = require('ezl/layer').Layer
+,   Layer = require('ezl/layer/layer').Layer
 ,   Shape = require('ezl/shape/shape').Shape
 ,
 

diff --git a/src/ezl/shape/shape.cjs b/src/ezl/shape/shape.cjs
index 9e84fcc..e7ffad7 100644 (file)
--- a/src/ezl/shape/shape.cjs
+++ b/src/ezl/shape/shape.cjs
@@ -1,5 +1,4 @@
-var Y = require('Y').Y
-,   Layer = require('ezl/layer').Layer
+var Layer = require('ezl/layer/layer').Layer
 ,
 
 Shape =

diff --git a/src/ezl/util/astar.cjs b/src/ezl/util/astar.cjs
index 08e9885..1d15f05 100644 (file)
--- a/src/ezl/util/astar.cjs
+++ b/src/ezl/util/astar.cjs
@@ -16,7 +16,7 @@
         var end = graph.nodes[1][2];
         astar.search(graph.nodes, start, end);
 */
-var BinaryHeap = require('ezl/util/binaryheap').BinaryHeap;
+var BinaryHeap = require('ezl/util/tree/binaryheap').BinaryHeap;
 
 exports['init'] = init;
 function init(grid) {

diff --git a/src/ezl/util/binaryheap.cjs b/src/ezl/util/tree/binaryheap.cjs
similarity index 100%
rename from src/ezl/util/binaryheap.cjs
rename to src/ezl/util/tree/binaryheap.cjs

diff --git a/src/ezl/widget/cooldown.cjs b/src/ezl/widget/cooldown.cjs
index c7f492a..e94b51b 100644 (file)
--- a/src/ezl/widget/cooldown.cjs
+++ b/src/ezl/widget/cooldown.cjs
@@ -1,5 +1,5 @@
 var Y = require('Y').Y
-,   Layer = require('ezl/layer').Layer
+,   Layer = require('ezl/layer/layer').Layer
 
 ,   PI             = Math.PI
 ,   QUARTER_PI     = PI/4

diff --git a/src/tanks/calc.cjs b/src/tanks/calc.cjs
deleted file mode 100644 (file)
index 7e14ba2..0000000
--- a/src/tanks/calc.cjs
+++ /dev/null
@@ -1,5 +0,0 @@
-Calc = {
-    
-    
-    
-};
\ No newline at end of file

diff --git a/src/tanks/abilities/buff.cjs b/src/tanks/effects/buff.cjs
similarity index 100%
rename from src/tanks/abilities/buff.cjs
rename to src/tanks/effects/buff.cjs

diff --git a/src/tanks/abilities/index.cjs b/src/tanks/effects/index.cjs
similarity index 100%
rename from src/tanks/abilities/index.cjs
rename to src/tanks/effects/index.cjs

diff --git a/src/tanks/map/level.cjs b/src/tanks/map/level.cjs
index 6736b4f..147a7a1 100644 (file)
--- a/src/tanks/map/level.cjs
+++ b/src/tanks/map/level.cjs
@@ -46,7 +46,7 @@ Rect.subclass('Level', {
         // game.addThing(new Tank(2), 1,0);
         // game.addThing(new Tank(2), 8,1);
         
-        // I = game.addThing(new Item(), 8,8);
+        I = game.addThing(new Item(), 8,8);
     },
     
     addWall : function addWall(x,y, w,h, isBoundary){

diff --git a/src/tanks/map/pathmap.cjs b/src/tanks/map/pathmap.cjs
index 623cc21..c82075b 100644 (file)
--- a/src/tanks/map/pathmap.cjs
+++ b/src/tanks/map/pathmap.cjs
@@ -4,7 +4,7 @@ var Y          = require('Y').Y
 ,   math       = require('ezl/math')
 ,   vec        = require('ezl/math/vec')
 ,   QuadTree   = require('ezl/util/tree/quadtree').QuadTree
-,   BinaryHeap = require('ezl/util/binaryheap').BinaryHeap
+,   BinaryHeap = require('ezl/util/tree/binaryheap').BinaryHeap
 ,   Vec        = vec.Vec
 ,   Line       = math.Line
 

diff --git a/src/tanks/map/traversal.cjs b/src/tanks/map/traversal.cjs
index 4316d32..c51d193 100644 (file)
--- a/src/tanks/map/traversal.cjs
+++ b/src/tanks/map/traversal.cjs
@@ -110,11 +110,10 @@ Y.subclass('Traversal', {
     },
     
     collide : function collide(blocker){
-        var thing = this.thing
-        ,   data  = { 'traversal':this, 'thing':thing, 'blocker':blocker };
+        var thing = this.thing;
         
-        thing.fire('collide', blocker, data);
-        blocker.fire('collide', thing, data);
+        thing.fire('collide', blocker, { 'traversal':this, 'unit':blocker });
+        blocker.fire('collide', thing, { 'traversal':this, 'unit':thing });
     },
     
     rewind : function rewind(blocker){

diff --git a/src/tanks/thing/bullet.cjs b/src/tanks/thing/bullet.cjs
index b2a7e9c..22a02cc 100644 (file)
--- a/src/tanks/thing/bullet.cjs
+++ b/src/tanks/thing/bullet.cjs
@@ -115,11 +115,11 @@ Thing.subclass('Bullet', {
         var traj = this.trajectory
         
         ,   ng, d = evt.data
+        ,   unit = d.unit
         ,   tvsl = d.traversal
         ,   to   = tvsl.to
-        ,   unit = d.blocker
         
-        ,   isReflective = unit instanceof Wall // XXX: unit.reflective
+        ,   isReflective = unit.isReflective
         ;
         
         // Ignore collisions with zones

diff --git a/src/tanks/thing/item.cjs b/src/tanks/thing/item.cjs
index 704708a..231baef 100644 (file)
--- a/src/tanks/thing/item.cjs
+++ b/src/tanks/thing/item.cjs
@@ -7,39 +7,84 @@ var Y     = require('Y').Y
 ,   map   = require('tanks/map/map')
 ,   Thing = require('tanks/thing/thing').Thing
 
-,   SIZE = REF_SIZE * 0.5
+,   ITEM_SIZE = REF_SIZE * 0.5
 ,
 
 
 Item =
 exports['Item'] =
 Thing.subclass('Item', {
-    blocking : map.ZONE,
-    active   : false,
+    align : 0, // 0 reserved for neutral units
     
-    width  : SIZE,
-    height : SIZE,
+    blocking : map.ZONE,
+    width    : ITEM_SIZE,
+    height   : ITEM_SIZE,
     
-    stats : { hp:1, move:0, power:0 },
+    // indestructable
+    stats      : { hp:Infinity, move:0, power:0 },
+    dealDamage : op.nop,
     
     // inactive
-    createCooldowns : op.nop,
-    updateCooldowns : op.nop,
-    act : op.nop,
+    active     : false,
+    
+    
+    /// Instance Properties ///
+    type     : 'dummy',     // {String} Item type identifier (unique, for config lookup)
+    name     : 'Dummy',     // {String} Display name
+    icon_inv : '',          // {String} URL to inventory icon file (TODO)
+    icon_map : '',          // {String} URL to map icon file (TODO)
+    buffs    : Y([]),       // {Buff...} Passive effects (triggered on pickup)
+    effects  : Y([]),       // {Function...} Active effects (triggered on activation)
+    owner    : null,        // {Unit} Owner when picked up.
     
-    // indestructable
-    dealDamage : op.nop,
     
     
-    init : function initItem(){
+    // XXX: Setting these per-instance only while testing
+    init : function initItem(name, buffs, effects){
         Thing.init.call(this, 0);
+        if (name) this.name = name;
+        
+        if (buffs)
+            this.buffs = Y(buffs);
+        else
+            this.buffs = this.buffs.clone();
+        
+        if (effects)
+            this.effects = Y(effects);
+        else
+            this.effects = this.effects.clone();
         
         this.addEventListener('collide', this.onCollide.bind(this));
     },
     
+    activate : function activate(){
+        if (!this.owner) return;
+    },
+    
+    acquired : function acquired(unit){
+        this.owner = unit;
+        console.log(unit+' acquired '+this+'!');
+        // TODO: apply buffs
+        unit.fire('acquire', this, { 'unit':unit, 'item':this });