diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index a39e0a47..89aad926 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -311,7 +311,7 @@ export class HubGoals extends BasicSerializableObject { case enumItemProcessorTypes.hub: return 1e30; case enumItemProcessorTypes.splitter: - return (2 / globalConfig.beltSpeedItemsPerSecond) * this.upgradeImprovements.splitter; + return (2 / globalConfig.beltSpeedItemsPerSecond) * this.upgradeImprovements.processors; case enumItemProcessorTypes.cutter: case enumItemProcessorTypes.rotater: case enumItemProcessorTypes.stacker: diff --git a/src/js/game/tutorial_goals.js b/src/js/game/tutorial_goals.js index 7532e090..8a57484b 100644 --- a/src/js/game/tutorial_goals.js +++ b/src/js/game/tutorial_goals.js @@ -1,5 +1,4 @@ -import { enumSubShape, ShapeDefinition, createSimpleShape } from "./shape_definition"; -import { enumColors } from "./colors"; +import { ShapeDefinition } from "./shape_definition"; /** * @enum {string} @@ -116,13 +115,13 @@ export const tutorialGoals = [ }, { - shape: "CgCgRgRg", + shape: "RgCwRgCw:CpCpCpCp", required: 6000, reward: enumHubGoalRewards.no_reward, }, { - shape: "CwSwCwSw", + shape: "CwSwCwSw:CpCrCpCr", required: 6000, reward: enumHubGoalRewards.no_reward, }, @@ -140,13 +139,13 @@ export const tutorialGoals = [ }, { - shape: "WyRgWyCg:CbCpCbCp:CwCwCwCw", + shape: "WyRgWyRg:CbCpCbCp:CpCgCpCg", required: 9000, reward: enumHubGoalRewards.no_reward, }, { - shape: "CwRrWbSp:WcWrCpCw", + shape: "CwRrCbRy:ScSrSpSb:CwCwCwCw:RgRgRgRg", required: 15000, reward: enumHubGoalRewards.no_reward, }, diff --git a/src/js/game/upgrades.js b/src/js/game/upgrades.js index 7dd9e8df..3a261904 100644 --- a/src/js/game/upgrades.js +++ b/src/js/game/upgrades.js @@ -1,7 +1,5 @@ -import { createSimpleShape, enumSubShape, ShapeDefinition } from "./shape_definition"; -import { enumColors } from "./colors"; import { findNiceIntegerValue } from "../core/utils"; -import { globalConfig } from "../core/config"; +import { ShapeDefinition } from "./shape_definition"; export const TIER_LABELS = [ "I", diff --git a/tools/shape_generator/index.html b/tools/shape_generator/index.html index 22a388d6..e72d8bc3 100644 --- a/tools/shape_generator/index.html +++ b/tools/shape_generator/index.html @@ -22,19 +22,23 @@ justify-content: center; } - #result { + #resultWrapper { border: 1px solid #ccc; margin-top: 10px; background: #fff; + padding: 40px; + } + + #resultWrapper #result { } #code { width: 600px; font-family: monospace; - padding: 10px; + padding: 30px; border: 1px solid #ccc; background: #fff; - font-size: 15px; + font-size: 17px; } #code:focus { @@ -57,7 +61,9 @@
+