(graphics) Also patch up foundation offsets

Author: ahyangyi

agrf/graphics/sprites/foundation.py

@@ -15,10 +15,8 @@ def __init__(self, solid_sprite, ground_sprite, foundation_id, style, cut_inside
             representative.w,
             representative.h,
             zoom=representative.zoom,
-            xofs=representative.xofs,
-            yofs=representative.yofs
-            + (8 * ZOOM_TO_SCALE[representative.zoom] if style == "ground" else 0)
-            + (zshift * ZOOM_TO_SCALE[representative.zoom]),
+            xofs=0,
+            yofs=0,
             bpp=representative.bpp,
             crop=representative.crop,
         )
@@ -61,4 +59,11 @@ def get_data_layers(self, context):
         )
         timer.count_composing()
 
+        self.xofs = ret.xofs
+        self.yofs = (
+            ret.yofs
+            + (8 * ZOOM_TO_SCALE[self.zoom] if self.style == "ground" else 0)
+            + (self.zshift * ZOOM_TO_SCALE[self.zoom])
+        )
+
         return ret.w, ret.h, ret.rgb, ret.alpha, ret.mask

agrf/graphics/sprites/map.py

@@ -10,9 +10,7 @@ class MapSprite(grf.Sprite):
     def __init__(self, a, f, name, xofs=0, yofs=0):
         if not isinstance(a, tuple):
             a = (a,)
-        super().__init__(
-            a[0].w, a[0].h, zoom=a[0].zoom, xofs=a[0].xofs, yofs=a[0].yofs, bpp=a[0].bpp, crop=a[0].crop
-        )
+        super().__init__(a[0].w, a[0].h, zoom=a[0].zoom, xofs=a[0].xofs, yofs=a[0].yofs, bpp=a[0].bpp, crop=a[0].crop)
         self.a = a
         self.f = f
         self._fname = name