Changes to layer generation, namely meadow generation to make it more realistic,...

diff --git a/defines.py b/defines.py
index 9aee7fce2e2c0cccfa9d2712670243323579212d..838c94f518f603c1c20c4a9929e2eeb095f41043 100644 (file)
--- a/defines.py
+++ b/defines.py
@@ -119,7 +119,6 @@ mstr_zl_19 = 0.008
 # most likely crash.\r
 mstr_ortho_layers = [\r
     # Z-Order 0\r
-    ("landuse", "residential", "landuse", "residential-boundary"),\r
     ("boundary", "administrative", "admin_level", ["8", "9", "10", "12"], "landuse", "residential-boundary"),\r
     # Z-Order 1\r
     ("landuse", "grass", "landuse", "grass"),\r
@@ -201,7 +200,8 @@ mstr_ortho_layers = [
        ("building", "commercial", "building", "commercial"),\r
     ("building", "yes", "building", "common"),\r
     ("place", "sea", "natural", "sea"),\r
-    ("place", "ocean", "natural", "sea")\r
+    ("place", "ocean", "natural", "sea"),\r
+    ("landuse", "residential", "landuse", "residential-boundary")\r
 ]\r
 \r
 \r

diff --git a/layergen.py b/layergen.py
index 80d29f70d9df24cf23a45c23ade1eb53b0908cf7..2bb5f137ebfcc48b236baae9a1a884bc122b1ccf 100644 (file)
--- a/layergen.py
+++ b/layergen.py
@@ -405,7 +405,7 @@ class mstr_layergen:
             # Here we need to do some magic to make some features look more natural\r
             if (self._tag == "landuse" and self._value == "meadow") or (self._tag == "natural" and self._value == "grassland") or (self._tag == "natural" and self._value == "heath") or (self._tag == "landuse" and self._value == "cemetery") or (self._tag == "landuse" and self._value == "residential"):\r
                 if self._is_completion == False:\r
-                    amt = randrange(1,251)\r
+                    amt = randrange(2, 9)\r
                     for i in range(1, amt+1):\r
                         ptc = randrange(1, 14)\r
                         img = Image.open(mstr_datafolder + "textures/tile/completion/p" + str(ptc)+".png")\r