New build

Author: mtancoigne

build-demo.js

@@ -9,6 +9,7 @@ function createAndRenderMap(o){
     mapOptions:{},
     // Min room size on cleaning.
     minRoomSize:50,
+    cleanSmallRooms:true,
     createEnemies:true,
     enemiesPercent:10,
     createBoss:true,
@@ -37,20 +38,24 @@ function createAndRenderMap(o){
   map.createMap();
   //map.createMapFromSample(samples[2]);
   map.createRooms();
-  if(o.minRoomSize>0){map.removeSmallRooms(o.minRoomSize);}
+  if(o.minRoomSize>0 && o.cleanSmallRooms){map.removeSmallRooms(o.minRoomSize);}
 
   // At this point we can consider the map geography won't change, so we can
   // generate some data about it
   var walkableCells=map._getWalkableCells(false);
   var walkableSafeCells=map._getWalkableCells(true);
 
+  // Reset ennemies and items
+  dead_things={};
+  living_things={player: basePlayer};
+
   /*
     "game" specific "mechanisms" here. This is not included in the class
     (beside of map.addItem())
   */
 
   // Creating enemies, taking size of the map in account
-  if(o.createEnemies){('enemy', living_things.player.level, walkableSafeCells.length);}
+  if(o.createEnemies){createEnemies('enemy', living_things.player.level, walkableSafeCells.length, o.enemiesPercent);}
   if(o.createBoss){createEnemies('boss', living_things.player.level, null, 1);}
   // Adding to the map
   if(o.placeLivingThings){map.addItems(living_things, true);}
@@ -60,13 +65,15 @@ function createAndRenderMap(o){
   if(o.createStrenghtTokens){createSimpleItem('token_strength', walkableSafeCells.length, o.strenghtTokenMapPercent);}
   if(o.createDamageTokens){createSimpleItem('token_damage', walkableSafeCells.length, o.damageTokenMapPercent);}
   // Adding them to the map.
-  if(o.placeDeadThings){map.addItems(dead_things, !o.placeObjectsOnDamagingCells);}
 
+  if(o.placeDeadThings){map.addItems(dead_things, !o.placeObjectsOnDamagingCells);}
   // Debug
   //map.outlineRooms();
   if(o.drawPathes){map._findPaths();}
 
   // Render the map
+  // Reset the output
+  $('#grid').html('<div id="rooms"></div>');
   map.jQueryRender('#grid');
 
   /***************************************************************************
@@ -108,6 +115,33 @@ function createAndRenderMap(o){
     ctx.closePath();
     ctx.stroke();
   }
+
+  /********************
+  jQuery bindings
+  */
+
+  $('#rooms').hide();
+  $('#map-pathes').hide();
+  // Re bind
+  $('.map-cell').hover(function(a){
+    $('#position').text($(this).attr('class'))
+  });
+
+  // Tooltips. (base from http://www.alessioatzeni.com/blog/simple-tooltip-with-jquery-only-text/)
+  $('.map-cell').hover(function(){
+    // Hover over code
+    var cellId = $(this).attr('title');
+    var content='Cell :'+displayData(map.cells[cellId])+'Content:' +displayData(map.items[map.getCellContent(cellId)]);
+    $(this).data('tipText', cellId).removeAttr('title');
+    $('<p class="tooltip"></p>').html(content).appendTo('body').fadeIn('slow');}, function() {
+      // Hover out code
+      $(this).attr('title', $(this).data('tipText'));
+      $('.tooltip').remove();
+    }).mousemove(function(e) {
+      var mousex = e.pageX + 20; //Get X coordinates
+      var mousey = e.pageY + 10; //Get Y coordinates
+      $('.tooltip').css({ top: mousey, left: mousex });
+  });
 }
 
 /**
@@ -165,14 +199,15 @@ var Item=function(options){
   @param string type - The type of enemy (enemy/boss)
   @param int playerLevel - Player level, to generate enemy stats
   @param int walkableCells - Number of walkable cells to base enemies number
+  @param float enemiesPercent - Percentage
   @param int number - Forces the enemy number
 */
-function createEnemies(type, playerLevel, walkableCells, number){
+function createEnemies(type, playerLevel, walkableCells, enemiesPercent, number){
   var nb=0;
   if(number!=undefined){
     nb=number;
   }else{
-    nb=Math.floor(5*walkableCells/100);
+    nb=Math.floor(enemiesPercent*walkableCells/100);
   }
   // Number of enemies to generate:
   var enemies={};
@@ -208,14 +243,15 @@ function createEnemies(type, playerLevel, walkableCells, number){
       enemyStats.giveXp=enemyStats.level*40;
     }
 
-     living_things[type+'_'+i]=new Item({
+    living_things[type+'_'+i]=new Item({
       name:enemy.name,
       description:enemy.description+' <a href="'+enemy.more+'" target="_blank">More...</a>',
       canMove:true,
       stats: itemStats(enemyStats),
       className: (number===1?'boss': 'enemy'),
     })
   }
+  console.log("Created "+nb+' "'+type+'"')
 }
 
 /**
@@ -235,6 +271,7 @@ function createSimpleItem(name, walkableCells, percent, number){
   for(i=0; i<nb; i++){
     dead_things[name+'_'+i]=new Item(availableItems[name]);
   }
+  console.log('Created '+nb+' "'+name+'"');
 }
 
 
@@ -266,6 +303,42 @@ function displayData(json){
   content+='</ul>'
   return content;
 }
+
+function getOptions(){
+  var options= {
+    mapOptions:{
+      x:Number($('#oOptionsX').val()),
+      y:Number($('#oOptionsY').val()),
+      passes:Number($('#oOptionsPasses').val()),
+      cleanLevel:Number($('#oOptionsCleanLevel').val()),
+      wallPercent:Number($('#oOptionsWallPercent').val()),
+      sameSubCellPercent:Number($('#oOptionsSameSubCellPercent').val()),
+      cssPrefix:'map-',
+      cellTypes:cellTypes,
+    },
+    minRoomSize:Number($('#oMinRoomSize').val()),
+    cleanSmallRooms:$('#oCleanSmallRooms').is(':checked'),
+    createEnemies:$('#oCreateEnemies').is(':checked'),
+    enemiesPercent:Number($('#oEnemiesPercent').val()),
+    createBoss:$('#oCreateBoss').is(':checked'),
+    createLifePotions:$('#oCreateLifePotions').is(':checked'),
+    lifePotionsMapPercent:Number($('#oLifePotionsMapPercent').val()),
+    createStrenghtTokens:$('#oCreateStrenghtTokens').is(':checked'),
+    createDamageTokens:$('#oCreateDamageTokens').is(':checked'),
+    strenghtTokenMapPercent:Number($('#oStrenghtTokenMapPercent').val()),
+    damageTokenMapPercent:Number($('#oDamageTokenMapPercent').val()),
+    placeLivingThings:$('#oPlaceLivingThings').is(':checked'),
+    placeDeadThings:$('#oPlaceDeadThings').is(':checked'),
+    drawRooms:$('#oDrawRooms').is(':checked'),
+    drawPathes:$('#oDrawPathes').is(':checked'),
+    useSample:$('#oUseSample').is(':checked'),
+    placeObjectsOnDamagingCells:$('#oPlaceObjectsOnDamagingCells').is(':checked'),
+    sample:[],
+  }
+  console.log(options);
+  return options;
+
+}
 /*
 
 OBJECTS CONFIGURATION
@@ -297,13 +370,9 @@ var enemyNames=[
 
 // Base player stats
 var basePlayerStats={life:50, damage:10, strenght:1, level:1};
+var basePlayer=new Item({name:'Leukocyt', description: 'You, a white globule', canMove:true, stats: itemStats(basePlayerStats), className:'player'});
 
-// Player
-// For enemies and bosses, this should be filled after map generation, as the createEnemies function
-// needs infos baout the map.
-var living_things={
-  player: new Item({name:'Leukocyt', description: 'You, a white globule', canMove:true, stats: itemStats(basePlayerStats), className:'player'}),
-}
+var living_things={}
 var dead_things={};
 
 // Pickable items

build.js

@@ -144,7 +144,7 @@ MapGen.prototype.CellType.prototype.addClass=function(newClass){
   @param y int - Current col
 */
 MapGen.prototype._getCellType=function(x, y){
-  if(x>=0 && y>=0 && x<this.grid.length && y<this.grid.length){
+  if(x>=0 && y>=0 && x<this.grid[0].length && y<this.grid.length){
     return this.cells[x+':'+y].type.name;//grid[x][y];
   }else{
     return this.WALL; // Outside the map, so it's a wall.
@@ -274,9 +274,18 @@ MapGen.prototype._getWalkableCellsAround=function (x,y){
     let newX=inside[i][0];
     let newY=inside[i][1];
     if(newX>=0 && newY>=0){
-      if(this.cells[newX+':'+newY].type.isWalkable === true){
-        results.push(inside[i]);
+      try {
+        if(this.cells[newX+':'+newY].type.isWalkable === true){
+          results.push(inside[i]);
+        }
+      } catch (e) {
+        console.log(e);
+        console.log({x:x,y:y, newX:newX, newY:newY, type:type})
+        console.log(this.cells);
+      } finally {
+
       }
+
     }
   }
   return results;