From: Marcus Str. <marcus@marstr.online>
Date: Sat, 5 Oct 2024 07:45:04 +0000 (+0200)
Subject: Further fine-tuning to layering and completion generation ahead of release
X-Git-Url: https://marstr.online/code/gitweb.cgi?a=commitdiff_plain;h=b0f4a81acacff3149b6a1eb55e35316bd1ed4ad5;p=orthographic

Further fine-tuning to layering and completion generation ahead of release
---

diff --git a/defines.py b/defines.py
index 838c94f..cd26ea9 100644
--- a/defines.py
+++ b/defines.py
@@ -121,9 +121,6 @@ mstr_ortho_layers = [
     # Z-Order 0
     ("boundary", "administrative", "admin_level", ["8", "9", "10", "12"], "landuse", "residential-boundary"),
     # Z-Order 1
-    ("landuse", "grass", "landuse", "grass"),
-    ("landuse", "cemetery", "landuse", "grass"),
-    ("landuse", "greenfield", "landuse", "grass"),
     ("landuse", "orchard", "landuse", "meadow"),
     ("landuse", "meadow", "landuse", "meadow"),
     ("landuse", "recreation_ground", "landuse", "meadow"),
@@ -201,7 +198,10 @@ mstr_ortho_layers = [
     ("building", "yes", "building", "common"),
     ("place", "sea", "natural", "sea"),
     ("place", "ocean", "natural", "sea"),
-    ("landuse", "residential", "landuse", "residential-boundary")
+    ("landuse", "residential", "landuse", "residential-boundary"),
+    ("landuse", "grass", "landuse", "grass"),
+    ("landuse", "cemetery", "landuse", "grass"),
+    ("landuse", "greenfield", "landuse", "grass")
 ]
 
 
diff --git a/layergen.py b/layergen.py
index 2bb5f13..d541df3 100644
--- a/layergen.py
+++ b/layergen.py
@@ -445,7 +445,7 @@ class mstr_layergen:
                         for y in range(img.height):
                             for x in range(img.width):
                                 c = imgp[x,y]
-                                nc = (c[0], c[1], c[2], int(imgp[x,y][3]*0.25))
+                                nc = (c[0], c[1], c[2], int(imgp[x,y][3]*0.5))
                                 imgp[x,y] = nc
                         lx = randrange( self._imgsize - img.width ) 
                         ly = randrange( self._imgsize - img.height )
diff --git a/photogen.py b/photogen.py
index fe2b2bb..825fd76 100644
--- a/photogen.py
+++ b/photogen.py
@@ -113,11 +113,8 @@ class mstr_photogen:
         # aforementioned fix:
         if emptyspace == True:
             # Choose a suitable layer type
-            lt = [6,14,17]
-            pick = randrange(0,len(lt)-1)
-            ltp = lt[pick]
-            tag   = mstr_ortho_layers[ltp][0]
-            value = mstr_ortho_layers[ltp][1]
+            tag   = "landuse"
+            value = "meadow"
 
             mstr_msg("photogen", "Patching empty space")
             self.buildCompletionMask()