..

Author: ahyangyi

agrf/graphics/cv/foundation.py

@@ -9,16 +9,22 @@ def get_left_part(left_parts, r, c, solid, scale):
     left = np.ones_like(r, dtype=np.uint8) * ((c >= -32 * scale) * (c <= 0 * scale))
 
     # Top limit - not applicable to solid parts
-    if not solid:
-        if left_parts[2] == left_parts[3]:
-            left *= r * 2 + c >= (-16 * left_parts[3]) * scale
-        elif left_parts[2] == left_parts[3] + 1:
-            left *= r * 4 + c >= (-16 * left_parts[3]) * 2 * scale
-        else:
-            assert left_parts[2] == left_parts[3] - 1
-            left *= r * 4 + c * 3 >= (-16 * left_parts[3]) * 2 * scale
-
-    if left_parts[0] == left_parts[1]:
+    # special case for None which indicates a quarter-base in simple mode
+    if left_parts[2] is None:
+        left *= r >= 8 * scale
+    else:
+        if not solid:
+            if left_parts[2] == left_parts[3]:
+                left *= r * 2 + c >= (-16 * left_parts[3]) * scale
+            elif left_parts[2] == left_parts[3] + 1:
+                left *= r * 4 + c >= (-16 * left_parts[3]) * 2 * scale
+            else:
+                assert left_parts[2] == left_parts[3] - 1
+                left *= r * 4 + c * 3 >= (-16 * left_parts[3]) * 2 * scale
+
+    if left_parts[0] is None:
+        left *= r <= 8 * scale
+    elif left_parts[0] == left_parts[1]:
         left *= r * 2 - c <= (64 - 16 * left_parts[0]) * scale
     elif left_parts[0] == left_parts[1] + 1:
         left *= r * 4 - c <= (64 - 16 * left_parts[0]) * 2 * scale

agrf/lib/building/foundation.py

@@ -118,6 +118,18 @@ def get_sprite_conf(self, style, i):
             if self.se_shareground:
                 right[0] = right[1] = min(right[0], right[1]) - 1
 
+        if style == "simple":
+            if i < 6:
+                if left is not None:
+                    left[2] = left[3] = None
+                if right is not None:
+                    right[2] = right[3] = None
+            else:
+                if left is not None:
+                    left[0] = left[1] = None
+                if right is not None:
+                    right[0] = right[1] = None
+
         return left, right, y_limit
 
     def make_foundations_subset(self, subset):