Merge branch 'master' into public-release

Author: TheApplePieGod

client/src/components/sidebar/map-editor/map-editor.tsx

@@ -81,6 +81,7 @@ export const MapEditorPage: React.FC<Props> = (props) => {
         const handleKeyDown = (event: KeyboardEvent) => {
             if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
                 handleUndo()
+                event.preventDefault()
             }
         }
         window.addEventListener('keydown', handleKeyDown)

client/src/constants.ts

@@ -1,4 +1,4 @@
-export const CLIENT_VERSION = '1.4.1'
+export const CLIENT_VERSION = '1.4.2'
 export const SPEC_VERSION = '1'
 export const BATTLECODE_YEAR: number = 2025
 export const MAP_SIZE_RANGE = {

client/src/playback/Map.ts

@@ -373,15 +373,6 @@ export class StaticMap {
                     })
                 }
 
-                // Render ruins
-                this.ruins.forEach(({ x, y }) => {
-                    const coords = renderUtils.getRenderCoords(x, y, this.dimension)
-
-                    const imgPath = `ruins/silver.png`
-                    const ruinImage = getImageIfLoaded(imgPath)
-                    renderUtils.renderCenteredImageOrLoadingIndicator(ctx, ruinImage, coords, 1.0)
-                })
-
                 // Draw grid
                 const showGrid = true
                 if (showGrid) {
@@ -401,6 +392,15 @@ export class StaticMap {
                 }
             }
         }
+
+        // Render ruins
+        this.ruins.forEach(({ x, y }) => {
+            const coords = renderUtils.getRenderCoords(x, y, this.dimension)
+
+            const imgPath = `ruins/silver_64x64.png`
+            const ruinImage = getImageIfLoaded(imgPath)
+            renderUtils.renderCenteredImageOrLoadingIndicator(ctx, ruinImage, coords, 1.0)
+        })
     }
 
     isEmpty(): boolean {