Skip to content

Commit ee2279d

Browse files
tobsprtobspr
committed
Add shapez 2 hint to the game
1 parent 82980ae commit ee2279d

File tree

8 files changed

+64
-72
lines changed

8 files changed

+64
-72
lines changed

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# shapez
1+
## NEW: Shapez 2!
22

3-
<a href="https://get.shapez.io/ghi" title="shapez on Steam">
4-
<img src="https://i.imgur.com/ihW2bUE.png" alt="shapez Logo">
3+
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:
4+
5+
<a href="https://tobspr.io/shapez-2" title="shapez 2">
6+
<img src="https://i.imgur.com/6T7UP3p.png" alt="shapez 2 Announcement">
57
</a>
68

79
<br>
810

9-
## NEW: Shapez 2 is coming 2023!
10-
11-
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:
11+
# shapez
1212

13-
<a href="https://tobspr.io/shapez-2" title="shapez 2">
14-
<img src="https://i.imgur.com/6T7UP3p.png" alt="shapez 2 Announcement">
13+
<a href="https://get.shapez.io/ghi" title="shapez on Steam">
14+
<img src="https://i.imgur.com/ihW2bUE.png" alt="shapez Logo">
1515
</a>
1616

1717
<hr>

‎res/ui/shapez2.png

23.9 KB
Loading

‎src/css/states/main_menu.scss

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -171,40 +171,41 @@
171171
@include S(grid-gap, 20px);
172172

