From 56296ab88ac5ef5de17b0f6ac59809f08fe3e2fb Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sun, 26 Jun 2022 18:51:39 +0200
Subject: [PATCH] Minor adjustments

---
 src/js/core/config.js                          |  5 +----
 src/js/core/query_parameters.js                | 10 ++++++++++
 src/js/game/hud/parts/standalone_advantages.js |  6 +-----
 src/js/platform/browser/game_analytics.js      |  4 ++--
 src/js/states/main_menu.js                     |  6 +-----
 src/js/states/preload.js                       | 11 ++++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/js/core/config.js b/src/js/core/config.js
index 7c814486..3c013f1d 100644
--- a/src/js/core/config.js
+++ b/src/js/core/config.js
@@ -22,10 +22,7 @@ export const THIRDPARTY_URLS = {
     twitter: "https://twitter.com/tobspr",
     privacyPolicy: "https://tobspr.io/privacy.html",
 
-    standaloneCampaignLink:
-        G_IS_STANDALONE || true
-            ? "https://get.shapez.io/bundle/$campaign"
-            : "https://get.shapez.io/$campaign",
+    standaloneCampaignLink: "https://get.shapez.io/bundle/$campaign",
     puzzleDlcStorePage: "https://get.shapez.io/mm_puzzle_dlc?target=dlc",
 
     levelTutorialVideos: {
diff --git a/src/js/core/query_parameters.js b/src/js/core/query_parameters.js
index 5e674e71..5d145644 100644
--- a/src/js/core/query_parameters.js
+++ b/src/js/core/query_parameters.js
@@ -5,6 +5,8 @@ export let queryParamOptions = {
     embedProvider: null,
     abtVariant: null,
     campaign: null,
+    fbclid: null,
+    gclid: null,
 };
 
 if (options.embed) {
@@ -14,6 +16,14 @@ if (options.embed) {
 if (options.abtVariant) {
     queryParamOptions.abtVariant = options.abtVariant;
 }
+
+if (options.fbclid) {
+    queryParamOptions.fbclid = options.fbclid;
+}
+
+if (options.gclid) {
+    queryParamOptions.gclid = options.gclid;
+}
 if (options.utm_campaign) {
     queryParamOptions.campaign = options.utm_campaign;
 }
diff --git a/src/js/game/hud/parts/standalone_advantages.js b/src/js/game/hud/parts/standalone_advantages.js
index 3896db12..95968f64 100644
--- a/src/js/game/hud/parts/standalone_advantages.js
+++ b/src/js/game/hud/parts/standalone_advantages.js
@@ -49,11 +49,7 @@ export class HUDStandaloneAdvantages extends BaseHUDPart {
                     : ""
             }
             </button>
-            ${
-                ["1", "3"].includes(this.root.app.gameAnalytics.abtVariant)
-                    ? `<span class="specialOffer">${T.global.discountSummerSale}</span>`
-                    : ""
-            }
+            ${!G_IS_STEAM_DEMO ? `<span class="specialOffer">${T.global.discountSummerSale}</span>` : ""}
             <button class="otherCloseButton" data-btn-variant="${G_IS_STEAM_DEMO ? "steam-demo" : "prod"}">${
                 T.ingame.standaloneAdvantages.no_thanks
             }</button>
diff --git a/src/js/platform/browser/game_analytics.js b/src/js/platform/browser/game_analytics.js
index fead1e2c..ff08c1fd 100644
--- a/src/js/platform/browser/game_analytics.js
+++ b/src/js/platform/browser/game_analytics.js
@@ -36,8 +36,8 @@ const analyticsUrl = G_IS_DEV ? "http://localhost:8001" : "https://analytics.sha
 // Be sure to increment the ID whenever it changes
 const analyticsLocalFile = G_IS_STEAM_DEMO ? "shapez_token_steamdemo.bin" : "shapez_token_123.bin";
 
-const CURRENT_ABT = "abt_ssst";
-const CURRENT_ABT_COUNT = 4;
+const CURRENT_ABT = "abt_bsl2";
+const CURRENT_ABT_COUNT = 1;
 
 export class ShapezGameAnalytics extends GameAnalyticsInterface {
     constructor(app) {
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index 83a75604..2ed6b7d9 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -110,11 +110,7 @@ export class MainMenuState extends GameState {
             }
                 Play shapez on Steam
             </a>
-            ${
-                ["1", "3"].includes(this.app.gameAnalytics.abtVariant)
-                    ? `<span class="specialOffer">${T.global.discountSummerSale}</span>`
-                    : ""
-            }
+            ${!G_IS_STEAM_DEMO ? `<span class="specialOffer">${T.global.discountSummerSale}</span>` : ""}
             ${!G_IS_STEAM_DEMO ? `<div class="onlinePlayerCount"></div>` : ""}
 
         `;
diff --git a/src/js/states/preload.js b/src/js/states/preload.js
index 52f61917..c2e90cb8 100644
--- a/src/js/states/preload.js
+++ b/src/js/states/preload.js
@@ -48,11 +48,7 @@ export class PreloadState extends GameState {
 
     async fetchDiscounts() {
         // Summer sale specific
-        const bundle = ["0", "1"].includes(this.app.gameAnalytics.abtVariant);
         globalConfig.currentDiscount = 60;
-        THIRDPARTY_URLS.standaloneCampaignLink = bundle
-            ? "https://get.shapez.io/bundle/$campaign"
-            : "https://get.shapez.io/$campaign";
 
         // Regular
         // await timeoutPromise(
@@ -76,7 +72,12 @@ export class PreloadState extends GameState {
             return;
         }
         fetch(
-            "https://analytics.shapez.io/campaign/" + queryParamOptions.campaign + "?lpurl=nocontent"
+            "https://analytics.shapez.io/campaign/" +
+                queryParamOptions.campaign +
+                "?lpurl=nocontent&fbclid=" +
+                queryParamOptions.fbclid +
+                "&gclid=" +
+                queryParamOptions.gclid
         ).catch(err => {
             console.warn("Failed to send beacon:", err);
         });