Merge branch 'v29'

src/client/GutterAds.ts

@@ -13,7 +13,6 @@ export class GutterAds extends LitElement {
   private rightAdType: string = "standard_iab_rght1";
   private leftContainerId: string = "gutter-ad-container-left";
   private rightContainerId: string = "gutter-ad-container-right";
-  private margin: string = "10px";
 
   // Override createRenderRoot to disable shadow DOM
   createRenderRoot() {
@@ -50,6 +49,16 @@ export class GutterAds extends LitElement {
     });
   }
 
+  public close(): void {
+    try {
+      window.ramp.destroyUnits(this.leftAdType);
+      window.ramp.destroyUnits(this.rightAdType);
+      console.log("successfully destroyed gutter ads");
+    } catch (e) {
+      console.error("error destroying gutter ads", e);
+    }
+  }
+
   private loadAds(): void {
     console.log("loading ramp ads");
     // Ensure the container elements exist before loading ads
@@ -111,8 +120,8 @@ export class GutterAds extends LitElement {
     return html`
       <!-- Left Gutter Ad -->
       <div
-        class="hidden xl:flex fixed left-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] z-[100] pointer-events-auto items-center justify-center"
-        style="margin-left: ${this.margin};"
+        class="hidden xl:flex fixed transform -translate-y-1/2 w-[160px] min-h-[600px] z-[100] pointer-events-auto items-center justify-center"
+        style="left: calc(50% - 10cm - 230px); top: calc(50% + 10px);"
       >
         <div
           id="${this.leftContainerId}"
@@ -122,8 +131,8 @@ export class GutterAds extends LitElement {
 
       <!-- Right Gutter Ad -->
       <div
-        class="hidden xl:flex fixed right-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] z-[100] pointer-events-auto items-center justify-center"
-        style="margin-right: ${this.margin};"
+        class="hidden xl:flex fixed transform -translate-y-1/2 w-[160px] min-h-[600px] z-[100] pointer-events-auto items-center justify-center"
+        style="left: calc(50% + 10cm + 70px); top: calc(50% + 10px);"
       >
         <div
           id="${this.rightContainerId}"

src/client/Main.ts

@@ -850,6 +850,7 @@ class Client {
           "token-login",
           "matchmaking-modal",
           "lang-selector",
+          "gutter-ads",
         ].forEach((tag) => {
           const modal = document.querySelector(tag) as HTMLElement & {
             close?: () => void;

src/client/graphics/layers/InGameHeaderAd.ts

@@ -3,7 +3,7 @@ import { customElement } from "lit/decorators.js";
 import { GameView } from "../../../core/game/GameView";
 import { Layer } from "./Layer";
 
-const AD_SHOW_TICKS = 2 * 60 * 10; // 2 minutes
+const AD_SHOW_TICKS = 10 * 60 * 10; // 2 minutes
 const HEADER_AD_TYPE = "standard_iab_head1";
 const HEADER_AD_CONTAINER_ID = "header-ad-container";
 const TWO_XL_BREAKPOINT = 1536;
@@ -72,6 +72,12 @@ export class InGameHeaderAd extends LitElement implements Layer {
   private hideHeaderAd(): void {
     this.shouldShow = false;
     this.adLoaded = false;
+    try {
+      window.ramp.destroyUnits(HEADER_AD_TYPE);
+      console.log("successfully destroyed in game header ad");
+    } catch (e) {
+      console.error("error destroying in game header ad", e);
+    }
     this.requestUpdate();
   }
 

src/client/graphics/layers/SpawnVideoReward.ts

@@ -24,8 +24,7 @@ export class SpawnVideoAd extends LitElement implements Layer {
       window.innerWidth < 768 ||
       crazyGamesSDK.isOnCrazyGames() ||
       this.game.config().gameConfig().gameType === GameType.Singleplayer ||
-      getGamesPlayed() < 3 || // Don't show to new players
-      getGamesPlayed() % 3 !== 0 // Only show 1 in 3 times
+      getGamesPlayed() < 3 // Don't show to new players
     ) {
       return;
     }