battle con parte de tests pasando

gonguz · gonguz · commit 677d4e2353f7 · 2016-11-16T12:26:52.000+01:00
diff --git a/spec/Battle.js b/spec/Battle.js
@@ -93,7 +93,7 @@ describe('Battle type', function () {
 
   });
 
-  xdescribe('Start', function () {
+  describe('Start', function () {
 
     it('includes the characters who are going to fight by party.',
     function (done) {
@@ -110,7 +110,7 @@ describe('Battle type', function () {
 
   });
 
-  xdescribe('Turns', function () {
+  describe('Turns', function () {
 
     it('include relevant info.', function (done) {
       battle.on('turn', function (turn) {
@@ -140,7 +140,7 @@ describe('Battle type', function () {
 
   });
 
-  xdescribe('Parties in battle', function () {
+  describe('Parties in battle', function () {
 
     it('can contain repeated members, each will be assigned a different id.',
     function () {
diff --git a/src/Battle.js b/src/Battle.js
@@ -71,6 +71,7 @@ Battle.prototype._extractGrimoiresByParty = function (parties) {
 Battle.prototype._extractCharactersById = function (parties) {
   var idCounters = {};
   var characters = [];
+  var self = this;
   var partyIds = Object.keys(parties);
   partyIds.forEach(function (partyId) {
     var members = parties[partyId].members;
@@ -91,12 +92,14 @@ Battle.prototype._extractCharactersById = function (parties) {
     var name = character.name;
     if(idCounters[name] === undefined){
       idCounters[name] = 0;
+      idCounters[name]++;
     }else{
       idCounters[name]++;
       name += ' ' + idCounters[name];
     }
     return name;
   }
+
 };
 
 Battle.prototype._resetStates = function (charactersById) {
@@ -141,11 +144,14 @@ Battle.prototype._checkEndOfBattle = function () {
 
   function isAlive(character) {
     // Devuelve true si el personaje está vivo.
+    return !character.isDead();
+
   }
 
   function getCommonParty(characters) {
-    // Devuelve la party que todos los personajes tienen en común o null en caso
-    // de que no haya común.
+    // Devuelve la party que todos los personajes tienen en comÃºn o null en caso
+    // de que no haya comÃºn.
+    
   }
 };
 
