diff --git a/package.json b/package.json index 8774e693..b0347284 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "prettier-all": "prettier --write src/**/*.* && prettier --write gulp/**/*.*", "publishOnItchWindows": "butler push tmp_standalone_files/shapez.io-standalone-win32-x64 tobspr/shapezio:windows --userversion-file version", "publishOnItchLinux": "butler push tmp_standalone_files/shapez.io-standalone-linux-x64 tobspr/shapezio:linux-experimental --userversion-file version", + "publishOnItch": "yarn publishOnItchWindows && yarn publishOnItchLinux", "publishOnSteam": "cd gulp/steampipe && ./upload.bat", "publishStandalone": "yarn publishOnItch && yarn publishOnSteam", "publishWeb": "cd gulp && yarn main.deploy.prod", diff --git a/res/ui/icons/notification_upgrade.png b/res/ui/icons/notification_upgrade.png index 9d98cd90..9d778459 100644 Binary files a/res/ui/icons/notification_upgrade.png and b/res/ui/icons/notification_upgrade.png differ diff --git a/res/ui/icons/shop.png b/res/ui/icons/shop.png index 8d065ae1..29519103 100644 Binary files a/res/ui/icons/shop.png and b/res/ui/icons/shop.png differ diff --git a/src/css/ingame_hud/buildings_toolbar.scss b/src/css/ingame_hud/buildings_toolbar.scss index 13da9f99..d481407e 100644 --- a/src/css/ingame_hud/buildings_toolbar.scss +++ b/src/css/ingame_hud/buildings_toolbar.scss @@ -41,8 +41,8 @@ background: center center / 70% no-repeat; &:not(.unlocked) { - @include S(width, 30px); - opacity: 0.8; + @include S(width, 20px); + opacity: 0.15; background-image: none !important; &::before { diff --git a/src/js/core/config.js b/src/js/core/config.js index c84dee3a..b64ef640 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -83,7 +83,7 @@ export const globalConfig = { debug: { /* dev:start */ - // fastGameEnter: true, + fastGameEnter: true, // noArtificialDelays: true, // disableSavegameWrite: true, // showEntityBounds: true, @@ -93,8 +93,8 @@ export const globalConfig = { // disableZoomLimits: true, // showChunkBorders: true, // rewardsInstant: true, - allBuildingsUnlocked: true, - blueprintsNoCost: true, + // allBuildingsUnlocked: true, + // blueprintsNoCost: true, // upgradesNoCost: true, // disableUnlockDialog: true, // disableLogicTicks: true, @@ -104,7 +104,7 @@ export const globalConfig = { // enableEntityInspector: true, // testAds: true, // disableMapOverview: true, - disableTutorialHints: true, + // disableTutorialHints: true, disableUpgradeNotification: true, // instantBelts: true, // instantProcessors: true, diff --git a/src/js/game/hud/parts/keybinding_overlay.js b/src/js/game/hud/parts/keybinding_overlay.js index 013eb5f7..f83a3fda 100644 --- a/src/js/game/hud/parts/keybinding_overlay.js +++ b/src/js/game/hud/parts/keybinding_overlay.js @@ -23,10 +23,6 @@ export class HUDKeybindingOverlay extends BaseHUDPart { "ingame_HUD_KeybindingOverlay", [], ` -
${getKeycode(KEYMAPPINGS.navigation.createMarker)}
-
-
diff --git a/src/js/game/hud/parts/tutorial_hints.js b/src/js/game/hud/parts/tutorial_hints.js
index 27fd5530..25d9aa3a 100644
--- a/src/js/game/hud/parts/tutorial_hints.js
+++ b/src/js/game/hud/parts/tutorial_hints.js
@@ -55,15 +55,6 @@ export class HUDPartTutorialHints extends BaseHUDPart {
this.domAttach = new DynamicDomAttach(this.root, this.element);
this.currentShownLevel = new TrackedState(this.updateVideoUrl, this);
-
- this.root.signals.postLoadHook.add(() => {
- if (this.root.hubGoals.level === 1 && !(G_IS_DEV && globalConfig.debug.disableTutorialHints)) {
- this.root.hud.parts.dialogs.showInfo(
- T.dialogs.hintDescription.title,
- T.dialogs.hintDescription.desc
- );
- }
- });
}
updateVideoUrl(level) {
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index 28b0d45c..5cc05128 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -375,19 +375,6 @@ export class MainMenuState extends GameState {
this.moveToState("SettingsState");
}
- doStartNewGame() {
- this.app.analytics.trackUiClick("startgame");
-
- this.app.adProvider.showVideoAd().then(() => {
- const savegame = this.app.savegameMgr.createNewSavegame();
-
- this.moveToState("InGameState", {
- savegame,
- });
- this.app.analytics.trackUiClick("startgame_adcomplete");
- });
- }
-
onPlayButtonClicked() {
if (
IS_DEMO &&
@@ -399,17 +386,15 @@ export class MainMenuState extends GameState {
return;
}
- if (IS_DEMO) {
- this.app.analytics.trackUiClick("startgame_pre_show");
- const { ok } = this.dialogs.showWarning(
- T.dialogs.demoExplanation.title,
- T.dialogs.demoExplanation.desc
- );
- ok.add(() => this.doStartNewGame());
- return;
- }
+ this.app.analytics.trackUiClick("startgame");
+ this.app.adProvider.showVideoAd().then(() => {
+ const savegame = this.app.savegameMgr.createNewSavegame();
- this.doStartNewGame();
+ this.moveToState("InGameState", {
+ savegame,
+ });
+ this.app.analytics.trackUiClick("startgame_adcomplete");
+ });
}
onLeave() {
diff --git a/translations/base-en.yaml b/translations/base-en.yaml
index 84e2bd9a..d38c6ed1 100644
--- a/translations/base-en.yaml
+++ b/translations/base-en.yaml
@@ -159,10 +159,6 @@ dialogs:
title: Update available
desc: There is an update for this game available!
- demoExplanation:
- title: Notice from the Developer
- desc: I am developing this game in my free time, and I hope you enjoy it! If you do, please consider to buy the standalone version!
-
oneSavegameLimit:
title: Limited savegames
desc: You can only have one savegame at a time in the demo version. Please remove the existing one or get the standalone!