Switch to steam

This commit is contained in:
tobspr 2020-06-07 12:56:02 +02:00
parent 1dee6a6aa2
commit a2ee16589f
12 changed files with 51 additions and 28 deletions

View File

@ -237,7 +237,7 @@ module.exports = ({
pattern: /globalConfig\.beltSpeedItemsPerSecond/g, pattern: /globalConfig\.beltSpeedItemsPerSecond/g,
replacement: () => "2.0", replacement: () => "2.0",
}, },
{ pattern: /globalConfig\.itemSpacingOnBelts/g, replacement: () => "0.8" }, { pattern: /globalConfig\.itemSpacingOnBelts/g, replacement: () => "0.63" },
{ pattern: /globalConfig\.debug/g, replacement: () => "''" }, { pattern: /globalConfig\.debug/g, replacement: () => "''" },
], ],
}), }),

View File

@ -1,6 +1,6 @@
#ingame_HUD_Watermark { #ingame_HUD_Watermark {
position: absolute; position: absolute;
background: uiResource("get_on_itch_io.svg") center center / contain no-repeat; background: uiResource("get_on_steam.png") center center / contain no-repeat;
@include S(width, 110px); @include S(width, 110px);
@include S(height, 40px); @include S(height, 40px);
@include S(top, 10px); @include S(top, 10px);

View File

