Water and mountains.

Author: daftspaniel

web/index.html

@@ -48,6 +48,9 @@
         <button id="Stop">STOP</button>
         &nbsp;
         <button id="Reset">RESET</button>
+        <button id="Mountains">Mountains</button>
+        <button id="Lochs">Lochs</button>
+
     </div>
 </div>
 </body>

web/lib/featurebuilder.dart

@@ -11,7 +11,6 @@ class FeatureBuilder {
   final int count;
 
   FeatureBuilder(this.land, this.state, this.startHeight, this.count) {
-
     for (int i = 0; i < count; i++) {
       int spx = _rng.nextInt(land.width);
       int spy = _rng.nextInt(land.width);
@@ -31,13 +30,16 @@ class FeatureBuilder {
 
   void drawPoint(int x, int y, int c) {
     if (x < 0 || y < 0 || x > land.width - 1 || y > land.width - 1) return;
+    if (land.data[x][y].height < c)
+      land.data[x][y].height = c;
 
     land.data[x][y]
-      ..height = c
       ..state = state
       ..nextState = state;
 
+
     if (Vary3()) c--;
+
     if (c > 0) {
       if (Vary2()) drawPoint(x + 1, y - 1, c);
       if (Vary2()) drawPoint(x, y - 1, c);
@@ -54,11 +56,11 @@ class FeatureBuilder {
     }
   }
 
-  bool Vary2() {
-    return _rng.nextInt(7) == 1;
-  }
+  bool Vary2() =>
+      _rng.nextInt(7) == 1;
+
+
+  bool Vary3() =>
+      _rng.nextInt(19) != 1;
 
-  bool Vary3() {
-    return _rng.nextInt(20) != 1;
-  }
 }

web/lib/forest.dart

@@ -40,12 +40,20 @@ class Forest {
     land = new Grid(getTreeChance, getFireChance);
     print("world created");
     //water
+    addWater();
+    print("water created");
+    addMountains();
+    print("stone created");
+  }
+
+  void addWater() {
     new FeatureBuilder(
         land, PlotState.water, 20 + rng.nextInt(20), 6 + rng.nextInt(6));
-    print("water created");
+  }
+
+  void addMountains() {
     new FeatureBuilder(
         land, PlotState.stone, 20 + rng.nextInt(20), 6 + rng.nextInt(6));
-    print("stone created");
   }
 
   void update() {

web/main.dart

@@ -19,6 +19,8 @@ final InputElement speedControl = querySelector('#Speed');
 final ButtonElement startButton = querySelector('#Start');
 final ButtonElement stopButton = querySelector('#Stop');
 final ButtonElement resetButton = querySelector('#Reset');
+final ButtonElement mountainsButton = querySelector('#Mountains');
+final ButtonElement lochsButton = querySelector('#Lochs');
 final SpanElement statusDisplay = querySelector('#Status');
 
 final Forest trees = new Forest();
@@ -75,4 +77,10 @@ void setupGuiEventHandlers() {
     trees.reset();
     statusDisplay.text = "World built.";
   });
+  mountainsButton.onClick.listen((e) {
+    trees.addMountains();
+  });
+  lochsButton.onClick.listen((e) {
+    trees.addWater();
+  });
 }