From 5cd4dba54a9bbe6b67c74e1b9ca2939f618137f2 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Mon, 1 Jun 2020 19:58:36 +0200
Subject: [PATCH] Cleanup first game experience

---
 package.json                                |   1 +
 res/ui/icons/notification_upgrade.png       | Bin 2319 -> 695 bytes
 res/ui/icons/shop.png                       | Bin 2081 -> 1119 bytes
 src/css/ingame_hud/buildings_toolbar.scss   |   4 +--
 src/js/core/config.js                       |   8 ++---
 src/js/game/hud/parts/keybinding_overlay.js |   4 ---
 src/js/game/hud/parts/tutorial_hints.js     |   9 ------
 src/js/states/main_menu.js                  |  31 +++++---------------
 translations/base-en.yaml                   |   4 ---
 9 files changed, 15 insertions(+), 46 deletions(-)

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 9d98cd90b6d322b58ccd0ed895ecedfd20361084..9d7784590f55c53a6b2e166d1310b30ca99ddd32 100644
GIT binary patch
literal 695
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*`Kg63YzoDEK_Y|U|?+Zba4#vIKFg>wKsF1K<jz6
zz>ol*MT(3Ek2!s0j9RI(#548r>a7Bf8#ZnAnR)G&(UOn+H$4Av&QkNOX<+No=;H5i
zvFA2@mshs=UDdAL#`kAhm$yy5)m3;*BxVis200P_V!i{SvIlvt{kWKA(ENCrqalag
zLH7N#zU6P|kNjQtQA1y>Ih<{dv9lgu^s9|?c5i*Tyl#f^n_VhzrexPBGk0YMaPnq)
zaQ14voe+Jcb=9hs%U0!;Cf})DczVi8VVBZVI+8Kk5361FuWBp##vik)Bhjl-ib2Cr
zr!$U^`Jwxl|2=Cb@5%qup!fL+@1}hpY@@;_@ZS5!Vt%9S_5q&$c|VN1-%hi5o;hK&
z&^Ny{TXp+nTd8Tk67Q})fB1oC;N!b**@EZoxU$;wyVx_^kJEHkAG|Z4=g#I8H{$*@
zGqIjNFS_7S+wq*vRHI2QUBS^R?{YR|MNZe5d)A{xR?g?5XnOPAXGcG;HSL(3Z?^e$
z&ISi&3&oee+&ujn*zztXO){BS#;oAf75I6&|D6A83LSRmyadLPYKdz^NlIc#s#S7P
zDv)9@GB7gGH89gPFbpv?w=y-gGBnXPFt9Q(C^#Q+6-7gCeoAIqC2kFjlOALOHAsSN
t2+mI{DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMhd8i!PC{xWt~$(699`>3KReU

literal 2319
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

diff --git a/res/ui/icons/shop.png b/res/ui/icons/shop.png
index 8d065ae1c4f378b1b5617f61d14fca098efd2499..295191031fa1a15e7a9eb7df8488f1824c4772ed 100644
GIT binary patch
delta 941
zcmV;e15*5<5Z?$PiBL{Q4GJ0x0000DNk~Le0000$0000$2m}BC003aQRgocSe+B^&
zHx%K--2VUo11(8JK~!ko?N~cc6j2yGmqlZMg+*8bYwR%iD8OhGEI=D2A!?zOF&l{%
zYD8i|LTRN`CXiTYV&g9`F(hcC2BiTX*!WB&8d)A93&;wAonry6v&+n#xwG?VJjG-;
zbH8)W{l5F%xidh(5cveN87Bcee-ML#cxN~NqB{urI<904tZ=7Oo&v`XuA(sWyAU0I
z&p*sL>aoBwe=~3%rCI+=(C+8_1wSwspXt1u$_CnKgf{;S3>X?1@JoIN(}o5#C(Y=j
zZXG630+;=me{KWnF|Xc?>KQnf(|~$}5%+rjg6}B9M~|D4t+Ya`w+8wxe+~3|DPL>S
zfZ5Ghr^2aLu`4#l3taMQ{v}LW&VQ{LOYO53S`A<bRfr;nDjbHrE)S!ZPcVgXOk+x<
ztrDgeD@P3FsL5Pw5JS}3q!ddSM*`zWU^a98CRTI?xDVG*k19m-JEAIpn8p-FaZ9`s
zY{6q}_DMJw%Qz}Hgr<Pxe*s`fa1liT8b}r3Yk=~=SOIzhHP8cqUDRxCFm6L**SZa!
zV#;^<C7#h`f=!(ERsJVia*DxPe)3KJ3wIf;2Uc^~7x__cGg*=>=0nfrA4#8;4Dq(7
z^7pvOvNhRh<J{u}8n4^j9eA3*U6)_xS%nRXM>y-M{5+2-?vdQXe=*nOzq3J69spRw
zm#)aa<#uxw=^2P&OyvErPN7;XnBSHkvnyOUD->a??6%y%p}gfSS^gW4EJ79|nddvf
z8q$b}UrsX6=!!fL!U6M}G6U`uz=BC;z`gec36tp>pui7#2P+_n3ZbcHV7F`XKm?{=
z5X}v^w*sVW<_7Goe}Eax<Y&MX2H(STk>-6yS<YUrT8@3MDqm^&wlu=V%;>#*VKG``
zRL#H%DcuY^8Oj<j80Vxk=D3=Ho6^Kr8pcGV#kiqn;F$@{Fb_)O8u;8K@~Miv;GzM=
zB-?5E6^VlFhQ(O4j{Qecv|$OZvX2ql@e%fID2B!@Dmi$QM-@ECdWGOMhI$TWalBRw
zZ_a!%NHDIDJUxeCoQZXo6q}7lnLmu`a1k+#;I5c+BEQa3h6~t_3EUB?TajP*14Z#9
z^gNyElZ^)(7d9<0F;p=(IyE&qGB7JJFgh?W3J-fFlfMTV7d9<0F;p=(IyE&qGB7JJ
PFgh?Wds4%hlkf*I**~CF

delta 1911
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

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",
             [],
             `
-            <div class="binding">
-                <code class="keybinding">${getKeycode(KEYMAPPINGS.navigation.createMarker)}</code>
-                <label>${T.ingame.keybindingsOverlay.createMarker}</label>
-            </div>
 
             <div class="binding">
                 <code class="keybinding leftMouse noPlacementOnly"></code><i class="noPlacementOnly"></i>
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!