173173
.mainNews {
174-
background: linear-gradient(220deg, rgb(248, 232, 130), rgb(248, 171, 90));
174+
background: linear-gradient(220deg, rgb(74, 93, 201), rgb(93, 255, 150));
175175
&::before {
176-
background: uiResource("kiwi_clicker.png") center center / 100% no-repeat;
176+
background: uiResource("shapez2.png") center center / 100% no-repeat;
177177
content: "";
178-
@include S(width, 140px);
179-
@include S(height, 140px);
178+
@include S(width, 100px);
179+
@include S(height, 100px);
180180
position: absolute;
181-
top: 50%;
182-
right: -5%;
181+
top: 55%;
182+
right: 8%;
183183
pointer-events: none;
184184
transform: translateY(-50%);
185185
transition: transform 0.5s ease-in-out;
186186
}
187187

188-
.close {
189-
position: absolute;
190-
pointer-events: all;
191-
background: uiResource("icons/main_menu_exit.png") center center / 50% no-repeat;
192-
display: inline-flex;
193-
@include S(width, 15px);
194-
@include S(height, 15px);
195-
@include S(top, 2px);
196-
opacity: 0.3;
197-
@include S(right, 2px);
198-
z-index: 200;
199-
transition: opacity 0.12s ease-in-out;
200-
&:hover {
201-
opacity: 0.7;
202-
}
203-
}
188+
// .close {
189+
// position: absolute;
190+
// pointer-events: all;
191+
// background: uiResource("icons/main_menu_exit.png") center center / 50% no-repeat;
192+
// display: inline-flex;
193+
// @include S(width, 15px);
194+
// @include S(height, 15px);
195+
// @include S(top, 2px);
196+
// opacity: 0.3;
197+
// @include S(right, 2px);
198+
// z-index: 200;
199+
// transition: opacity 0.12s ease-in-out;
200+
// &:hover {
201+
// opacity: 0.7;
202+
// }
203+
// }
204204

205205
&:hover::before {
206206
transform: translate(0, -51%);
207207
}
208+
208209
box-shadow: 0 D(9px) D(15px) rgba(#000, 0.2);
209210
width: 100%;
210211
display: flex;
@@ -221,16 +222,16 @@
221222
@include S(padding, 10px);
222223
@include S(padding-right, 100px);
223224
box-sizing: border-box;
224-
225+
transition: opacity 0.12s ease-in-out;
225226
cursor: pointer;
226227
&:hover {
227-
opacity: 0.95;
228+
opacity: 0.85;
228229
}
229230

230231
.text {
231232
@include SuperSmallText;
232-
@include S(width, 120px);
233-
color: rgba(#000, 0.8);
233+
@include S(width, 100px);
234+
color: rgba(#000, 1);
234235
}
235236
}
236237

@@ -253,6 +254,7 @@
253254

254255
.onlinePlayerCount {
255256
color: #333;
257+
display: none;
256258
@include S(margin-top, 15px);
257259
@include SuperSmallText;
258260
@include S(height, 15px);

‎src/js/changelog.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
export const CHANGELOG = [
2+
{
3+
version: "1.5.6",
4+
date: "09.12.2022",
5+
entries: [
6+
"⚠️ Shapez 2 will be coming soon! <a href='https://tobspr.io/shapez-2?utm_medium=s1_steam' target='_blank'>Click here</a> to find out more. ⚠️ ",
7+
"Minor fixes & improvements",
8+
"Updated translations",
9+
],
10+
},
211
{
312
version: "1.5.5",
413
date: "20.06.2022",

‎src/js/profile/application_settings.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,6 @@ function initializeSettings() {
288288
new BoolSetting("lowQualityTextures", enumCategories.performance, (app, value) => {}),
289289

290290
new BoolSetting("simplifiedBelts", enumCategories.performance, (app, value) => {}),
291-
292-
new BoolSetting("showKiwiClicker", null, (app, value) => {}),
293291
];
294292
}
295293

@@ -334,8 +332,6 @@ class SettingsStorage {
334332
* @type {Object.<string, number>}
335333
*/
336334
this.keybindingOverrides = {};
337-
338-
this.showKiwiClicker = true;
339335
}
340336
}
341337

@@ -705,7 +701,6 @@ export class ApplicationSettings extends ReadWriteProxy {
705701
}
706702

707703
if (data.version < 32) {
708-
data.settings.showKiwiClicker = true;
709704
data.version = 32;
710705
}
711706

‎src/js/states/main_menu.js

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class MainMenuState extends GameState {
4848
!G_GOG_VERSION;
4949
const showWegameFooter = G_WEGAME_VERSION;
5050
const hasMods = MODS.anyModsActive();
51-
const hasSteamBridge = G_IS_STANDALONE && !G_GOG_VERSION;
51+
const hasSteamBridge = G_IS_STANDALONE && !G_GOG_VERSION && !G_IS_STEAM_DEMO;
5252

5353
let showExternalLinks = true;
5454

@@ -78,15 +78,15 @@ export class MainMenuState extends GameState {
7878
!G_IS_STEAM_DEMO &&
7979
/** @type { PlatformWrapperImplElectron}*/ (this.app.platformWrapper).dlcs.puzzle);
8080

81-
const showKiwiClicker =
82-
showExternalLinks && this.app.settings.getSetting("showKiwiClicker") && MODS.mods.length === 0;
81+
const showShapez2 = showExternalLinks && MODS.mods.length === 0;
8382

8483
const bannerHtml = `
8584
<h3>${T.demoBanners.titleV2}</h3>
8685
8786
8887
<div class="points">
89-
${Object.entries(T.ingame.standaloneAdvantages.points)
88+
${Array.from(Object.entries(T.ingame.standaloneAdvantages.points))
89+
.slice(0, 6)
9090
.map(
9191
([key, trans]) => `
9292
<div class="point ${key}">
@@ -99,11 +99,6 @@ export class MainMenuState extends GameState {
9999
</div>
100100
101101
102-
${
103-
G_IS_STEAM_DEMO
104-
? `<span class="playtimeDisclaimer">${T.demoBanners.playtimeDisclaimer}</span>`
105-
: ""
106-
}
107102
<a href="#" class="steamLink steam_dlbtn_0" target="_blank">
108103
${
109104
globalConfig.currentDiscount > 0
@@ -181,6 +176,14 @@ export class MainMenuState extends GameState {
181176
<div class="sideContainer">
182177
${showDemoAdvertisement ? `<div class="standaloneBanner">${bannerHtml}</div>` : ""}
183178
179+
${
180+
showShapez2
181+
? `<div class="mainNews shapez2">
182+
<div class="text">Shapez 2 will be coming soon!</div>
183+
184+
</div>`
185+
: ""
186+
}
184187
185188
${
186189
showPuzzleDLC
@@ -206,15 +209,7 @@ export class MainMenuState extends GameState {
206209
}
207210
208211
209-
${
210-
showKiwiClicker
211-
? `<div class="mainNews kiwiClicker">
212-
<div class="text">Check out this small side project I am working on right now!</div>
213-
<div class="close"></div>
214212
215-
</div>`
216-
: ""
217-
}
218213
`
219214
: ""
220215
}
@@ -466,8 +461,7 @@ export class MainMenuState extends GameState {
466461
".exitAppButton": this.onExitAppButtonClicked,
467462
".steamLink": this.onSteamLinkClicked,
468463
".steamLinkSocial": this.onSteamLinkClickedSocial,
469-
".kiwiClicker": this.onKiwiClickerClicked,
470-
".kiwiClicker .close": this.hideKiwiClicker,
464+
".shapez2": this.onShapez2Clicked,
471465
".discordLink": () => {
472466
this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.discord);
473467
},
@@ -582,17 +576,8 @@ export class MainMenuState extends GameState {
582576
this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.puzzleDlcStorePage);
583577
}
584578

585-
onKiwiClickerClicked() {
586-
this.app.platformWrapper.openExternalLink(
587-
"https://store.steampowered.com/app/1980530/Kiwi_Clicker/?utm_medium=shapez"
588-
);
589-
}
590-
591-
hideKiwiClicker() {
592-
this.app.settings.updateSetting("showKiwiClicker", false);
593-
this.app.settings.save();
594-
this.htmlElement.querySelector(".kiwiClicker").remove();
595-
return STOP_PROPAGATION;
579+
onShapez2Clicked() {
580+
this.app.platformWrapper.openExternalLink("https://tobspr.io/shapez-2?utm_medium=shapez");
596581
}
597582

598583
onBackButtonClicked() {

‎translations/base-pt-BR.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,8 +1102,9 @@ settings:
11021102
zoom).
11031103
shapeTooltipAlwaysOn:
11041104
title: Dica de ferramente de forma - Mostrar sempre
1105-
description: Deve sempre mostrar a dica de ferramenta de forma ao pairar sobre
1106-
construções em vez de ter que segurar 'ALT'.
1105+
description: >-
1106+
Deve sempre mostrar a dica de ferramenta de forma ao pairar sobre
1107+
construções em vez de ter que segurar 'ALT'.
11071108
rangeSliderPercentage: <amount> %
11081109
tickrateHz: <amount> Hz
11091110
newBadge: New!

‎version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.5
1+
1.5.6

0 commit comments

Comments
 (0)