Further pre-release adjustments

src/css/resources.scss

@@ -13,7 +13,7 @@ $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2,
     cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer, painter-double, painter-quad, trash, storage,
     reader, rotater-rotate180, display, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not,
     logic_gate-xor, analyzer, virtual_processor-rotater, virtual_processor-unstacker,
-    virtual_processor-stacker, virtual_processor-painter;
+    virtual_processor-stacker, virtual_processor-painter, wire-second, painter, painter-mirrored;
 @each $building in $buildingsAndVariants {
     [data-icon="building_tutorials/#{$building}.png"] {
         /* @load-async */
@@ -21,13 +21,6 @@ $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2,
     }
 }
 
-// Special cases for mirrored vairants
-[data-icon="building_tutorials/painter.png"],
-[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.png"],
 [data-icon="building_tutorials/balancer-merger-inverse.png"] {
     /* @load-async */
@@ -53,13 +46,6 @@ $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2,
     background-image: uiResource("res/ui/building_tutorials/lever.png") !important;
 }
 
-// Wire types share tutorials
-[data-icon="building_tutorials/wire-second.png"],
-[data-icon="building_tutorials/wire-third.png"] {
-    /* @load-async */
-    background-image: uiResource("res/ui/building_tutorials/wire-second.png") !important;
-}
-
 // Logic gate
 [data-icon="building_tutorials/logic_gate.png"] {
     /* @load-async */

src/js/game/buildings/trash.js

@@ -1,3 +1,4 @@
+import { generateMatrixRotations } from "../../core/utils";
 import { enumDirection, Vector } from "../../core/vector";
 import { ItemAcceptorComponent } from "../components/item_acceptor";
 import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
@@ -6,6 +7,8 @@ import { MetaBuilding } from "../meta_building";
 import { GameRoot } from "../root";
 import { enumHubGoalRewards } from "../tutorial_goals";
 
+const overlayMatrix = generateMatrixRotations([1, 1, 0, 1, 1, 1, 0, 1, 1]);
+
 export class MetaTrashBuilding extends MetaBuilding {
     constructor() {
         super("trash");
@@ -16,13 +19,17 @@ export class MetaTrashBuilding extends MetaBuilding {
     }
 
     getSilhouetteColor() {
-        return "#cd7d86";
+        return "#ed1d5d";
     }
 
     getDimensions() {
         return new Vector(1, 1);
     }
 
+    getSpecialOverlayRenderMatrix(rotation) {
+        return overlayMatrix[rotation];
+    }
+
     /**
      * @param {GameRoot} root
      */

src/js/game/buildings/wire.js

@@ -24,13 +24,11 @@ export const wireOverlayMatrices = {
 /** @enum {string} */
 export const wireVariants = {
     second: "second",
-    third: "third",
 };
 
 const enumWireVariantToVariant = {
     [defaultBuildingVariant]: enumWireVariant.first,
     [wireVariants.second]: enumWireVariant.second,
-    [wireVariants.third]: enumWireVariant.third,
 };
 
 export class MetaWireBuilding extends MetaBuilding {
@@ -47,7 +45,7 @@ export class MetaWireBuilding extends MetaBuilding {
     }
 
     getAvailableVariants() {
-        return [defaultBuildingVariant, wireVariants.second, wireVariants.third];
+        return [defaultBuildingVariant, wireVariants.second];
     }
 
     getDimensions() {

src/js/game/components/wire.js

@@ -12,7 +12,6 @@ export const enumWireType = {
 export const enumWireVariant = {
     first: "first",
     second: "second",
-    third: "third",
 };
 
 export class WireComponent extends Component {

src/js/game/meta_building_registry.js

@@ -121,11 +121,6 @@ export function initMetaBuildingRegistry() {
     registerBuildingVariant(54, MetaWireBuilding, enumWireVariant.second, 2);
     registerBuildingVariant(55, MetaWireBuilding, enumWireVariant.second, 3);
 
-    registerBuildingVariant(56, MetaWireBuilding, enumWireVariant.third, 0);
-    registerBuildingVariant(57, MetaWireBuilding, enumWireVariant.third, 1);
-    registerBuildingVariant(58, MetaWireBuilding, enumWireVariant.third, 2);
-    registerBuildingVariant(59, MetaWireBuilding, enumWireVariant.third, 3);
-
     // Constant signal
     registerBuildingVariant(31, MetaConstantSignalBuilding);