Merge pull request #18 from orionsbelt-battlegrounds/name-movements

Name movements
orionsbelt-battlegrounds · Mar 10, 2014 · 9fc9072 · 9fc9072
2 parents 8a581e5 + 6f7b5d8
commit 9fc9072
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 61 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name" : "obb-battle-engine",
-  "version" : "0.0.3",
+  "version" : "0.0.4",
   "main" : "./obb.js",
   "private" : false,
   "scripts" : {

diff --git a/src/moves/movement/allMovement.js b/src/moves/movement/allMovement.js
@@ -1,5 +1,7 @@
 (function allMovement(module) {
 
+  module.name = "allMovement";
+
   module.isValid = function(src,dst,position) {
     if( dst.x <= src.x + 1 && dst.x >= src.x - 1 ) {
       if( dst.y <= src.y + 1 && dst.y >= src.y - 1 ) {

diff --git a/src/moves/movement/diagonalMovement.js b/src/moves/movement/diagonalMovement.js
@@ -1,5 +1,7 @@
 (function diagonalMovement(module) {
 
+  module.name = "diagonalMovement";
+
   module.isValid = function(src,dst,position) {
     if( dst.x == src.x + 1 && dst.y == src.y + 1 ||
       dst.x == src.x - 1 && dst.y == src.y - 1 ||

diff --git a/src/moves/movement/frontMovement.js b/src/moves/movement/frontMovement.js
@@ -7,6 +7,8 @@
     E : { x : 1, y: 0 }
   };
 
+  module.name = "frontMovement";
+
   module.isValid = function(src,dst,position) {
     var value =  frontValues[position];
     if( value != null ) {

diff --git a/src/moves/movement/normalMovement.js b/src/moves/movement/normalMovement.js
@@ -1,5 +1,7 @@
 (function normalMovement(module) {
 
+  module.name = 'normalMovement';
+
   module.isValid = function(src,dst,position) {
     if( dst.x <= src.x + 1 && dst.x >= src.x - 1 && src.y == dst.y ) {
       return true;

diff --git a/test/moves/movement/allMovement.js b/test/moves/movement/allMovement.js
@@ -10,6 +10,10 @@ describe('allMovement', function(){
       expect(allMovement.isValid).to.be.ok();
     });
 
+    it('should respond to name', function() {
+      expect(allMovement.name).to.be("allMovement");
+    });
+
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(3,6);

diff --git a/test/moves/movement/diagonalMovement.js b/test/moves/movement/diagonalMovement.js
@@ -10,58 +10,62 @@ describe('diagonalMovement', function(){
       expect(diagonalMovement.isValid).to.be.ok();
     });
 
+    it('should respond to name', function() {
+      expect(diagonalMovement.name).to.be("diagonalMovement");
+    });
+
     it('should be valid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,6);
-      	expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,6);
+      expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,6);
-      	expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,6);
+      expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,8);
-      	expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,8);
+      expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,8);
-      	expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,8);
+      expect(diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(3,6);
-      	expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(3,6);
+      expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(3,8);
-      	expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(3,8);
+      expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,7);
-      	expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,7);
+      expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,7);
-      	expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,7);
+      expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
-	it('should be invalid', function() {
+    it('should be invalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(8,8);
-        expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!diagonalMovement.isValid(src,dst,"N")).to.be.ok();
     });
   });
 });
diff --git a/test/moves/movement/frontMovement.js b/test/moves/movement/frontMovement.js
@@ -13,55 +13,59 @@ describe('frontMovement', function(){
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(3,6);
-        expect(frontMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(frontMovement.isValid(src,dst,"N")).to.be.ok();
+    });
+
+    it('should respond to name', function() {
+      expect(frontMovement.name).to.be("frontMovement");
     });
 
     it('should be invalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(3,8);
-        expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(2,7);
-        expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(4,7);
-        expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,6);
-      	expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,6);
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,6);
-      	expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,6);
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,8);
-      	expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,8);
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,8);
-      	expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,8);
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be ininvalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(8,8);
-        expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!frontMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
   });

diff --git a/test/moves/movement/normalMovement.js b/test/moves/movement/normalMovement.js
@@ -10,58 +10,62 @@ describe('normalMovement', function(){
       expect(normalMovement.isValid).to.be.ok();
     });
 
+    it('should respond to name', function() {
+      expect(normalMovement.name).to.be("normalMovement");
+    });
+
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(3,6);
-        expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(3,8);
-        expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(2,7);
-        expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be valid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(4,7);
-        expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,6);
-      	expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,6);
+      expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,6);
-      	expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,6);
+      expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(2,8);
-      	expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(2,8);
+      expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
-    	var src = new Coordinate(3,7);
-    	var dst = new Coordinate(4,8);
-      	expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
+      var src = new Coordinate(3,7);
+      var dst = new Coordinate(4,8);
+      expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
     it('should be invalid', function() {
       var src = new Coordinate(3,7);
       var dst = new Coordinate(8,8);
-        expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
+      expect(!normalMovement.isValid(src,dst,"N")).to.be.ok();
     });
 
   });