cleaned random creature generation
This commit is contained in:
@@ -90,7 +90,6 @@ class OrganismEditor extends Environment{
|
||||
}
|
||||
|
||||
createRandom() {
|
||||
|
||||
this.grid_map.fillGrid(CellStates.empty);
|
||||
|
||||
this.organism = RandomOrganismGenerator.generate(this);
|
||||
@@ -98,26 +97,20 @@ class OrganismEditor extends Environment{
|
||||
this.organism.species = new Species(this.organism.anatomy, null, 0);
|
||||
}
|
||||
|
||||
createRandomWorld(worldEnvironment) {
|
||||
resetWithRandomOrgs(env) {
|
||||
let reset_confirmed = env.reset(true, false);
|
||||
if (!reset_confirmed) return;
|
||||
let numOrganisms = parseInt($('#num-random-orgs').val());
|
||||
|
||||
worldEnvironment.clear();
|
||||
let size = Math.ceil(8);
|
||||
|
||||
var numOrganismCols = Math.floor(worldEnvironment.grid_map.cols / this.grid_map.cols);
|
||||
var numOrganismRows = Math.floor(worldEnvironment.grid_map.rows / this.grid_map.rows);
|
||||
var center = this.grid_map.getCenter();
|
||||
|
||||
for (var x = 0; x < numOrganismCols; x++) {
|
||||
for (var y = 0; y < numOrganismRows; y++) {
|
||||
|
||||
var newOrganism = RandomOrganismGenerator.generate(this);
|
||||
//newOrganism.updateGrid();
|
||||
newOrganism.species = new Species(newOrganism.anatomy, null, 0);
|
||||
|
||||
var col = x * this.grid_map.cols + center[0];
|
||||
var row = y * this.grid_map.rows + center[1];
|
||||
worldEnvironment.controller.add_new_species = true;
|
||||
worldEnvironment.controller.dropOrganism(newOrganism, col, row);
|
||||
}
|
||||
for (let i=0; i<numOrganisms; i++) {
|
||||
let newOrganism = RandomOrganismGenerator.generate(this);
|
||||
newOrganism.species = new Species(newOrganism.anatomy, null, 0);
|
||||
var col = Math.floor(size + (Math.random() * (env.grid_map.cols-(size*2)) ) );
|
||||
var row = Math.floor(size + (Math.random() * (env.grid_map.rows-(size*2)) ) );
|
||||
env.controller.add_new_species = true;
|
||||
env.controller.dropOrganism(newOrganism, col, row);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,20 +75,12 @@ class WorldEnvironment extends Environment{
|
||||
|
||||
OriginOfLife() {
|
||||
var center = this.grid_map.getCenter();
|
||||
switch (WorldConfig.start_state){
|
||||
case 'simple-prod':
|
||||
var org = new Organism(center[0], center[1], this);
|
||||
org.anatomy.addDefaultCell(CellStates.mouth, 0, 0);
|
||||
org.anatomy.addDefaultCell(CellStates.producer, 1, 1);
|
||||
org.anatomy.addDefaultCell(CellStates.producer, -1, -1);
|
||||
this.addOrganism(org);
|
||||
FossilRecord.addSpecies(org, null);
|
||||
break;
|
||||
case 'random-orgs':
|
||||
break;
|
||||
case 'no-orgs':
|
||||
break;
|
||||
}
|
||||
var org = new Organism(center[0], center[1], this);
|
||||
org.anatomy.addDefaultCell(CellStates.mouth, 0, 0);
|
||||
org.anatomy.addDefaultCell(CellStates.producer, 1, 1);
|
||||
org.anatomy.addDefaultCell(CellStates.producer, -1, -1);
|
||||
this.addOrganism(org);
|
||||
FossilRecord.addSpecies(org, null);
|
||||
}
|
||||
|
||||
addOrganism(organism) {
|
||||
@@ -146,7 +138,7 @@ class WorldEnvironment extends Environment{
|
||||
|
||||
reset(confirm_reset=true, reset_life=true) {
|
||||
if (confirm_reset && !confirm('The current environment will be lost. Proceed?'))
|
||||
return;
|
||||
return false;
|
||||
|
||||
this.organisms = [];
|
||||
this.grid_map.fillGrid(CellStates.empty, !WorldConfig.clear_walls_on_reset);
|
||||
@@ -156,6 +148,7 @@ class WorldEnvironment extends Environment{
|
||||
FossilRecord.clear_record();
|
||||
if (reset_life)
|
||||
this.OriginOfLife();
|
||||
return true;
|
||||
}
|
||||
|
||||
resizeGridColRow(cell_size, cols, rows) {
|
||||
|
||||
Reference in New Issue
Block a user