diff --git a/README.md b/README.md index 4c5d7731..ed712030 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# shapez +## NEW: Shapez 2! - - shapez Logo +We are currently working on a successor to shapez, with 3D Graphics, Exploration, Layers, Mass transport, New Shape Mechanics, Research and a lot more! Be sure to check it out: + + + shapez 2 Announcement
-## NEW: Shapez 2 is coming 2023! - -We are currently working on a successor to shapez, with 3D Graphics, Exploration, Layers, Mass transport, New Shape Mechanics, Research and a lot more! Be sure to check it out: +# shapez - - shapez 2 Announcement + + shapez Logo
diff --git a/res/ui/shapez2.png b/res/ui/shapez2.png new file mode 100644 index 00000000..1db84543 Binary files /dev/null and b/res/ui/shapez2.png differ diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 025d4719..e21ca654 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -171,40 +171,41 @@ @include S(grid-gap, 20px); .mainNews { - background: linear-gradient(220deg, rgb(248, 232, 130), rgb(248, 171, 90)); + background: linear-gradient(220deg, rgb(74, 93, 201), rgb(93, 255, 150)); &::before { - background: uiResource("kiwi_clicker.png") center center / 100% no-repeat; + background: uiResource("shapez2.png") center center / 100% no-repeat; content: ""; - @include S(width, 140px); - @include S(height, 140px); + @include S(width, 100px); + @include S(height, 100px); position: absolute; - top: 50%; - right: -5%; + top: 55%; + right: 8%; pointer-events: none; transform: translateY(-50%); transition: transform 0.5s ease-in-out; } - .close { - position: absolute; - pointer-events: all; - background: uiResource("icons/main_menu_exit.png") center center / 50% no-repeat; - display: inline-flex; - @include S(width, 15px); - @include S(height, 15px); - @include S(top, 2px); - opacity: 0.3; - @include S(right, 2px); - z-index: 200; - transition: opacity 0.12s ease-in-out; - &:hover { - opacity: 0.7; - } - } + // .close { + // position: absolute; + // pointer-events: all; + // background: uiResource("icons/main_menu_exit.png") center center / 50% no-repeat; + // display: inline-flex; + // @include S(width, 15px); + // @include S(height, 15px); + // @include S(top, 2px); + // opacity: 0.3; + // @include S(right, 2px); + // z-index: 200; + // transition: opacity 0.12s ease-in-out; + // &:hover { + // opacity: 0.7; + // } + // } &:hover::before { transform: translate(0, -51%); } + box-shadow: 0 D(9px) D(15px) rgba(#000, 0.2); width: 100%; display: flex; @@ -221,16 +222,16 @@ @include S(padding, 10px); @include S(padding-right, 100px); box-sizing: border-box; - + transition: opacity 0.12s ease-in-out; cursor: pointer; &:hover { - opacity: 0.95; + opacity: 0.85; } .text { @include SuperSmallText; - @include S(width, 120px); - color: rgba(#000, 0.8); + @include S(width, 100px); + color: rgba(#000, 1); } } @@ -253,6 +254,7 @@ .onlinePlayerCount { color: #333; + display: none; @include S(margin-top, 15px); @include SuperSmallText; @include S(height, 15px); diff --git a/src/js/changelog.js b/src/js/changelog.js index 5422ae72..66ef17d6 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,4 +1,13 @@ export const CHANGELOG = [ + { + version: "1.5.6", + date: "09.12.2022", + entries: [ + "⚠️ Shapez 2 will be coming soon! Click here to find out more. ⚠️ ", + "Minor fixes & improvements", + "Updated translations", + ], + }, { version: "1.5.5", date: "20.06.2022", diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js index 85156dc0..5fb4a156 100644 --- a/src/js/profile/application_settings.js +++ b/src/js/profile/application_settings.js @@ -288,8 +288,6 @@ function initializeSettings() { new BoolSetting("lowQualityTextures", enumCategories.performance, (app, value) => {}), new BoolSetting("simplifiedBelts", enumCategories.performance, (app, value) => {}), - - new BoolSetting("showKiwiClicker", null, (app, value) => {}), ]; } @@ -334,8 +332,6 @@ class SettingsStorage { * @type {Object.} */ this.keybindingOverrides = {}; - - this.showKiwiClicker = true; } } @@ -705,7 +701,6 @@ export class ApplicationSettings extends ReadWriteProxy { } if (data.version < 32) { - data.settings.showKiwiClicker = true; data.version = 32; } diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index eb8decec..d79232a6 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -48,7 +48,7 @@ export class MainMenuState extends GameState { !G_GOG_VERSION; const showWegameFooter = G_WEGAME_VERSION; const hasMods = MODS.anyModsActive(); - const hasSteamBridge = G_IS_STANDALONE && !G_GOG_VERSION; + const hasSteamBridge = G_IS_STANDALONE && !G_GOG_VERSION && !G_IS_STEAM_DEMO; let showExternalLinks = true; @@ -78,15 +78,15 @@ export class MainMenuState extends GameState { !G_IS_STEAM_DEMO && /** @type { PlatformWrapperImplElectron}*/ (this.app.platformWrapper).dlcs.puzzle); - const showKiwiClicker = - showExternalLinks && this.app.settings.getSetting("showKiwiClicker") && MODS.mods.length === 0; + const showShapez2 = showExternalLinks && MODS.mods.length === 0; const bannerHtml = `

${T.demoBanners.titleV2}

- ${Object.entries(T.ingame.standaloneAdvantages.points) + ${Array.from(Object.entries(T.ingame.standaloneAdvantages.points)) + .slice(0, 6) .map( ([key, trans]) => `
@@ -99,11 +99,6 @@ export class MainMenuState extends GameState {
- ${ - G_IS_STEAM_DEMO - ? `${T.demoBanners.playtimeDisclaimer}` - : "" - } ${ globalConfig.currentDiscount > 0 @@ -181,6 +176,14 @@ export class MainMenuState extends GameState {
${showDemoAdvertisement ? `
${bannerHtml}
` : ""} + ${ + showShapez2 + ? `
+
Shapez 2 will be coming soon!
+ +
` + : "" + } ${ showPuzzleDLC @@ -206,15 +209,7 @@ export class MainMenuState extends GameState { } - ${ - showKiwiClicker - ? `
-
Check out this small side project I am working on right now!
-
-
` - : "" - } ` : "" } @@ -466,8 +461,7 @@ export class MainMenuState extends GameState { ".exitAppButton": this.onExitAppButtonClicked, ".steamLink": this.onSteamLinkClicked, ".steamLinkSocial": this.onSteamLinkClickedSocial, - ".kiwiClicker": this.onKiwiClickerClicked, - ".kiwiClicker .close": this.hideKiwiClicker, + ".shapez2": this.onShapez2Clicked, ".discordLink": () => { this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.discord); }, @@ -582,17 +576,8 @@ export class MainMenuState extends GameState { this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.puzzleDlcStorePage); } - onKiwiClickerClicked() { - this.app.platformWrapper.openExternalLink( - "https://store.steampowered.com/app/1980530/Kiwi_Clicker/?utm_medium=shapez" - ); - } - - hideKiwiClicker() { - this.app.settings.updateSetting("showKiwiClicker", false); - this.app.settings.save(); - this.htmlElement.querySelector(".kiwiClicker").remove(); - return STOP_PROPAGATION; + onShapez2Clicked() { + this.app.platformWrapper.openExternalLink("https://tobspr.io/shapez-2?utm_medium=shapez"); } onBackButtonClicked() { diff --git a/translations/base-pt-BR.yaml b/translations/base-pt-BR.yaml index 2cda98d9..0d79878b 100644 --- a/translations/base-pt-BR.yaml +++ b/translations/base-pt-BR.yaml @@ -1102,8 +1102,9 @@ settings: zoom). shapeTooltipAlwaysOn: title: Dica de ferramente de forma - Mostrar sempre - description: Deve sempre mostrar a dica de ferramenta de forma ao pairar sobre - construções em vez de ter que segurar 'ALT'. + description: >- + Deve sempre mostrar a dica de ferramenta de forma ao pairar sobre + construções em vez de ter que segurar 'ALT'. rangeSliderPercentage: % tickrateHz: Hz newBadge: New! diff --git a/version b/version index 5ebba4f0..03082db7 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.5 \ No newline at end of file +1.5.6 \ No newline at end of file