Further fixes

res_built/atlas/atlas0_hq.json

@@ -1455,6 +1455,6 @@
 	"format": "RGBA8888",
 	"size": {"w":2048,"h":2048},
 	"scale": "0.75",
-	"smartupdate": "$TexturePacker:SmartUpdate:924a8f6c92d940fa98468620a94d6050:d4394c870d2b44699ac9f9cd06c8c294:908b89f5ca8ff73e331a35a3b14d0604$"
+	"smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$"
 }
 }

res_built/atlas/atlas0_lq.json

@@ -1455,6 +1455,6 @@
 	"format": "RGBA8888",
 	"size": {"w":1024,"h":1024},
 	"scale": "0.25",
-	"smartupdate": "$TexturePacker:SmartUpdate:924a8f6c92d940fa98468620a94d6050:d4394c870d2b44699ac9f9cd06c8c294:908b89f5ca8ff73e331a35a3b14d0604$"
+	"smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$"
 }
 }

res_built/atlas/atlas0_mq.json

@@ -1455,6 +1455,6 @@
 	"format": "RGBA8888",
 	"size": {"w":1024,"h":2048},
 	"scale": "0.5",
-	"smartupdate": "$TexturePacker:SmartUpdate:924a8f6c92d940fa98468620a94d6050:d4394c870d2b44699ac9f9cd06c8c294:908b89f5ca8ff73e331a35a3b14d0604$"
+	"smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$"
 }
 }

src/js/game/buildings/underground_belt.js

@@ -25,7 +25,7 @@ export const enumUndergroundBeltVariantToTier = {
     [enumUndergroundBeltVariants.tier2]: 1,
 };
 
-const colorsByRotationVariant = ["#6d9dff", "#9cad40"];
+const colorsByRotationVariant = ["#6d9dff", "#71ff9c"];
 
 const overlayMatrices = [
     // Sender

src/js/game/buildings/wire.js

@@ -6,6 +6,7 @@ import { enumWireType, enumWireVariant, WireComponent } from "../components/wire
 import { Entity } from "../entity";
 import { defaultBuildingVariant, MetaBuilding } from "../meta_building";
 import { GameRoot } from "../root";
+import { enumHubGoalRewards } from "../tutorial_goals";
 
 export const arrayWireRotationVariantToType = [
     enumWireType.forward,
@@ -81,8 +82,7 @@ export class MetaWireBuilding extends MetaBuilding {
      * @param {GameRoot} root
      */
     getIsUnlocked(root) {
-        // @todo
-        return true;
+        return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_wires_filters_and_levers);
     }
 
     /**

src/js/game/hud/parts/wires_overlay.js

@@ -6,6 +6,7 @@ import { THEME } from "../../theme";
 import { BaseHUDPart } from "../base_hud_part";
 import { Loader } from "../../../core/loader";
 import { lerp } from "../../../core/utils";
+import { enumHubGoalRewards } from "../../tutorial_goals";
 
 const wiresBackgroundDpi = 4;
 
@@ -26,7 +27,9 @@ export class HUDWiresOverlay extends BaseHUDPart {
      */
     switchLayers() {
         if (this.root.currentLayer === "regular") {
-            this.root.currentLayer = "wires";
+            if (this.root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_wires_filters_and_levers)) {
+                this.root.currentLayer = "wires";
+            }
         } else {
             this.root.currentLayer = "regular";
         }

src/js/game/themes/dark.json

@@ -17,8 +17,8 @@
                 "background": "rgba(74, 237, 134, 0.2)"
             },
             "wires": {
-                "color": "rgb(209, 107, 203)",
-                "background": "rgba(209, 107, 203, 0.2)"
+                "color": "rgb(74, 237, 134)",
+                "background": "rgba(74, 237, 134, 0.2)"
             }
         },
 

src/js/game/themes/light.json

@@ -17,8 +17,8 @@
                 "background": "rgba(74, 237, 134, 0.2)"
             },
             "wires": {
-                "color": "rgb(209, 107, 203)",
-                "background": "rgba(209, 107, 203, 0.2)"
+                "color": "rgb(74, 237, 134)",
+                "background": "rgba(74, 237, 134, 0.2)"
             }
         },
 

src/js/game/tutorial_goals.js

@@ -30,7 +30,6 @@ export const enumHubGoalRewards = {
     reward_constant_signal: "reward_constant_signal",
     reward_logic_gates: "reward_logic_gates",
     reward_virtual_processing: "reward_virtual_processing",
-    reward_second_wire: "reward_second_wire",
 
     reward_blueprints: "reward_blueprints",
     reward_freeplay: "reward_freeplay",
@@ -244,15 +243,7 @@ export const tutorialGoals = [
         reward: enumHubGoalRewards.reward_virtual_processing,
     },
 
-    // 26 Secondary type of wire
-    {
-        // @TODO
-        shape: "CuCuCuCu",
-        required: 50000,
-        reward: enumHubGoalRewards.reward_second_wire,
-    },
-
-    // 27 Freeplay
+    // 26 Freeplay
     {
         // @TODO
         shape: "CuCuCuCu",

src/js/game/tutorial_goals_mappings.js

@@ -53,7 +53,6 @@ export const enumHubGoalRewardsToContentUnlocked = {
     [enumHubGoalRewards.reward_constant_signal]: typed([
         [MetaConstantSignalBuilding, defaultBuildingVariant],
     ]),
-    [enumHubGoalRewards.reward_second_wire]: null, // @TODO!
     [enumHubGoalRewards.reward_logic_gates]: null, // @TODO!
     [enumHubGoalRewards.reward_virtual_processing]: null, // @TODO!
 

translations/base-en.yaml

@@ -565,10 +565,11 @@ buildings:
     wire:
         default:
             name: &wire Wire
-            description: &wire_desc Allows to connect logical components and can transfer items, colors or boolean signals.
+            description: &wire_desc Transfers signals, which can be items, colors or booleans (1 / 0). Different colored wires do not connect.
+
         second:
-            name: Wire
-            description: Allows to connect logical components and can transfer items, colors or boolean signals. Different colored wires do not connect.
+            name: *wire
+            description: *wire_desc
 
     wire_tunnel:
         default:
@@ -578,7 +579,7 @@ buildings:
     constant_signal:
         default:
             name: &constant_signal Constant Signal
-            description: Emits a constant signal, which can be either a shape, color or boolean.
+            description: Emits a constant signal, which can be either a shape, color or boolean (1 / 0).
 
     lever:
         default:
@@ -587,7 +588,7 @@ buildings:
 
     logic_gate:
         default:
-            name: &logic_gate AND Gate
+            name: AND Gate
             description: Emits a boolean "1" if both inputs are truthy.
         not:
             name: NOT Gate
@@ -683,7 +684,7 @@ storyRewards:
 
     reward_tunnel:
         title: Tunnel
-        desc: The <strong>tunnel</strong> has been unlocked - You can now tunnel items through belts and buildings with it!
+        desc: The <strong>tunnel</strong> has been unlocked - You can now tunnel items below belts and buildings with it!
 
     reward_rotater_ccw:
         title: CCW Rotating
@@ -775,12 +776,6 @@ storyRewards:
             - Build something cool with wires.<br><br>
             - Continue to play regulary.
 
-    reward_second_wire:
-        title: Second Wire Type
-        desc: >-
-            Annoyed by wires automatically connecting? I just gave you another <strong>type of wire</strong>!<br><br>
-            Different types of wires do not connect to each other, so you can now build much compacter circuits.
-
     # Special reward, which is shown when there is no reward actually
     no_reward:
         title: Next level