cleaned random creature generation

src/Controllers/ControlModes.js

@@ -7,7 +7,6 @@ const Modes = {
     Edit: 5,
     Clone: 6,
     Drag: 7,
-    Randomize: 8,
 }
 
 module.exports = Modes;

src/Controllers/ControlPanel.js

@@ -14,7 +14,6 @@ class ControlPanel {
         this.defineHyperparameterControls();
         this.defineWorldControls();
         this.defineModeControls();
-        this.defineChallenges();
         this.fps = engine.fps;
         this.organism_record=0;
         this.env_controller = this.engine.env.controller;
@@ -198,11 +197,15 @@ class ControlPanel {
         });
         $('#clear-walls-reset').change(function() {
             WorldConfig.clear_walls_on_reset = this.checked;
-        })
-
-        $('#start-state').change ( function() {
-            WorldConfig.start_state = $("#start-state").val();
-        }.bind(this));
+        });
+        $('#reset-with-editor-org').click( () => {
+            let env = this.engine.env;
+            if (!env.reset(true, false)) return;
+            let center = env.grid_map.getCenter();
+            let org = this.editor_controller.env.getCopyOfOrg();
+            this.env_controller.add_new_species = true;
+            this.env_controller.dropOrganism(org, center[0], center[1])
+        });
     }
 
     defineHyperparameterControls() {
@@ -226,7 +229,6 @@ class ControlPanel {
             Hyperparams.foodDropProb = $('#food-drop-rate').val();
         });
         $('#extra-mover-cost').change(function() {
-            console.log(parseInt($('#extra-mover-cost').val()))
             Hyperparams.extraMoverFoodCost = parseInt($('#extra-mover-cost').val());
         });
 
@@ -346,9 +348,6 @@ class ControlPanel {
                 case "edit":
                     self.setMode(Modes.Edit);
                     break;
-                case "randomize":
-                    self.setMode(Modes.Randomize);
-                    self.editor_controller.setRandomizePanel();
                 case "drop-org":
                     self.setMode(Modes.Clone);
                     break;
@@ -358,7 +357,6 @@ class ControlPanel {
             $('.edit-mode-btn').removeClass('selected');
             $('.'+this.id).addClass('selected');
         });
-
         $('.reset-view').click( function(){
             this.env_controller.resetView();
         }.bind(this));
@@ -382,25 +380,13 @@ class ControlPanel {
             this.engine.organism_editor.clear();
             this.editor_controller.setEditorPanel();
         }.bind(this));
-        document.getElementById("random-width").addEventListener('input', function() {
-            var width = 2 * this.value + 1;
-            $('#random-width-display').text(width);
-            RandomOrganismGenerator.organismLayers = this.value;
-        });
-        document.getElementById("cell-spawn-chance").addEventListener("input", function() {
-            var value = parseFloat(this.value);
-            $('#spawn-chance-display').text((value * 100).toFixed(1) + "%");
-            RandomOrganismGenerator.cellSpawnChance = value;
-        });
         $('#generate-random').click( function() {
             this.engine.organism_editor.createRandom();
+            this.editor_controller.refreshDetailsPanel();
         }.bind(this));
-
-        $('#create-random-world').click( function() {
-            this.setPaused(true);
-            this.engine.organism_editor.createRandomWorld(this.engine.env);
+        $('.reset-random').click( function() {
+            this.engine.organism_editor.resetWithRandomOrgs(this.engine.env);
         }.bind(this));
-        }.bind(this))
 
         window.onbeforeunload = function (e) {
             e = e || window.event;
@@ -412,13 +398,6 @@ class ControlPanel {
         };
     }
 
-    defineChallenges() {
-        $('.challenge-btn').click(function() {
-            $('#challenge-title').text($(this).text());
-            $('#challenge-description').text($(this).val());
-        });
-    }
-
     setPaused(paused) {
 
         if (paused) {

src/Controllers/EnvironmentController.js

@@ -169,20 +169,23 @@ class EnvironmentController extends CanvasController{
 
         // close the organism and drop it in the world
         var new_org = new Organism(col, row, this.env, organism);
-        if (this.add_new_species){
-            FossilRecord.addSpeciesObj(new_org.species);
-            new_org.species.start_tick = this.env.total_ticks;
-            this.add_new_species = false;
-            new_org.species.population = 0;
-        }
-        else if (this.org_to_clone.species.extinct){
-            FossilRecord.resurrect(this.org_to_clone.species);
-        }
 
-        if (new_org.isClear(this.mouse_c, this.mouse_r)){
+        if (new_org.isClear(col, row)) {
+            if (this.add_new_species){
+                FossilRecord.addSpeciesObj(new_org.species);
+                new_org.species.start_tick = this.env.total_ticks;
+                this.add_new_species = false;
+                new_org.species.population = 0;
+            }
+            else if (this.org_to_clone.species.extinct){
+                FossilRecord.resurrect(this.org_to_clone.species);
+            }
+
             this.env.addOrganism(new_org);
             new_org.species.addPop();
+            return true;
         }
+        return false;
     }
 
     dropCellType(col, row, state, killBlocking=false) {