1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00

Further fixes

This commit is contained in:
tobspr
2020-09-24 17:14:15 +02:00
parent a4b46f8527
commit 7cd1ee22fd
17 changed files with 22 additions and 34 deletions

View File

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

View File

@@ -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);
}
/**

View File

@@ -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";
}

View File

@@ -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)"
}
},

View File

@@ -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)"
}
},

View File

@@ -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",

View File

@@ -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!