@ -103,9 +103,9 @@
.steamLink { .steamLink {
width: 100%; width: 100%;
@include S(height, 50px); @include S(height, 40px);
background: uiResource("get_on_itch_io.svg") center center / contain no-repeat; background: uiResource("get_on_steam.png") center center / contain no-repeat;
overflow: hidden; overflow: hidden;
display: block; display: block;
text-indent: -999em; text-indent: -999em;

View File

@ -30,7 +30,7 @@
width: 200px; width: 200px;
height: 80px; height: 80px;
min-height: 40px; min-height: 40px;
background: uiResource("get_on_itch_io.svg") center center / contain no-repeat; background: uiResource("get_on_steam.png") center center / contain no-repeat;
overflow: hidden; overflow: hidden;
display: block; display: block;
text-indent: -999em; text-indent: -999em;

View File

@ -1,4 +1,13 @@
export const CHANGELOG = [ export const CHANGELOG = [
{
version: "1.1.8",
date: "07.06.2020",
entries: [
"You can now purchase the standalone on steam! <a href='https://steam.shapez.io' target='blank'>View steam page</a>",
"Added ability to create markers in the demo, but only two.",
"Contest #01 has ended! I'll now work through the entries, select the 5 I like most and present them to the community to vote for!",
],
},
{ {
version: "1.1.7", version: "1.1.7",
date: "04.06.2020", date: "04.06.2020",

View File

@ -15,8 +15,7 @@ export const THIRDPARTY_URLS = {
discord: "https://discord.gg/HN7EVzV", discord: "https://discord.gg/HN7EVzV",
github: "https://github.com/tobspr/shapez.io", github: "https://github.com/tobspr/shapez.io",
// standaloneStorePage: "https://steam.shapez.io", standaloneStorePage: "https://store.steampowered.com/app/1318690/shapezio/",
standaloneStorePage: "https://tobspr.itch.io/shapez.io",
}; };
export const globalConfig = { export const globalConfig = {
@ -45,8 +44,8 @@ export const globalConfig = {
// Belt speeds // Belt speeds
// NOTICE: Update webpack.production.config too! // NOTICE: Update webpack.production.config too!
beltSpeedItemsPerSecond: 1, beltSpeedItemsPerSecond: 2,
itemSpacingOnBelts: 0.63, itemSpacingOnBelts: 0.8,
minerSpeedItemsPerSecond: 0, // COMPUTED minerSpeedItemsPerSecond: 0, // COMPUTED
undergroundBeltMaxTilesByTier: [5, 8], undergroundBeltMaxTilesByTier: [5, 8],
@ -83,7 +82,7 @@ export const globalConfig = {
debug: { debug: {
/* dev:start */ /* dev:start */
// fastGameEnter: true, fastGameEnter: true,
// noArtificialDelays: true, // noArtificialDelays: true,
// disableSavegameWrite: true, // disableSavegameWrite: true,
// showEntityBounds: true, // showEntityBounds: true,

View File

@ -13,7 +13,7 @@ export class HUDWatermark extends BaseHUDPart {
} }
onWatermarkClick() { onWatermarkClick() {
this.root.app.analytics.trackUiClick("watermark_click"); this.root.app.analytics.trackUiClick("watermark_click_2");
this.root.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.standaloneStorePage); this.root.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.standaloneStorePage);
} }

View File

@ -133,11 +133,6 @@ export class HUDWaypoints extends BaseHUDPart {
* @param {Vector=} worldPos Override the world pos, otherwise it is the camera position * @param {Vector=} worldPos Override the world pos, otherwise it is the camera position
*/ */
requestCreateMarker(worldPos = null) { requestCreateMarker(worldPos = null) {
if (IS_DEMO) {
this.root.hud.parts.dialogs.showFeatureRestrictionInfo(T.demo.features.creatingMarkers);
return;
}
const markerNameInput = new FormElementInput({ const markerNameInput = new FormElementInput({
id: "markerName", id: "markerName",
label: null, label: null,
@ -157,6 +152,11 @@ export class HUDWaypoints extends BaseHUDPart {
const center = worldPos || this.root.camera.center; const center = worldPos || this.root.camera.center;
dialog.buttonSignals.ok.add(() => { dialog.buttonSignals.ok.add(() => {
if (IS_DEMO && this.waypoints.length > 2) {
this.root.hud.parts.dialogs.showFeatureRestrictionInfo("", T.dialogs.markerDemoLimit.desc);
return;
}
this.waypoints.push({ this.waypoints.push({
label: markerNameInput.getValue(), label: markerNameInput.getValue(),
center: { x: center.x, y: center.y }, center: { x: center.x, y: center.y },

View File

@ -27,7 +27,8 @@ export class MainMenuState extends GameState {
<a href="#" class="steamLink" target="_blank">Get the shapez.io standalone!</a> <a href="#" class="steamLink" target="_blank">Get the shapez.io standalone!</a>
`; `;
return ` return (
`
<button class="settingsButton"></button> <button class="settingsButton"></button>
@ -57,13 +58,20 @@ export class MainMenuState extends GameState {
<div class="sideContainer"> <div class="sideContainer">
${IS_DEMO ? `<div class="standaloneBanner">${bannerHtml}</div>` : ""} ${IS_DEMO ? `<div class="standaloneBanner">${bannerHtml}</div>` : ""}
<div class="contest"> <div class="contest">
<h3>${T.mainMenu.contests.contest_01_03062020.title}</h3> <h3>${T.mainMenu.contests.contest_01_03062020.title}</h3>
<p>${T.mainMenu.contests.contest_01_03062020.desc}</p> ` +
/*<p>${T.mainMenu.contests.contest_01_03062020.desc}</p>
<button class="styledButton participateContest">${ <button class="styledButton participateContest">${
T.mainMenu.contests.showInfo T.mainMenu.contests.showInfo
}</button> }</button>*/
`
<p>${T.mainMenu.contests.contestOver}</p>
</div> </div>
</div> </div>
<div class="mainContainer"> <div class="mainContainer">
@ -104,7 +112,8 @@ export class MainMenuState extends GameState {
<div class="author">Made by <a class="producerLink" target="_blank">Tobias Springer</a></div> <div class="author">Made by <a class="producerLink" target="_blank">Tobias Springer</a></div>
</div> </div>
`; `
);
} }
requestImportSavegame() { requestImportSavegame() {
@ -220,7 +229,10 @@ export class MainMenuState extends GameState {
this.trackClicks(qs(".settingsButton"), this.onSettingsButtonClicked); this.trackClicks(qs(".settingsButton"), this.onSettingsButtonClicked);
this.trackClicks(qs(".changelog"), this.onChangelogClicked); this.trackClicks(qs(".changelog"), this.onChangelogClicked);
this.trackClicks(qs(".participateContest"), this.onContestClicked); const contestButton = qs(".participateContest");
if (contestButton) {
this.trackClicks(contestButton, this.onContestClicked);
}
if (G_IS_STANDALONE) { if (G_IS_STANDALONE) {
this.trackClicks(qs(".exitAppButton"), this.onExitAppButtonClicked); this.trackClicks(qs(".exitAppButton"), this.onExitAppButtonClicked);
@ -256,7 +268,7 @@ export class MainMenuState extends GameState {
} }
onSteamLinkClicked() { onSteamLinkClicked() {
this.app.analytics.trackUiClick("main_menu_steam_link"); this.app.analytics.trackUiClick("main_menu_steam_link_2");
this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.standaloneStorePage); this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.standaloneStorePage);
return false; return false;
} }

View File

@ -13,11 +13,11 @@ export class MobileWarningState extends GameState {
<img class="logo" src="${cachebust("res/logo.png")}" alt="shapez.io Logo"> <img class="logo" src="${cachebust("res/logo.png")}" alt="shapez.io Logo">
<p> <p>
I'm sorry, but shapez.io is not yet available on mobile devices! I'm sorry, but shapez.io is not available on mobile devices yet!
(There is also no estimate when this will change, but feel to make a contribution! It's There is also no estimate when this will change, but feel to make a contribution! It's
&nbsp;<a href="https://github.com/tobspr/shapez.io" target="_blank">open source</a>!)</p> &nbsp;<a href="https://github.com/tobspr/shapez.io" target="_blank">open source</a>!</p>
<p>If you want to play on your computer, you can also get the standalone on itch.io:</p> <p>If you want to play on your computer, you can also get the standalone on steam:</p>
<a href="${ <a href="${

View File

@ -103,6 +103,7 @@ mainMenu:
I'm looking forward to seeing your awesome creations! I'm looking forward to seeing your awesome creations!
showInfo: View showInfo: View
contestOver: This contest has ended - Join the discord to get noticed about new contests!
dialogs: dialogs:
buttons: buttons:
@ -218,6 +219,9 @@ dialogs:
title: New Marker title: New Marker
desc: Give it a meaningful name desc: Give it a meaningful name
markerDemoLimit:
desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
ingame: ingame:
# This is shown in the top left corner and displays useful keybindings in # This is shown in the top left corner and displays useful keybindings in
# every situation # every situation
@ -669,6 +673,5 @@ demo:
importingGames: Importing savegames importingGames: Importing savegames
oneGameLimit: Limited to one savegame oneGameLimit: Limited to one savegame
customizeKeybindings: Customizing Keybindings customizeKeybindings: Customizing Keybindings
creatingMarkers: Create custom markers
settingNotAvailable: Not available in the demo. settingNotAvailable: Not available in the demo.

View File

@ -1 +1 @@
1.1.7 1.1.8