diff --git a/src/css/states/preload.scss b/src/css/states/preload.scss index 514c60d2..2e14abd6 100644 --- a/src/css/states/preload.scss +++ b/src/css/states/preload.scss @@ -17,7 +17,7 @@ @include S(border-radius, 3px); @include DarkThemeOverride { - background: #424242; + background: #33343c; } .version { diff --git a/src/js/changelog.js b/src/js/changelog.js index 61c1c79a..c66da8ef 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -2,10 +2,21 @@ export const CHANGELOG = [ { version: "1.3.1", date: "beta", - entries: [ - "Fixed savegames getting corrupt in rare conditions", - "Fixed game crashing sometimes since the achievements update", - ], + entries: G_CHINA_VERSION + ? [ + "The level 13 shape has been changed to reflect the chinese symbol 'Ancient Chinese Compass', created by 凯风入心", + "The level 17 shape has been changed to reflect the chinese symbol 'Yongle Coins of Ming Dynasty', created by 金天赐", + "The level 22 shape has been changed to reflect the chinese symbol 'Phoenix', created by 我没得眼镜", + "The level 23 shape has been changed to reflect the chinese symbol 'Ancient wheel', created by 百京清真卤煮", + "The level 24 shape has been changed to reflect the chinese symbol 'Panda', created by 窝囸倪现任", + + "Fixed savegames getting corrupt in rare conditions", + "Fixed game crashing sometimes since the achievements update", + ] + : [ + "Fixed savegames getting corrupt in rare conditions", + "Fixed game crashing sometimes since the achievements update", + ], }, { version: "1.3.0", diff --git a/src/js/game/hud/hud.js b/src/js/game/hud/hud.js index d64f96a8..ceeb224e 100644 --- a/src/js/game/hud/hud.js +++ b/src/js/game/hud/hud.js @@ -142,9 +142,7 @@ export class GameHUD { this.parts.colorBlindHelper = new HUDColorBlindHelper(this.root); } - if (queryParamOptions.sandboxMode || G_IS_DEV) { - this.parts.sandboxController = new HUDSandboxController(this.root); - } + this.parts.sandboxController = new HUDSandboxController(this.root); if (!G_IS_RELEASE && !G_IS_DEV) { this.parts.betaOverlay = new HUDBetaOverlay(this.root); diff --git a/src/js/game/hud/parts/sandbox_controller.js b/src/js/game/hud/parts/sandbox_controller.js index 592487ee..a912015e 100644 --- a/src/js/game/hud/parts/sandbox_controller.js +++ b/src/js/game/hud/parts/sandbox_controller.js @@ -1,3 +1,4 @@ +import { queryParamOptions } from "../../../core/query_parameters"; import { makeDiv } from "../../../core/utils"; import { BaseHUDPart } from "../base_hud_part"; import { DynamicDomAttach } from "../dynamic_dom_attach"; @@ -19,25 +20,25 @@ export class HUDSandboxController extends BaseHUDPart { - +
- +
- +
- +
@@ -148,7 +149,21 @@ export class HUDSandboxController extends BaseHUDPart { this.domAttach = new DynamicDomAttach(this.root, this.element); } + isAvailable() { + if (queryParamOptions.sandboxMode || G_IS_DEV) { + return true; + } + // @ts-ignore + if (window.sandboxMode) { + return true; + } + return false; + } + toggle() { + if (!this.visible && !this.isAvailable()) { + return; + } this.visible = !this.visible; } diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index e99f4a7c..feab7b5c 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -87,7 +87,14 @@ function generateUpgrades(limitedVersion = false) { required: [{ shape: "CwCwCwCw:WbWbWbWb", amount: 23000 }], }, { - required: [{ shape: "CbRbRbCb:CwCwCwCw:WbWbWbWb", amount: 50000 }], + required: [ + { + shape: G_CHINA_VERSION + ? "CyCyCyCy:CyCyCyCy:RyRyRyRy:RuRuRuRu" + : "CbRbRbCb:CwCwCwCw:WbWbWbWb", + amount: 50000, + }, + ], }, { required: [{ shape: preparementShape, amount: 25000 }], @@ -141,7 +148,12 @@ function generateUpgrades(limitedVersion = false) { required: [{ shape: "WrWrWrWr", amount: 3800 }], }, { - required: [{ shape: "RpRpRpRp:CwCwCwCw", amount: 6500 }], + required: [ + { + shape: G_CHINA_VERSION ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw", + amount: 6500, + }, + ], }, { required: [{ shape: "WpWpWpWp:CwCwCwCw:WpWpWpWp", amount: 25000 }], @@ -315,7 +327,7 @@ export function generateLevelDefinitions(limitedVersion = false) { // 13 // Tunnel Tier 2 { - shape: "RpRpRpRp:CwCwCwCw", // painting t3 + shape: G_CHINA_VERSION ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw", // painting t3 required: 3800, reward: enumHubGoalRewards.reward_underground_belt_tier_2, }, @@ -324,7 +336,7 @@ export function generateLevelDefinitions(limitedVersion = false) { ...(limitedVersion ? [ { - shape: "RpRpRpRp:CwCwCwCw", + shape: G_CHINA_VERSION ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw", required: 0, reward: enumHubGoalRewards.reward_demo_end, }, @@ -358,7 +370,9 @@ export function generateLevelDefinitions(limitedVersion = false) { // 17 // Double painter { - shape: "CbRbRbCb:CwCwCwCw:WbWbWbWb", // miner t4 (two variants) + shape: G_CHINA_VERSION + ? "CyCyCyCy:CyCyCyCy:RyRyRyRy:RuRuRuRu" + : "CbRbRbCb:CwCwCwCw:WbWbWbWb", // miner t4 (two variants) required: 20000, reward: enumHubGoalRewards.reward_painter_double, }, @@ -398,7 +412,9 @@ export function generateLevelDefinitions(limitedVersion = false) { // 22 // Constant signal { - shape: "Cg----Cr:Cw----Cw:Sy------:Cy----Cy", + shape: G_CHINA_VERSION + ? "RrSySrSy:RyCrCwCr:CyCyRyCy" + : "Cg----Cr:Cw----Cw:Sy------:Cy----Cy", required: 25000, reward: enumHubGoalRewards.reward_constant_signal, }, @@ -406,14 +422,18 @@ export function generateLevelDefinitions(limitedVersion = false) { // 23 // Display { - shape: "CcSyCcSy:SyCcSyCc:CcSyCcSy", + shape: G_CHINA_VERSION + ? "CrCrCrCr:CwCwCwCw:WwWwWwWw:CrCrCrCr" + : "CcSyCcSy:SyCcSyCc:CcSyCcSy", required: 25000, reward: enumHubGoalRewards.reward_display, }, // 24 Logic gates { - shape: "CcRcCcRc:RwCwRwCw:Sr--Sw--:CyCyCyCy", + shape: G_CHINA_VERSION + ? "Su----Su:RwRwRwRw:Cu----Cu:CwCwCwCw" + : "CcRcCcRc:RwCwRwCw:Sr--Sw--:CyCyCyCy", required: 25000, reward: enumHubGoalRewards.reward_logic_gates, },