Load css resources async, improve building descriptions

README.md

@@ -81,7 +81,7 @@ This project is based on ES5. Some ES2015 features are used but most of them are
 8. In `translations/base-en.yaml` add it to two sections: `buildings.[my_building].XXX` (See other buildings) and also `keybindings.mappings.[my_building]`. Be sure to do it the same way as other buildings do!
 9. Create a icon (128x128, [prefab](https://github.com/tobspr/shapez.io-artwork/blob/master/ui/toolbar-icons.psd)) for your building and save it in `res/ui/buildings_icons` with the id of your building
 10. Create a tutorial image (600x600) for your building and save it in `res/ui/building_tutorials`
-11. In `src/css/icons.scss` add your building to `$buildings` as well as `$buildingAndVariants`
+11. In `src/css/resources.scss` add your building to `$buildings` as well as `$buildingAndVariants`
 12. Done! Optional: Add a new reward for unlocking your building at some point.
 
 #### Adding a new game system

gulp/css.js

@@ -58,40 +58,76 @@ function gulptasksCSS($, gulp, buildFolder, browserSync) {
             .pipe($.sassLint.failOnError());
     });
 
-    // Builds the css in dev mode
+    function resourcesTask({ cachebust, isProd }) {
-    gulp.task("css.dev", () => {
         return gulp
-            .src(["../src/css/main.scss"])
+            .src("../src/css/main.scss", { cwd: __dirname })
             .pipe($.plumber())
             .pipe($.sass.sync().on("error", $.sass.logError))
-            .pipe($.postcss(postcssPlugins(false, {})))
+            .pipe(
-            .pipe(gulp.dest(buildFolder))
+                $.postcss([
-            .pipe(browserSync.stream());
+                    $.postcssCriticalSplit({
+                        blockTag: "@load-async",
+                    }),
+                ])
+            )
+            .pipe($.rename("async-resources.css"))
+            .pipe($.postcss(postcssPlugins(isProd, { cachebust })))
+            .pipe(gulp.dest(buildFolder));
+    }
+
+    // Builds the css resources
+    gulp.task("css.resources.dev", () => {
+        return resourcesTask({ cachebust: false, isProd: false });
     });
 
-    // Builds the css in production mode (=minified)
+    // Builds the css resources in prod (=minified)
-    gulp.task("css.prod", () => {
+    gulp.task("css.resources.prod", () => {
-        return (
+        return resourcesTask({ cachebust: true, isProd: true });
-            gulp
-                .src("../src/css/main.scss", { cwd: __dirname })
-                .pipe($.plumber())
-                .pipe($.sass.sync({ outputStyle: "compressed" }).on("error", $.sass.logError))
-                .pipe($.postcss(postcssPlugins(true, { cachebust: true })))
-                .pipe(gulp.dest(buildFolder))
-        );
     });
 
-    // Builds the css in production mode (=minified), without cachebusting
+    // Builds the css resources in prod (=minified), without cachebusting
-    gulp.task("css.prod-standalone", () => {
+    gulp.task("css.resources.prod-standalone", () => {
-        return (
+        return resourcesTask({ cachebust: false, isProd: true });
-            gulp
+    });
+
+    function mainTask({ cachebust, isProd }) {
+        return gulp
             .src("../src/css/main.scss", { cwd: __dirname })
             .pipe($.plumber())
-                .pipe($.sass.sync({ outputStyle: "compressed" }).on("error", $.sass.logError))
+            .pipe($.sass.sync().on("error", $.sass.logError))
-                .pipe($.postcss(postcssPlugins(true, { cachebust: false })))
+            .pipe(
-                .pipe(gulp.dest(buildFolder))
+                $.postcss([
-        );
+                    $.postcssCriticalSplit({
+                        blockTag: "@load-async",
+                        output: "rest",
+                    }),
+                ])
+            )
+            .pipe($.postcss(postcssPlugins(isProd, { cachebust })))
+            .pipe(gulp.dest(buildFolder));
+    }
+
+    // Builds the css main
+    gulp.task("css.main.dev", () => {
+        return mainTask({ cachebust: false, isProd: false });
     });
+
+    // Builds the css main in prod (=minified)
+    gulp.task("css.main.prod", () => {
+        return mainTask({ cachebust: true, isProd: true });
+    });
+
+    // Builds the css main in prod (=minified), without cachebusting
+    gulp.task("css.main.prod-standalone", () => {
+        return mainTask({ cachebust: false, isProd: true });
+    });
+
+    gulp.task("css.dev", gulp.parallel("css.main.dev", "css.resources.dev"));
+    gulp.task("css.prod", gulp.parallel("css.main.prod", "css.resources.prod"));
+    gulp.task(
+        "css.prod-standalone",
+        gulp.parallel("css.main.prod-standalone", "css.resources.prod-standalone")
+    );
 }
 
 module.exports = {

gulp/html.js

@@ -27,7 +27,8 @@ function gulptasksHTML($, gulp, buildFolder) {
         return gulp
             .src("../src/html/" + (standalone ? "index.standalone.html" : "index.html"))
             .pipe(
-                $.dom(/** @this {Document} **/ function () {
+                $.dom(
+                    /** @this {Document} **/ function () {
                         const document = this;
 
                         // Preconnect to api
@@ -52,6 +53,21 @@ function gulptasksHTML($, gulp, buildFolder) {
                         }
                         document.head.appendChild(css);
 
+                        // Append async css
+                        const asyncCss = document.createElement("link");
+                        asyncCss.rel = "stylesheet";
+                        asyncCss.type = "text/css";
+                        asyncCss.media = "none";
+                        asyncCss.setAttribute("onload", "this.media='all'");
+                        asyncCss.href = cachebust("async-resources.css");
+                        if (integrity) {
+                            asyncCss.setAttribute(
+                                "integrity",
+                                computeIntegrityHash(path.join(buildFolder, "async-resources.css"))
+                            );
+                        }
+                        document.head.appendChild(asyncCss);
+
                         if (app) {
                             // Append cordova link
                             const cdv = document.createElement("script");
@@ -63,7 +79,8 @@ function gulptasksHTML($, gulp, buildFolder) {
                         // Google analytics
                         if (analytics) {
                             const tagManagerScript = document.createElement("script");
-                        tagManagerScript.src = "https://www.googletagmanager.com/gtag/js?id=UA-165342524-1";
+                            tagManagerScript.src =
+                                "https://www.googletagmanager.com/gtag/js?id=UA-165342524-1";
                             tagManagerScript.setAttribute("async", "");
                             document.head.appendChild(tagManagerScript);
 
@@ -212,7 +229,8 @@ function gulptasksHTML($, gulp, buildFolder) {
                 `;
 
                         document.body.innerHTML = bodyContent;
-                })
+                    }
+                )
             )
             .pipe(
                 $.htmlmin({

gulp/package.json

@@ -66,6 +66,7 @@
         "babel-plugin-danger-remove-unused-import": "^1.1.2",
         "css-mqpacker": "^7.0.0",
         "cssnano": "^4.1.10",
+        "postcss-critical-split": "^2.5.3",
         "electron-packager": "^14.0.6",
         "faster.js": "^1.1.0",
         "glob": "^7.1.3",

gulp/yarn.lock

@@ -9623,6 +9623,14 @@ postcss-convert-values@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-critical-split@^2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/postcss-critical-split/-/postcss-critical-split-2.5.3.tgz#9339d3699f6363d0a3ad0952420dc9faa181363b"
+  integrity sha512-FDG+evU4RBGM9/LQ5nCktzFKjYH2O/SLollJwtrdGagXXbMvk620Bc9o8WpqHJnu573uxVkx9lhob1HZvSWhZg==
+  dependencies:
+    merge "^1.2.0"
+    postcss "^6.0.1"
+
 postcss-custom-media@^7.0.8:
   version "7.0.8"
   resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
@@ -10181,7 +10189,7 @@ postcss@^5.0.2:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.10, postcss@^6.0.9:
+postcss@^6.0.1, postcss@^6.0.10, postcss@^6.0.9:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
   integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==

res_built/atlas/atlas0_hq.json

@@ -114,7 +114,7 @@
 },
 "sprites/belt/built/left_0.png":
 {
-	"frame": {"x":569,"y":1845,"w":130,"h":130},
+	"frame": {"x":570,"y":1845,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -250,7 +250,7 @@
 },
 "sprites/belt/built/right_3.png":
 {
-	"frame": {"x":997,"y":1785,"w":130,"h":130},
+	"frame": {"x":998,"y":1785,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -258,7 +258,7 @@
 },
 "sprites/belt/built/right_4.png":
 {
-	"frame": {"x":1375,"y":1617,"w":130,"h":130},
+	"frame": {"x":1112,"y":1630,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -266,7 +266,7 @@
 },
 "sprites/belt/built/right_5.png":
 {
-	"frame": {"x":1511,"y":1710,"w":130,"h":130},
+	"frame": {"x":1248,"y":1619,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -274,7 +274,7 @@
 },
 "sprites/belt/built/right_6.png":
 {
-	"frame": {"x":1647,"y":1710,"w":130,"h":130},
+	"frame": {"x":1134,"y":1766,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -282,7 +282,7 @@
 },
 "sprites/belt/built/right_7.png":
 {
-	"frame": {"x":1783,"y":1747,"w":130,"h":130},
+	"frame": {"x":1270,"y":1755,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -290,7 +290,7 @@
 },
 "sprites/belt/built/right_8.png":
 {
-	"frame": {"x":1111,"y":1635,"w":130,"h":130},
+	"frame": {"x":1134,"y":1902,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -298,7 +298,7 @@
 },
 "sprites/belt/built/right_9.png":
 {
-	"frame": {"x":1133,"y":1771,"w":130,"h":130},
+	"frame": {"x":1270,"y":1891,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -322,7 +322,7 @@
 },
 "sprites/belt/built/right_12.png":
 {
-	"frame": {"x":975,"y":1649,"w":130,"h":130},
+	"frame": {"x":976,"y":1649,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -378,7 +378,7 @@
 },
 "sprites/blueprints/belt_left.png":
 {
-	"frame": {"x":1168,"y":1907,"w":130,"h":130},
+	"frame": {"x":1406,"y":1877,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -386,7 +386,7 @@
 },
 "sprites/blueprints/belt_right.png":
 {
-	"frame": {"x":1269,"y":1753,"w":130,"h":130},
+	"frame": {"x":1542,"y":1710,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -426,7 +426,7 @@
 },
 "sprites/blueprints/display.png":
 {
-	"frame": {"x":841,"y":1698,"w":128,"h":136},
+	"frame": {"x":842,"y":1698,"w":128,"h":136},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":8,"y":8,"w":128,"h":136},
@@ -562,10 +562,10 @@
 },
 "sprites/blueprints/rotater-rotate180.png":
 {
-	"frame": {"x":271,"y":1735,"w":142,"h":144},
+	"frame": {"x":271,"y":1735,"w":143,"h":144},
 	"rotated": false,
 	"trimmed": true,
-	"spriteSourceSize": {"x":0,"y":0,"w":142,"h":144},
+	"spriteSourceSize": {"x":1,"y":0,"w":143,"h":144},
 	"sourceSize": {"w":144,"h":144}
 },
 "sprites/blueprints/rotater.png":
@@ -666,7 +666,7 @@
 },
 "sprites/blueprints/virtual_processor-stacker.png":
 {
-	"frame": {"x":569,"y":1695,"w":130,"h":144},
+	"frame": {"x":570,"y":1695,"w":130,"h":144},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":0,"w":130,"h":144},
@@ -778,7 +778,7 @@
 },
 "sprites/buildings/belt_left.png":
 {
-	"frame": {"x":569,"y":1845,"w":130,"h":130},
+	"frame": {"x":570,"y":1845,"w":130,"h":130},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -826,7 +826,7 @@
 },
 "sprites/buildings/display.png":
 {
-	"frame": {"x":841,"y":1840,"w":126,"h":135},
+	"frame": {"x":842,"y":1840,"w":126,"h":135},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":9,"y":9,"w":126,"h":135},
@@ -973,7 +973,7 @@
 	"frame": {"x":1286,"y":902,"w":141,"h":143},
 	"rotated": false,
 	"trimmed": true,
-	"spriteSourceSize": {"x":1,"y":0,"w":141,"h":143},
+	"spriteSourceSize": {"x":2,"y":0,"w":141,"h":143},
 	"sourceSize": {"w":144,"h":144}
 },
 "sprites/buildings/rotater.png":
@@ -1042,7 +1042,7 @@
 },
 "sprites/buildings/virtual_processor-analyzer.png":
 {
-	"frame": {"x":419,"y":1735,"w":144,"h":144},
+	"frame": {"x":420,"y":1735,"w":144,"h":144},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1050,7 +1050,7 @@
 },
 "sprites/buildings/virtual_processor-painter.png":
 {
-	"frame": {"x":705,"y":1688,"w":130,"h":144},
+	"frame": {"x":706,"y":1688,"w":130,"h":144},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":0,"w":130,"h":144},
@@ -1074,7 +1074,7 @@
 },
 "sprites/buildings/virtual_processor-stacker.png":
 {
-	"frame": {"x":705,"y":1838,"w":130,"h":144},
+	"frame": {"x":706,"y":1838,"w":130,"h":144},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":14,"y":0,"w":130,"h":144},
@@ -1114,7 +1114,7 @@
 },
 "sprites/buildings/wire-turn.png":
 {
-	"frame": {"x":997,"y":1921,"w":81,"h":81},
+	"frame": {"x":998,"y":1921,"w":81,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1146,7 +1146,7 @@
 },
 "sprites/colors/blue.png":
 {
-	"frame": {"x":1103,"y":1580,"w":54,"h":49},
+	"frame": {"x":566,"y":1981,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1154,7 +1154,7 @@
 },
 "sprites/colors/cyan.png":
 {
-	"frame": {"x":1163,"y":1580,"w":54,"h":49},
+	"frame": {"x":626,"y":1981,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1162,7 +1162,7 @@
 },
 "sprites/colors/green.png":
 {
-	"frame": {"x":705,"y":1988,"w":54,"h":49},
+	"frame": {"x":686,"y":1988,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1170,7 +1170,7 @@
 },
 "sprites/colors/purple.png":
 {
-	"frame": {"x":765,"y":1988,"w":54,"h":49},
+	"frame": {"x":746,"y":1988,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1178,7 +1178,7 @@
 },
 "sprites/colors/red.png":
 {
-	"frame": {"x":1492,"y":1846,"w":54,"h":49},
+	"frame": {"x":806,"y":1988,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1186,7 +1186,7 @@
 },
 "sprites/colors/uncolored.png":
 {
-	"frame": {"x":1552,"y":1846,"w":54,"h":49},
+	"frame": {"x":866,"y":1981,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1194,7 +1194,7 @@
 },
 "sprites/colors/white.png":
 {
-	"frame": {"x":1612,"y":1846,"w":54,"h":49},
+	"frame": {"x":1406,"y":1754,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1202,7 +1202,7 @@
 },
 "sprites/colors/yellow.png":
 {
-	"frame": {"x":1672,"y":1846,"w":54,"h":49},
+	"frame": {"x":1406,"y":1809,"w":54,"h":49},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":0,"y":4,"w":54,"h":49},
@@ -1210,7 +1210,7 @@
 },
 "sprites/debug/acceptor_slot.png":
 {
-	"frame": {"x":1269,"y":1889,"w":12,"h":12},
+	"frame": {"x":1719,"y":555,"w":12,"h":12},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":12,"h":12},
@@ -1218,7 +1218,7 @@
 },
 "sprites/debug/ejector_slot.png":
 {
-	"frame": {"x":1719,"y":555,"w":12,"h":12},
+	"frame": {"x":1921,"y":1028,"w":12,"h":12},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":12,"h":12},
@@ -1226,7 +1226,7 @@
 },
 "sprites/misc/hub_direction_indicator.png":
 {
-	"frame": {"x":1247,"y":1619,"w":48,"h":48},
+	"frame": {"x":1975,"y":266,"w":48,"h":48},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1234,7 +1234,7 @@
 },
 "sprites/misc/processor_disabled.png":
 {
-	"frame": {"x":1084,"y":1921,"w":78,"h":81},
+	"frame": {"x":1542,"y":1933,"w":78,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":10,"y":10,"w":78,"h":81},
@@ -1242,7 +1242,7 @@
 },
 "sprites/misc/processor_disconnected.png":
 {
-	"frame": {"x":1304,"y":1619,"w":65,"h":84},
+	"frame": {"x":1629,"y":1846,"w":65,"h":84},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":17,"y":8,"w":65,"h":84},
@@ -1258,7 +1258,7 @@
 },
 "sprites/misc/slot_bad_arrow.png":
 {
-	"frame": {"x":1999,"y":161,"w":35,"h":35},
+	"frame": {"x":1626,"y":2009,"w":35,"h":35},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":2,"y":2,"w":35,"h":35},
@@ -1266,7 +1266,7 @@
 },
 "sprites/misc/slot_good_arrow.png":
 {
-	"frame": {"x":1999,"y":116,"w":35,"h":39},
+	"frame": {"x":1198,"y":1580,"w":35,"h":39},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":2,"y":0,"w":35,"h":39},
@@ -1274,7 +1274,7 @@
 },
 "sprites/misc/storage_overlay.png":
 {
-	"frame": {"x":566,"y":1981,"w":89,"h":44},
+	"frame": {"x":1103,"y":1580,"w":89,"h":44},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":89,"h":44},
@@ -1282,7 +1282,7 @@
 },
 "sprites/misc/waypoint.png":
 {
-	"frame": {"x":661,"y":1981,"w":38,"h":48},
+	"frame": {"x":1999,"y":116,"w":38,"h":48},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":5,"y":0,"w":38,"h":48},
@@ -1298,7 +1298,7 @@
 },
 "sprites/wires/boolean_true.png":
 {
-	"frame": {"x":1999,"y":202,"w":22,"h":41},
+	"frame": {"x":1471,"y":1617,"w":22,"h":41},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":11,"y":5,"w":22,"h":41},
@@ -1306,7 +1306,7 @@
 },
 "sprites/wires/display/blue.png":
 {
-	"frame": {"x":1391,"y":1927,"w":47,"h":47},
+	"frame": {"x":1975,"y":374,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1314,7 +1314,7 @@
 },
 "sprites/wires/display/cyan.png":
 {
-	"frame": {"x":1444,"y":1927,"w":47,"h":47},
+	"frame": {"x":1975,"y":427,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1322,7 +1322,7 @@
 },
 "sprites/wires/display/green.png":
 {
-	"frame": {"x":1370,"y":1980,"w":47,"h":47},
+	"frame": {"x":1971,"y":480,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1330,7 +1330,7 @@
 },
 "sprites/wires/display/purple.png":
 {
-	"frame": {"x":1423,"y":1980,"w":47,"h":47},
+	"frame": {"x":1971,"y":533,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1338,7 +1338,7 @@
 },
 "sprites/wires/display/red.png":
 {
-	"frame": {"x":1497,"y":1901,"w":47,"h":47},
+	"frame": {"x":1989,"y":586,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1346,7 +1346,7 @@
 },
 "sprites/wires/display/white.png":
 {
-	"frame": {"x":1550,"y":1901,"w":47,"h":47},
+	"frame": {"x":1989,"y":639,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1354,7 +1354,7 @@
 },
 "sprites/wires/display/yellow.png":
 {
-	"frame": {"x":1603,"y":1901,"w":47,"h":47},
+	"frame": {"x":1765,"y":1747,"w":47,"h":47},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1378,7 +1378,7 @@
 },
 "sprites/wires/logical_ejector.png":
 {
-	"frame": {"x":1304,"y":1976,"w":60,"h":67},
+	"frame": {"x":1626,"y":1936,"w":60,"h":67},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":44,"y":0,"w":60,"h":67},
@@ -1386,7 +1386,7 @@
 },
 "sprites/wires/network_conflict.png":
 {
-	"frame": {"x":1656,"y":1901,"w":47,"h":44},
+	"frame": {"x":1384,"y":1704,"w":47,"h":44},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":2,"w":47,"h":44},
@@ -1394,7 +1394,7 @@
 },
 "sprites/wires/network_empty.png":
 {
-	"frame": {"x":1732,"y":1846,"w":41,"h":48},
+	"frame": {"x":1085,"y":1921,"w":41,"h":48},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":5,"y":0,"w":41,"h":48},
@@ -1434,7 +1434,7 @@
 },
 "sprites/wires/sets/color_turn.png":
 {
-	"frame": {"x":1405,"y":1753,"w":81,"h":81},
+	"frame": {"x":1384,"y":1617,"w":81,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1450,7 +1450,7 @@
 },
 "sprites/wires/sets/conflict_forward.png":
 {
-	"frame": {"x":973,"y":1840,"w":18,"h":144},
+	"frame": {"x":974,"y":1840,"w":18,"h":144},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1466,7 +1466,7 @@
 },
 "sprites/wires/sets/conflict_turn.png":
 {
-	"frame": {"x":1304,"y":1889,"w":81,"h":81},
+	"frame": {"x":1678,"y":1710,"w":81,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1498,7 +1498,7 @@
 },
 "sprites/wires/sets/regular_turn.png":
 {
-	"frame": {"x":997,"y":1921,"w":81,"h":81},
+	"frame": {"x":998,"y":1921,"w":81,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1530,7 +1530,7 @@
 },
 "sprites/wires/sets/shape_turn.png":
 {
-	"frame": {"x":1405,"y":1840,"w":81,"h":81},
+	"frame": {"x":1542,"y":1846,"w":81,"h":81},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1538,7 +1538,7 @@
 },
 "sprites/wires/wires_preview.png":
 {
-	"frame": {"x":1247,"y":1673,"w":48,"h":48},
+	"frame": {"x":1975,"y":320,"w":48,"h":48},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1551,6 +1551,6 @@
 	"format": "RGBA8888",
 	"size": {"w":2048,"h":2048},
 	"scale": "0.75",
-	"smartupdate": "$TexturePacker:SmartUpdate:5aa559a5b0e7b321ad8bc0595f1e8ec0:3fcf23da2ddc6370c437cf41f6d44ed0:908b89f5ca8ff73e331a35a3b14d0604$"
+	"smartupdate": "$TexturePacker:SmartUpdate:dac17f2501c07c842209cdd1895313a9:e5152751740891546eb27095657f7239:908b89f5ca8ff73e331a35a3b14d0604$"
 }
 }

res_built/atlas/atlas0_lq.json

@@ -1551,6 +1551,6 @@
 	"format": "RGBA8888",
 	"size": {"w":1024,"h":1024},
 	"scale": "0.25",
-	"smartupdate": "$TexturePacker:SmartUpdate:5aa559a5b0e7b321ad8bc0595f1e8ec0:3fcf23da2ddc6370c437cf41f6d44ed0:908b89f5ca8ff73e331a35a3b14d0604$"
+	"smartupdate": "$TexturePacker:SmartUpdate:dac17f2501c07c842209cdd1895313a9:e5152751740891546eb27095657f7239:908b89f5ca8ff73e331a35a3b14d0604$"
 }
 }

src/css/adinplay.scss

@@ -50,7 +50,6 @@
                 left: 0;
                 right: 0;
                 bottom: 0;
-                background: rgba($mainBgColor, 0.9) uiResource("loading.svg") center center / #{D(60px)} no-repeat;
                 @include InlineAnimation(0.2s ease-in-out) {
                     0% {
                         opacity: 0;
@@ -59,6 +58,11 @@
                         opacity: 1;
                     }
                 }
+
+                & {
+                    /* @load-async */
+                    background: rgba($mainBgColor, 0.9) uiResource("loading.svg") center center / #{D(60px)} no-repeat;
+                }
             }
         }
     }

src/css/common.scss

@@ -391,11 +391,15 @@ canvas {
     color: #393747;
     &::after {
         content: " ";
-        background: uiResource("loading.svg") center center / contain no-repeat;
         @include S(width, 35px);
         @include S(height, 35px);
         display: inline-block;
         vertical-align: middle;
+
+        & {
+            /* @load-async */
+            background: uiResource("loading.svg") center center / contain no-repeat;
+        }
     }
 
     @include InlineAnimation(1.5s ease-in-out infinite) {
@@ -451,7 +455,6 @@ canvas {
 .prefab_InfoIcon {
     @include S(width, 25px);
     @include S(height, 25px);
-    // background: uiResource("icons_small/info.png") center center / contain no-repeat;
     z-index: 100;
     opacity: 0.8;
     cursor: pointer;
@@ -468,7 +471,6 @@ canvas {
     justify-content: center;
     flex-direction: column;
     .loadingImage {
-        background: uiResource("loading.svg") center center / #{D(40px)} no-repeat;
         width: 100%;
         display: flex;
         flex-grow: 1;
@@ -478,6 +480,11 @@ canvas {
                 transform: scale(1.2) rotate(160deg);
             }
         }
+
+        & {
+            /* @load-async */
+            background: uiResource("loading.svg") center center / #{D(40px)} no-repeat;
+        }
     }
 
     .prefab_GameHint {

src/css/ingame_hud/buildings_toolbar.scss

@@ -69,14 +69,18 @@
 
                 &::before {
                     content: " ";
-                    background: uiResource("locked_building.png") center center / #{D(20px)} #{D(20px)}
+
-                        no-repeat;
                     position: absolute;
                     top: 0;
                     right: 0;
                     bottom: 0;
                     left: 0;
                     z-index: 4;
+                    & {
+                        /* @load-async */
+                        background: uiResource("locked_building.png") center center / #{D(20px)} #{D(20px)}
+                            no-repeat;
+                    }
                 }
             }
 

src/css/ingame_hud/dialogs.scss

@@ -122,13 +122,16 @@
                 opacity: 0.7;
                 @include S(width, 20px);
                 @include S(height, 20px);
-                background: uiResource("icons/close.png") center center / 80% no-repeat;
                 cursor: pointer;
                 pointer-events: all;
                 transition: opacity 0.2s ease-in-out;
                 &:hover {
                     opacity: 0.4;
                 }
+                & {
+                    /* @load-async */
+                    background: uiResource("icons/close.png") center center / 80% no-repeat;
+                }
             }
         }
 

src/css/ingame_hud/game_menu.scss

@@ -38,17 +38,26 @@
         @include DarkThemeInvert;
 
         &.shop {
-            background-image: uiResource("icons/shop.png");
             grid-column: 1;
+            & {
+                /* @load-async */
+                background-image: uiResource("icons/shop.png");
+            }
         }
 
         &.stats {
-            background-image: uiResource("icons/statistics.png");
             grid-column: 2;
+            & {
+                /* @load-async */
+                background-image: uiResource("icons/statistics.png");
+            }
         }
 
         &.save {
+            & {
+                /* @load-async */
                 background-image: uiResource("icons/save.png");
+            }
             grid-column: 3;
             @include MakeAnimationWrappedEvenOdd(0.5s ease-in-out) {
                 0% {
@@ -83,8 +92,11 @@
         }
 
         &.settings {
-            background-image: uiResource("icons/settings_menu_settings.png");
             grid-column: 4;
+            & {
+                /* @load-async */
+                background-image: uiResource("icons/settings_menu_settings.png");
+            }
         }
 
         &:hover {
@@ -99,9 +111,14 @@
         &.hasBadge {
             &.shop {
                 filter: none;
-                background-image: uiResource("icons/shop_active.png");
                 opacity: 0.9;
+
+                & {
+                    /* @load-async */
+                    background-image: uiResource("icons/shop_active.png");
                 }
+            }
+
             transform-origin: 50% 50%;
             @include InlineAnimation(0.8s ease-in-out infinite) {
                 50% {

src/css/ingame_hud/keybindings_overlay.scss

@@ -47,10 +47,12 @@
             left: unset;
             margin: 0;
             &.rightMouse {
+                /* @load-async */
                 background: #fff uiResource("icons/mouse_right.png") center center / 85% no-repeat;
             }
 
             &.leftMouse {
+                /* @load-async */
                 background: #fff uiResource("icons/mouse_left.png") center center / 85% no-repeat;
             }
         }

src/css/ingame_hud/pinned_shapes.scss

@@ -77,7 +77,6 @@
         > .infoButton {
             @include S(width, 8px);
             @include S(height, 8px);
-            background: uiResource("icons/info_button.png") center center / 95% no-repeat;
             position: absolute;
             opacity: 0.7;
             @include S(top, 13px);
@@ -90,6 +89,11 @@
             &:hover {
                 opacity: 0.8;
             }
+
+            & {
+                /* @load-async */
+                background: uiResource("icons/info_button.png") center center / 95% no-repeat;
+            }
         }
 
         &.goal,
@@ -107,11 +111,13 @@
 
             &.goal .amountLabel {
                 &::after {
+                    /* @load-async */
                     background-image: uiResource("icons/current_goal_marker.png");
                     background-size: 90%;
                 }
                 @include DarkThemeOverride {
                     &::after {
+                        /* @load-async */
                         background-image: uiResource("icons/current_goal_marker_inverted.png") !important;
                     }
                 }
@@ -119,11 +125,13 @@
 
             &.blueprint .amountLabel {
                 &::after {
+                    /* @load-async */
                     background-image: uiResource("icons/blueprint_marker.png");
                     background-size: 90%;
                 }
                 @include DarkThemeOverride {
                     &::after {
+                        /* @load-async */
                         background-image: uiResource("icons/blueprint_marker_inverted.png") !important;
                     }
                 }

src/css/ingame_hud/settings_menu.scss

@@ -39,23 +39,29 @@
             background: transparent;
             filter: invert(1);
 
-            background: uiResource("icons/settings_menu_play.png") center top / contain no-repeat;
             content: "";
             opacity: 0.8;
             @include S(width, 35px);
             @include S(height, 35px);
 
             &.settings {
+                /* @load-async */
                 background-image: uiResource("icons/settings_menu_settings.png");
             }
 
             &.menu {
+                /* @load-async */
                 background-image: uiResource("icons/settings_menu_exit.png");
             }
 
             &:hover {
                 opacity: 0.6;
             }
+
+            & {
+                /* @load-async */
+                background: uiResource("icons/settings_menu_play.png") center top / contain no-repeat;
+            }
         }
     }
 }

src/css/ingame_hud/shop.scss

@@ -113,9 +113,13 @@
                     overflow: hidden;
 
                     button.pin {
+                        & {
+                            /* @load-async */
+                            background: uiResource("icons/pin.png") center center / 95% no-repeat;
+                        }
+
                         @include S(width, 12px);
                         @include S(height, 12px);
-                        background: uiResource("icons/pin.png") center center / 95% no-repeat;
                         position: absolute;
                         @include S(top, 2px);
                         @include S(right, 2px);
@@ -143,6 +147,7 @@
                         }
 
                         &.isGoal {
+                            /* @load-async */
                             background: uiResource("icons/current_goal_marker.png") center center / 95%
                                 no-repeat;
                             opacity: $disabledOpacity !important;
@@ -198,7 +203,6 @@
                     button.showInfo {
                         @include S(width, 11px);
                         @include S(height, 11px);
-                        background: uiResource("icons/info_button.png") center center / 95% no-repeat;
                         position: absolute;
                         @include S(top, 17px);
                         @include S(right, 2.5px);
@@ -213,6 +217,10 @@
                             opacity: 0.6;
                         }
                     }
+                    button.showInfo {
+                        /* @load-async */
+                        background: uiResource("icons/info_button.png") center center / 95% no-repeat;
+                    }
 
                     canvas {
                         @include S(width, 40px);

src/css/ingame_hud/statistics.scss

@@ -39,10 +39,12 @@
             }
 
             &.displayDetailed {
+                /* @load-async */
                 background-image: uiResource("icons/display_list.png");
             }
 
             &.displayIcons {
+                /* @load-async */
                 background-image: uiResource("icons/display_icons.png");
                 background-size: #{D(11.5px)};
             }
@@ -53,7 +55,10 @@
             }
 
             &.displaySorted {
+                & {
+                    /* @load-async */
                     background-image: uiResource("icons/display_sorted.png");
+                }
                 background-size: #{D(11.5px)};
                 margin-right: 5px;
                 @include S(border-top-right-radius, $globalBorderRadius);
@@ -63,7 +68,10 @@
             }
 
             &.displayIterateUnit {
+                & {
+                    /* @load-async */
                     background-image: uiResource("icons/toggle_unit.png");
+                }
                 opacity: 0.8;
                 @include S(padding, 1px, 0);
             }

src/css/ingame_hud/tutorial_hints.scss

@@ -49,9 +49,12 @@
                 @include S(width, 12px);
                 @include S(height, 12px);
                 display: inline-block;
+                & {
+                    /* @load-async */
                     background: uiResource("icons/help.png") center center / 95% no-repeat;
                 }
             }
+        }
 
         button.toggleHint {
             @include PlainText;

src/css/ingame_hud/unlock_notification.scss

@@ -4,12 +4,16 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background: rgba(#333538, 0.98) uiResource("dialog_bg_pattern.png") top left / #{D(10px)} repeat;
     display: flex;
     justify-content: center;
     align-items: center;
     pointer-events: all;
 
+    & {
+        /* @load-async */
+        background: rgba(#333538, 0.98) uiResource("dialog_bg_pattern.png") top left / #{D(10px)} repeat;
+    }
+
     @include InlineAnimation(0.1s ease-in-out) {
         0% {
             opacity: 0;

src/css/ingame_hud/vignette_overlay.scss

@@ -4,7 +4,10 @@
     left: 0;
     right: 0;
     bottom: 0;
+    & {
+        /* @load-async */
         background: uiResource("vignette.lossless.png") center center / cover no-repeat;
+    }
     pointer-events: none;
 
     @include DarkThemeOverride {

src/css/ingame_hud/watermark.scss

@@ -1,6 +1,10 @@
 #ingame_HUD_Watermark {
     position: absolute;
+    & {
+        /* @load-async */
         background: uiResource("get_on_steam.png") center center / contain no-repeat;
+    }
+
     @include S(width, 110px);
     @include S(height, 40px);
     @include S(top, 10px);

src/css/ingame_hud/waypoints.scss

@@ -55,7 +55,10 @@
         display: grid;
         grid-template-columns: 1fr auto;
         align-items: center;
+        & {
+            /* @load-async */
             background: uiResource("icons/waypoint.png") left 50% / #{D(8px)} no-repeat;
+        }
         opacity: 0.7;
         @include S(margin-bottom, 1px);
         font-weight: bold;
@@ -68,7 +71,10 @@
             @include S(width, 10px);
             @include S(height, 10px);
             @include S(margin-left, 4px);
+            & {
+                /* @load-async */
                 background: uiResource("icons/edit_key.png") center center / 70% no-repeat;
+            }
             pointer-events: all;
             cursor: pointer;
             position: relative;

src/css/main.scss

@@ -6,7 +6,7 @@
     @return inline($pth);
 }
 
-@import "icons";
+@import "resources";
 @import "trigonometry";
 @import "material_colors";
 @import "dynamic_ui";

src/css/mixins.scss

@@ -256,53 +256,6 @@ button,
     color: $color;
 }
 
-// ----------------------------------------
-/* Shine animation prefab, useful for buttons etc. Adds a bright shine which moves over
-  the button like a reflection. Performance heavy. */
-@mixin ShineAnimation($duration, $bgColor, $w: 200px, $shineAlpha: 0.25, $lightenAmount: 7, $bgAnim: true) {
-    $bgBase: darken($bgColor, 5);
-    background-color: $bgBase;
-
-    @include HighQualityOrMore {
-        position: relative;
-        // overflow: hidden;
-        // overflow: visible;
-
-        &:before {
-            content: " ";
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background: uiResource("misc/shine_bg.png") 0px center / 100% 100% no-repeat;
-
-            @include InlineAnimation($duration ease-in-out infinite) {
-                0% {
-                    background-position-x: #{D(-$w)};
-                }
-                100% {
-                    background-position-x: #{D($w)};
-                }
-            }
-        }
-
-        @if ($bgAnim) {
-            @include InlineAnimation($duration ease-in-out infinite) {
-                0% {
-                    background-color: $bgBase;
-                }
-                50% {
-                    background-color: lighten($bgBase, $lightenAmount);
-                }
-                100% {
-                    background-color: $bgBase;
-                }
-            }
-        }
-    }
-}
-
 // ----------------------------------------
 /* String replacement */
 @function str-replace($string, $search, $replace: "") {

src/css/resources.scss

@@ -3,15 +3,17 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, balancer, stacker, tra
 
 @each $building in $buildings {
     [data-icon="building_icons/#{$building}.png"] {
+        /* @load-async */
         background-image: uiResource("res/ui/building_icons/#{$building}.png") !important;
     }
 }
 
 $buildingsAndVariants: belt, balancer, balancer-merger, balancer-splitter, underground_belt,
     underground_belt-tier2, miner, miner-chainable, cutter, cutter-quad, rotater, rotater-ccw, rotater-fl,
-    stacker, mixer, painter, painter-double, painter-quad, trash, storage;
+    stacker, mixer, painter, painter-double, painter-quad, trash, storage, reader;
 @each $building in $buildingsAndVariants {
     [data-icon="building_tutorials/#{$building}.png"] {
+        /* @load-async */
         background-image: uiResource("res/ui/building_tutorials/#{$building}.png") !important;
     }
 }
@@ -20,18 +22,22 @@ $buildingsAndVariants: belt, balancer, balancer-merger, balancer-splitter, under
 
 // Special cases for mirrored vairants
 [data-icon="building_tutorials/painter-mirrored.png"] {
+    /* @load-async */
     background-image: uiResource("res/ui/building_tutorials/painter.png") !important;
 }
 [data-icon="building_tutorials/balancer-merger-inverse.png"] {
+    /* @load-async */
     background-image: uiResource("res/ui/building_tutorials/balancer-merger.png") !important;
 }
 [data-icon="building_tutorials/balancer-splitter-inverse.png"] {
+    /* @load-async */
     background-image: uiResource("res/ui/building_tutorials/balancer-splitter.png") !important;
 }
 
 $icons: notification_saved, notification_success, notification_upgrade;
 @each $icon in $icons {
     [data-icon="icons/#{$icon}.png"] {
+        /* @load-async */
         background-image: uiResource("res/ui/icons/#{$icon}.png") !important;
     }
 }
@@ -41,6 +47,7 @@ $languages: en, de, cs, da, et, es-419, fr, it, pt-BR, sv, tr, el, ru, uk, zh-TW
 
 @each $language in $languages {
     [data-languageicon="#{$language}"] {
+        /* @load-async */
         background-image: uiResource("languages/#{$language}.svg") !important;
     }
 }

src/css/states/keybindings.scss

@@ -35,10 +35,12 @@
                     background: transparent center center / 40% no-repeat;
                     opacity: 0.9;
                     &.editKeybinding {
+                        /* @load-async */
                         background-image: uiResource("icons/edit_key.png");
                     }
 
                     &.resetKeybinding {
+                        /* @load-async */
                         background-image: uiResource("icons/reset_key.png");
                     }
 

src/css/states/main_menu.scss

@@ -22,7 +22,10 @@
             @include S(height, 25px);
             pointer-events: all;
             cursor: pointer;
+            & {
+                /* @load-async */
                 background: uiResource("icons/main_menu_settings.png") center center / contain no-repeat;
+            }
             transition: opacity 0.12s ease-in-out;
             @include IncreasedClickArea(2px);
             opacity: 0.7;
@@ -32,6 +35,7 @@
         }
 
         .exitAppButton {
+            /* @load-async */
             background-image: uiResource("icons/main_menu_exit.png");
             background-size: 90%;
         }
@@ -129,8 +133,10 @@
                 width: 100%;
                 @include S(height, 40px);
                 @include S(width, 180px);
-
+                & {
+                    /* @load-async */
                     background: #171a23 uiResource("get_on_steam.png") center center / contain no-repeat;
+                }
                 overflow: hidden;
                 display: block;
                 text-indent: -999em;
@@ -167,7 +173,10 @@
             @include S(margin, 10px, 0);
             @include S(width, 100px);
             @include S(height, 30px);
+            & {
+                /* @load-async */
                 background: uiResource("demo_badge.png") center center / contain no-repeat;
+            }
             display: inline-block;
         }
 
@@ -335,14 +344,22 @@
                     align-self: center;
                     justify-self: center;
                     @include IncreasedClickArea(0px);
+
+                    & {
+                        /* @load-async */
                         background: #44484a uiResource("icons/play.png") center center / 40% no-repeat;
                     }
+                }
 
                 button.downloadGame {
                     grid-column: 3 / 4;
                     grid-row: 1 / 2;
                     background-color: transparent;
+
+                    & {
+                        /* @load-async */
                         background-image: uiResource("icons/download.png");
+                    }
                     @include S(width, 15px);
                     @include IncreasedClickArea(0px);
                     @include S(height, 15px);
@@ -362,7 +379,11 @@
                     grid-row: 2 / 3;
                     background-color: transparent;
                     @include IncreasedClickArea(0px);
+
+                    & {
+                        /* @load-async */
                         background-image: uiResource("icons/delete.png");
+                    }
                     @include S(width, 15px);
                     @include S(height, 15px);
                     align-self: end;
@@ -379,7 +400,11 @@
                 button.renameGame {
                     background-color: transparent;
                     @include IncreasedClickArea(2px);
+
+                    & {
+                        /* @load-async */
                         background-image: uiResource("icons/edit_key.png");
+                    }
                     @include S(width, 10px);
                     @include S(height, 10px);
                     align-self: center;
@@ -445,7 +470,11 @@
             grid-template-columns: 1fr auto;
 
             justify-content: center;
+
+            & {
+                /* @load-async */
                 background: $linkBg uiResource("icons/link.png") top D(3px) right D(3px) / D(9px) no-repeat;
+            }
             @include S(padding, 5px);
             @include S(padding-left, 10px);
             @include S(border-radius, $globalBorderRadius);
@@ -472,9 +501,11 @@
                 @include S(height, 50px);
                 background: center center / 80% no-repeat;
                 &.githubLogo {
+                    /* @load-async */
                     background-image: uiResource("main_menu/github.png");
                 }
                 &.discordLogo {
+                    /* @load-async */
                     background-image: uiResource("main_menu/discord.png");
                     background-size: 95%;
                 }
@@ -516,12 +547,15 @@
                 transition: background-color 0.12s ease-in-out;
 
                 &.redditLink {
+                    /* @load-async */
                     background-image: uiResource("main_menu/reddit.svg");
                 }
                 &.changelog {
+                    /* @load-async */
                     background-image: uiResource("main_menu/changelog.svg");
                 }
                 &.helpTranslate {
+                    /* @load-async */
                     background-image: uiResource("main_menu/translate.svg");
                 }
             }

src/css/states/mobile_warning.scss

@@ -30,7 +30,10 @@
         width: 200px;
         height: 80px;
         min-height: 40px;
+        & {
+            /* @load-async */
             background: uiResource("get_on_steam.png") center center / contain no-repeat;
+        }
         overflow: hidden;
         display: block;
         text-indent: -999em;

src/css/states/settings.scss

@@ -159,8 +159,11 @@
                         @include S(padding, 4px);
                         @include S(padding-right, 15px);
 
+                        & {
+                            /* @load-async */
                             background: #fff uiResource("icons/enum_selector.png") calc(100% - #{D(5px)})
                                 calc(50% + #{D(1px)}) / #{D(15px)} no-repeat;
+                        }
 
                         transition: background-color 0.12s ease-in-out;
                         &:hover {
@@ -196,7 +199,11 @@
                             // dirty but works
                             // color: #222;
                             background-color: $darkModeControlsBackground;
+
+                            & {
+                                /* @load-async */
                                 background-image: uiResource("icons/enum_selector_white.png");
+                            }
                             color: #ddd;
                             &:hover {
                                 background-color: darken($darkModeControlsBackground, 2);

src/css/textual_game_state.scss

@@ -26,9 +26,11 @@
             @include S(height, 30px);
             @include S(margin-right, 10px);
             @include S(margin-left, -5px);
+            & {
+                /* @load-async */
                 background: uiResource("icons/state_back_button.png") center center / 70% no-repeat;
             }
-
+        }
         @include S(margin-bottom, 20px);
     }
 

src/js/game/buildings/balancer.js

@@ -7,7 +7,7 @@ import { MetaBuilding, defaultBuildingVariant } from "../meta_building";
 import { GameRoot } from "../root";
 import { enumHubGoalRewards } from "../tutorial_goals";
 import { T } from "../../translations";
-import { formatItemsPerSecond } from "../../core/utils";
+import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
 import { BeltUnderlaysComponent } from "../components/belt_underlays";
 
 /** @enum {string} */
@@ -18,6 +18,14 @@ export const enumBalancerVariants = {
     splitterInverse: "splitter-inverse",
 };
 
+const overlayMatrices = {
+    [defaultBuildingVariant]: null,
+    [enumBalancerVariants.merger]: generateMatrixRotations([0, 1, 0, 0, 1, 1, 0, 1, 0]),
+    [enumBalancerVariants.mergerInverse]: generateMatrixRotations([0, 1, 0, 1, 1, 0, 0, 1, 0]),
+    [enumBalancerVariants.splitter]: generateMatrixRotations([0, 1, 0, 0, 1, 1, 0, 1, 0]),
+    [enumBalancerVariants.splitterInverse]: generateMatrixRotations([0, 1, 0, 1, 1, 0, 0, 1, 0]),
+};
+
 export class MetaBalancerBuilding extends MetaBuilding {
     constructor() {
         super("balancer");
@@ -37,18 +45,43 @@ export class MetaBalancerBuilding extends MetaBuilding {
         }
     }
 
+    /**
+     * @param {number} rotation
+     * @param {number} rotationVariant
+     * @param {string} variant
+     * @param {Entity} entity
+     * @returns {Array<number>|null}
+     */
+    getSpecialOverlayRenderMatrix(rotation, rotationVariant, variant, entity) {
+        const matrix = overlayMatrices[variant];
+        if (matrix) {
+            return matrix[rotation];
+        }
+        return null;
+    }
+
     /**
      * @param {GameRoot} root
      * @param {string} variant
      * @returns {Array<[string, string]>}
      */
     getAdditionalStatistics(root, variant) {
-        const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.balancer);
+        let speedMultiplier = 2;
+        switch (variant) {
+            case enumBalancerVariants.merger:
+            case enumBalancerVariants.mergerInverse:
+            case enumBalancerVariants.splitter:
+            case enumBalancerVariants.splitterInverse:
+                speedMultiplier = 1;
+        }
+
+        const speed =
+            (root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.balancer) / 2) * speedMultiplier;
         return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]];
     }
 
     getSilhouetteColor() {
-        return "#444";
+        return "#555759";
     }
 
     /**

src/js/game/buildings/miner.js

@@ -6,12 +6,15 @@ import { MetaBuilding, defaultBuildingVariant } from "../meta_building";
 import { GameRoot } from "../root";
 import { enumHubGoalRewards } from "../tutorial_goals";
 import { T } from "../../translations";
-import { formatItemsPerSecond } from "../../core/utils";
+import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
 
 /** @enum {string} */
 export const enumMinerVariants = { chainable: "chainable" };
 
-const overlayMatrix = [1, 1, 1, 1, 0, 1, 1, 1, 1];
+const overlayMatrix = {
+    [defaultBuildingVariant]: generateMatrixRotations([1, 1, 1, 1, 0, 1, 1, 1, 1]),
+    [enumMinerVariants.chainable]: generateMatrixRotations([0, 1, 0, 1, 1, 1, 1, 1, 1]),
+};
 
 export class MetaMinerBuilding extends MetaBuilding {
     constructor() {
@@ -50,7 +53,7 @@ export class MetaMinerBuilding extends MetaBuilding {
      * @param {Entity} entity
      */
     getSpecialOverlayRenderMatrix(rotation, rotationVariant, variant, entity) {
-        return overlayMatrix;
+        return overlayMatrix[variant][rotation];
     }
 
     /**

src/js/game/buildings/rotater.js

@@ -1,4 +1,4 @@
-import { formatItemsPerSecond } from "../../core/utils";
+import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
 import { enumDirection, Vector } from "../../core/vector";
 import { T } from "../../translations";
 import { ItemAcceptorComponent } from "../components/item_acceptor";
@@ -12,6 +12,11 @@ import { enumHubGoalRewards } from "../tutorial_goals";
 /** @enum {string} */
 export const enumRotaterVariants = { ccw: "ccw", rotate180: "rotate180" };
 
+const overlayMatrices = {
+    [defaultBuildingVariant]: generateMatrixRotations([0, 1, 1, 1, 1, 0, 0, 1, 1]),
+    [enumRotaterVariants.ccw]: generateMatrixRotations([1, 1, 0, 0, 1, 1, 1, 1, 0]),
+};
+
 export class MetaRotaterBuilding extends MetaBuilding {
     constructor() {
         super("rotater");
@@ -21,6 +26,21 @@ export class MetaRotaterBuilding extends MetaBuilding {
         return "#7dc6cd";
     }
 
+    /**
+     * @param {number} rotation
+     * @param {number} rotationVariant
+     * @param {string} variant
+     * @param {Entity} entity
+     * @returns {Array<number>|null}
+     */
+    getSpecialOverlayRenderMatrix(rotation, rotationVariant, variant, entity) {
+        const matrix = overlayMatrices[variant];
+        if (matrix) {
+            return matrix[rotation];
+        }
+        return null;
+    }
+
     /**
      * @param {GameRoot} root
      * @param {string} variant

src/js/game/buildings/underground_belt.js

@@ -25,6 +25,8 @@ export const enumUndergroundBeltVariantToTier = {
     [enumUndergroundBeltVariants.tier2]: 1,
 };
 
+const colorsByRotationVariant = ["#6d9dff", "#51d723"];
+
 const overlayMatrices = [
     // Sender
     generateMatrixRotations([1, 1, 1, 0, 1, 0, 0, 1, 0]),
@@ -38,8 +40,8 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding {
         super("underground_belt");
     }
 
-    getSilhouetteColor() {
+    getSilhouetteColor(variant, rotationVariant) {
-        return "#222";
+        return colorsByRotationVariant[rotationVariant];
     }
 
     getFlipOrientationAfterPlacement() {

src/js/game/hud/parts/building_placer_logic.js

@@ -121,6 +121,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
         this.root.hud.signals.buildingsSelectedForCopy.add(this.abortPlacement, this);
         this.root.hud.signals.pasteBlueprintRequested.add(this.abortPlacement, this);
         this.root.signals.storyGoalCompleted.add(() => this.signals.variantChanged.dispatch());
+        this.root.signals.storyGoalCompleted.add(() => this.currentMetaBuilding.set(null));
         this.root.signals.upgradePurchased.add(() => this.signals.variantChanged.dispatch());
         this.root.signals.editModeChanged.add(this.onEditModeChanged, this);
 

src/js/game/map_chunk_view.js

@@ -170,7 +170,10 @@ export class MapChunkView extends MapChunk {
                             );
                         }
 
-                        context.fillStyle = metaBuilding.getSilhouetteColor();
+                        context.fillStyle = metaBuilding.getSilhouetteColor(
+                            data.variant,
+                            data.rotationVariant
+                        );
                         for (let dx = 0; dx < 3; ++dx) {
                             for (let dy = 0; dy < 3; ++dy) {
                                 const isFilled = overlayMatrix[dx + dy * 3];
@@ -187,7 +190,10 @@ export class MapChunkView extends MapChunk {
 
                         continue;
                     } else {
-                        context.fillStyle = metaBuilding.getSilhouetteColor();
+                        context.fillStyle = metaBuilding.getSilhouetteColor(
+                            data.variant,
+                            data.rotationVariant
+                        );
                         context.fillRect(
                             x * CHUNK_OVERLAY_RES,
                             y * CHUNK_OVERLAY_RES,
@@ -256,7 +262,8 @@ export class MapChunkView extends MapChunk {
             data.variant,
             entity
         );
-        context.fillStyle = overrideColor || metaBuilding.getSilhouetteColor();
+        context.fillStyle =
+            overrideColor || metaBuilding.getSilhouetteColor(data.variant, data.rotationVariant);
         if (overlayMatrix) {
             for (let dx = 0; dx < 3; ++dx) {
                 for (let dy = 0; dy < 3; ++dy) {

src/js/game/meta_building.js

@@ -174,8 +174,10 @@ export class MetaBuilding {
 
     /**
      * Should return a silhouette color for the map overview or null if not set
+     * @param {string} variant
+     * @param {number} rotationVariant
      */
-    getSilhouetteColor() {
+    getSilhouetteColor(variant, rotationVariant) {
         return null;
     }
 

src/js/game/meta_building_registry.js

@@ -203,7 +203,10 @@ export function initBuildingCodesAfterResourcesLoaded() {
             variant.rotationVariant,
             variant.variant
         );
-        variant.silhouetteColor = variant.metaInstance.getSilhouetteColor();
+        variant.silhouetteColor = variant.metaInstance.getSilhouetteColor(
+            variant.variant,
+            variant.rotationVariant
+        );
     }
 
     // Update caches

src/js/game/systems/miner.js

@@ -5,7 +5,6 @@ import { BaseItem } from "../base_item";
 import { MinerComponent } from "../components/miner";
 import { Entity } from "../entity";
 import { GameSystemWithFilter } from "../game_system_with_filter";
-import { statisticsUnitsSeconds } from "../hud/parts/statistics_handle";
 import { MapChunkView } from "../map_chunk_view";
 
 export class MinerSystem extends GameSystemWithFilter {

src/js/game/tutorial_goals_mappings.js

@@ -45,7 +45,7 @@ export const enumHubGoalRewardsToContentUnlocked = {
     [enumHubGoalRewards.reward_cutter_quad]: typed([[MetaCutterBuilding, enumCutterVariants.quad]]),
     [enumHubGoalRewards.reward_painter_double]: typed([[MetaPainterBuilding, enumPainterVariants.double]]),
     [enumHubGoalRewards.reward_painter_quad]: typed([[MetaPainterBuilding, enumPainterVariants.quad]]),
-    [enumHubGoalRewards.reward_storage]: typed([[MetaStorageBuilding]]),
+    [enumHubGoalRewards.reward_storage]: typed([[MetaStorageBuilding, defaultBuildingVariant]]),
 
     [enumHubGoalRewards.reward_belt_reader]: typed([[MetaReaderBuilding, defaultBuildingVariant]]),
     [enumHubGoalRewards.reward_display]: typed([[MetaDisplayBuilding, defaultBuildingVariant]]),

translations/base-en.yaml

@@ -560,7 +560,7 @@ buildings:
     storage:
         default:
             name: &storage Storage
-            description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
+            description: Stores excess items, up to a given capacity. Prioritizes the left output and can be used as an overflow gate.
 
     wire:
         default:
@@ -619,8 +619,7 @@ buildings:
     reader:
         default:
             name: &reader Belt Reader
-            # TEMP
+            description: Allows to measure belt throughput. Outputs the last read item on the wires layer (once unlocked).
-            description: Allows to read the current item from a belt, as well as measuring the throughput.
 
     virtual_processor:
         default:
@@ -671,8 +670,8 @@ storyRewards:
         desc: The <strong>mixer</strong> has been unlocked - Combine two colors using <strong>additive blending</strong> with this building!
 
     reward_stacker:
-        title: Combiner
+        title: Stacker
-        desc: You can now combine shapes with the <strong>combiner</strong>! Both inputs are combined, and if they can be put next to each other, they will be <strong>fused</strong>. If not, the right input is <strong>stacked on top</strong> of the left input!
+        desc: You can now combine shapes with the <strong>stacker</strong>! Both inputs are combined, and if they can be put next to each other, they will be <strong>fused</strong>. If not, the right input is <strong>stacked on top</strong> of the left input!
 
     reward_balancer:
         title: Balancer
@@ -712,7 +711,7 @@ storyRewards:
             You have now unlocked the <strong>belt reader</strong>! It allows you to measure the throughput of a belt.<br><br>And wait until you unlock wires - then it gets really useful!
 
     reward_cutter_quad:
-        title: Quad Cutting
+        title: Quad Cutter
         desc: You have unlocked a variant of the <strong>cutter</strong> - It allows you to cut shapes in <strong>four parts</strong> instead of just two!
 
     reward_painter_double: