sync up main

.github/workflows/bump.yml

@@ -15,7 +15,7 @@ jobs:
   bump:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.REPO_TOKEN }}
           fetch-depth: 0

.github/workflows/repo.yml

@@ -8,7 +8,7 @@ jobs:
   merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Merge main -> develop
         uses: everlytic/branch-merge@master
         with:

package.json

@@ -51,7 +51,7 @@
     "@vite-pwa/astro": "^1.1.0",
     "@zip.js/zip.js": "^2.7.69",
     "aos": "^2.3.4",
-    "astro": "^5.14.1",
+    "astro": "^5.14.3",
     "astro-remote": "^0.3.4",
     "autoprefixer": "^10.4.21",
     "bootstrap": "^5.3.7",
@@ -106,6 +106,7 @@
     "typescript": "^5.8.3",
     "typeson": "^9.0.4",
     "typeson-registry": "^11.1.1",
+    "ua-parser-js": "^2.0.6",
     "vanilla-lazyload": "^19.1.3",
     "vdf-parser": "^1.2.1",
     "vite": "^7.0.7",

public/_headers

@@ -2,7 +2,7 @@
   ! Access-Control-Allow-Origin
   Permissions-Policy: document-domain=()
   Document-Policy: js-profiling
-  Content-Security-Policy: upgrade-insecure-requests; default-src 'none'; script-src {{SRC_NONCE}} {{SCRIPT_SRC_HASHES}} 'self' 'unsafe-inline' blob: https://s-usc1b-nss-2136.firebaseio.com https://comfig-giftcards-default-rtdb.firebaseio.com https://static.cloudflareinsights.com https://ajax.cloudflare.com https://challenges.cloudflare.com; frame-src https://www.youtube-nocookie.com https://challenges.cloudflare.com https://s-usc1b-nss-2136.firebaseio.com; img-src data: https:; connect-src https: wss:; media-src blob: https:; style-src 'self' 'unsafe-inline'; style-src-elem {{SRC_NONCE}} {{STYLE_SRC_ELEM_HASHES}} 'self' 'unsafe-inline'; style-src-attr 'unsafe-inline'; manifest-src 'self'; font-src 'self'; worker-src blob: data: 'self'; form-action 'self'; frame-ancestors 'self' http: https: file:; base-uri 'none'; sandbox allow-downloads allow-forms allow-modals allow-popups allow-popups-to-escape-sandbox allow-presentation allow-same-origin allow-scripts;
+  Content-Security-Policy: upgrade-insecure-requests; default-src 'none'; script-src {{SRC_NONCE}} {{SCRIPT_SRC_HASHES}} 'self' 'unsafe-inline' blob: https://s-usc1b-nss-2136.firebaseio.com https://comfig-giftcards-default-rtdb.firebaseio.com https://static.cloudflareinsights.com https://ajax.cloudflare.com https://challenges.cloudflare.com; frame-src https://www.youtube-nocookie.com https://challenges.cloudflare.com https://s-usc1b-nss-2136.firebaseio.com; img-src data: https: blob:; connect-src https: wss:; media-src blob: https:; style-src 'self' 'unsafe-inline'; style-src-elem {{SRC_NONCE}} {{STYLE_SRC_ELEM_HASHES}} 'self' 'unsafe-inline'; style-src-attr 'unsafe-inline'; manifest-src 'self'; font-src 'self'; worker-src blob: data: 'self'; form-action 'self'; frame-ancestors 'self' http: https: file:; base-uri 'none'; sandbox allow-downloads allow-forms allow-modals allow-popups allow-popups-to-escape-sandbox allow-presentation allow-same-origin allow-scripts;
   Cross-Origin-Resource-Policy: same-origin
   Cross-Origin-Opener-Policy: same-origin
 

src/components/loaders/TC2DownloadLoader.astro

@@ -0,0 +1,44 @@
+---
+
+---
+
+<tcdownload-loader></tcdownload-loader>
+
+<script>
+  import { UAParser } from "ua-parser-js";
+  import { DeviceType } from 'ua-parser-js/enums';
+
+  class TC2DownloadLoader extends HTMLElement {
+    async connectedCallback() {
+      await new Promise(resolve => setTimeout(resolve, 0)).then(() => {
+        if (document.readyState === "loading") {
+          window.addEventListener("DOMContentLoaded", this.refreshDownloadButton.bind(this));
+        } else {
+          this.refreshDownloadButton();
+        }
+      });
+    }
+
+    refreshDownloadButton() {
+      const parser = new UAParser();
+      const device = parser.getDevice();
+      const os = parser.getOS().name;
+      let downloadLink;
+      if (device.type && !device.is(DeviceType.DESKTOP)) {
+        downloadLink = "https://github.com/mastercomfig/tc2-launcher/releases/latest";
+      } else if (os === "Windows") {
+        downloadLink = "https://github.com/mastercomfig/tc2-launcher/releases/latest/download/TC2Launcher.exe";
+      } else {
+        downloadLink = "https://github.com/mastercomfig/tc2-launcher/releases/latest";
+      }
+      const downloadBtn = document.getElementById("tc2-download-btn");
+      if (downloadBtn) {
+        downloadBtn.href = downloadLink;
+      }
+    }
+  }
+
+  if (!customElements.get("tcdownload-loader")) {
+    customElements.define("tcdownload-loader", TC2DownloadLoader);
+  }
+</script>

src/components/loaders/TC2LauncherLoader.astro

@@ -5,24 +5,34 @@
 <tclauncher-loader></tclauncher-loader>
 
 <script>
+  function refreshLauncherElements() {
+    const urlparms = new URLSearchParams(window.location.search);
+    const isLauncher = urlparms.get("launcher") === "1";
+
+    const hideForLauncher = document.querySelectorAll(".hide-launcher");
+    hideForLauncher.forEach((el) => {
+      el.style.display = isLauncher ? "none" : "";
+    });
+    const showForLauncher = document.querySelectorAll(".show-launcher");
+    showForLauncher.forEach((el) => {
+      el.style.display = isLauncher ? "" : "none";
+    });
+  }
+
   class TC2LauncherLoader extends HTMLElement {
     async connectedCallback() {
-      const urlparms = new URLSearchParams(window.location.search);
-      const isLauncher = urlparms.get("launcher") === "1";
-
-      const hideForLauncher = document.querySelectorAll(
-        '.hide-launcher',
-      );
-      hideForLauncher.forEach((el) => {
-        el.style.display = isLauncher ? "none" : "";
-      });
-      const showForLauncher = document.querySelectorAll(
-        '.show-launcher',
-      );
-      showForLauncher.forEach((el) => {
-        el.style.display = isLauncher ? "" : "none";
+      await new Promise(resolve => setTimeout(resolve, 0)).then(() => {
+        if (document.readyState === "loading") {
+          window.addEventListener("DOMContentLoaded", refreshLauncherElements);
+        } else {
+          refreshLauncherElements();
+        }
       });
     }
+
+    disconnectedCallback() {
+      window.removeEventListener("DOMContentLoaded", refreshLauncherElements);
+    }
   }
 
   if (!customElements.get("tclauncher-loader")) {

src/content.config.ts

@@ -5,7 +5,7 @@ import { defineCollection, z } from "astro:content";
 
 // 3. Define your collection(s)
 const tc2News = defineCollection({
-  loader: glob({ pattern: "**/*.md", base: "./src/posts/tc2" }),
+  loader: glob({ pattern: "**/*.{md,mdx}", base: "./src/posts/tc2" }),
   schema: z.object({
     title: z.string(),
     description: z.string(),
@@ -15,7 +15,7 @@ const tc2News = defineCollection({
   }),
 });
 const tc2Patches = defineCollection({
-  loader: glob({ pattern: "**/*.md", base: "./src/posts/tc2Patches" }),
+  loader: glob({ pattern: "**/*.{md,mdx}", base: "./src/posts/tc2Patches" }),
   schema: z.object({
     date: z.date(),
     draft: z.boolean().optional(),

src/pages/index.astro

@@ -12,9 +12,9 @@ import "highlight.js/styles/atom-one-dark.css";
 import badlandsImg from "@img/cp_badlands01.webp";
 import sunshineImg from "@img/cp_sunshine04.webp";
 import badwaterImg from "@img/pl_badwater01.webp";
-import veryLowImg from "@img/presets/very-low.webp";
+import destituteImg from "@img/presets/destitute.webp";
 import ultraImg from "@img/presets/ultra.webp";
-import veryLowHqImg from "@img/presets/very-low-hq.webp";
+import destituteHqImg from "@img/presets/destitute-hq.webp";
 import ultraHqImg from "@img/presets/ultra-hq.webp";
 import networkImg from "@img/network.webp";
 import HomePageLoader from "@components/loaders/HomePageLoader.astro";
@@ -279,7 +279,7 @@ import HomePageLoader from "@components/loaders/HomePageLoader.astro";
           <div class="col-md align-middle">
             <ImageSlider
               client:load
-              srcOne={veryLowImg.src}
+              srcOne={destituteImg.src}
               altOne="koth_sawmill low"
               srcTwo={ultraImg.src}
               altTwo="koth_sawmill ultra"
@@ -426,7 +426,7 @@ tf_item_inspect_model_spin_rate 30 // Rate at which items spin in the inspect vi
           <div class="modal-body">
             <ImageSlider
               client:load
-              srcOne={veryLowHqImg.src}
+              srcOne={destituteHqImg.src}
               altOne="koth_sawmill low"
               srcTwo={ultraHqImg.src}
               altTwo="koth_sawmill ultra"

src/pages/tc2/index.astro

@@ -7,9 +7,10 @@ import ImportHead from "@components/head/ImportHead.astro";
 import MainHead from "@components/head/MainHead.astro";
 import PreloadHead from "@components/head/PreloadHead.astro";
 import AnimateOnScroll from "@components/loaders/AnimateOnScroll.astro";
+import TC2DownloadLoader from "@components/loaders/TC2DownloadLoader.astro";
 import tfLogoImg from "@img/tc2/team-comtress-2.png";
 import lairImg from "@img/update/lair.webp";
-import quicklimeImg from "@img/update/quicklime.webp";
+import tfmapImg from "@img/update/tfmap.webp";
 import Layout from "@layouts/Layout.astro";
 import "aos/dist/aos.css";
 import { getCollection } from "astro:content";
@@ -88,6 +89,20 @@ const patches = (await getCollection("tc2Patches"))
     background-color: #157abf;
     border-color: #157abf;
   }
+  .early-access {
+    margin-top: -3rem;
+    margin-bottom: 2rem;
+    z-index: 1000;
+    font-size: 1rem;
+    font-weight: 800;
+    text-transform: uppercase;
+    letter-spacing: 0.1rem;
+  }
+  .early-access > span {
+    background-color: #bf2f15;
+    padding: 0.5rem 1rem;
+    border-radius: 4px;
+  }
   @media only screen and (min-width: 992px) {
     .update-cards .card:hover {
       transform: scale(1.15);
@@ -137,6 +152,7 @@ const patches = (await getCollection("tc2Patches"))
   <Body>
     <AdvRedirector />
     <AnimateOnScroll />
+    <TC2DownloadLoader />
     <div id="bg-video-wrapper">
       <video
         id="bg-video"
@@ -164,6 +180,7 @@ const patches = (await getCollection("tc2Patches"))
             src={tfLogoImg.src}
             alt="Team Comtress 2 logo"
           />
+          <div class="early-access"><span>EARLY ACCESS</span></div>
           <h1 class="display-3" style="letter-spacing: 0.2rem;font-weight: 600">
             "THE MOST FUN YOU CAN HAVE ONLINE"
           </h1>
@@ -172,13 +189,21 @@ const patches = (await getCollection("tc2Patches"))
           </h1>
           <hr style="margin-bottom: 2rem" />
           <a
-            href="https://mastercoms.itch.io/tc2"
+            id="tc2-download-btn"
+            href="https://github.com/mastercomfig/tc2-launcher/releases/latest"
             class="btn btn-outline-primary btn-xl"
             style="line-height:1.6rem;padding-top:1.3rem"
           >
             <strong>PLAY FOR FREE</strong><br />
-            <small style="color:#c2c2c2;font-size:1rem">DOWNLOAD ON ITCH</small>
+            <small style="color:#c2c2c2;font-size:1rem">DOWNLOAD (60MB)</small>
           </a>
+          <br /><br />
+          <div class="bg-teal rounded-1 d-inline-block px-5 py-4 d-none">
+            <h2 class="display-4">
+              Playtest status: <strong class="fw-bold">ACTIVE</strong>
+            </h2>
+            <h3 class="display-6">Go and play now!</h3>
+          </div>
         </div>
       </div>
     </section>
@@ -323,7 +348,7 @@ const patches = (await getCollection("tc2Patches"))
     </section>
     <section
       class="jumbotron jumbotron-fluid"
-      style=`background: linear-gradient(rgba(38, 50, 56, 0.4) 10%, rgba(38, 50, 56, 0.4)),url(${quicklimeImg.src});background-size: cover; background-position: center;background-position: center;min-height: 25vh`
+      style=`background: linear-gradient(rgba(38, 50, 56, 0.4) 10%, rgba(38, 50, 56, 0.4)),url(${tfmapImg.src});background-size: cover; background-position: center;background-position: center;min-height: 25vh`
     >
     </section>
     <section class="text-center container">

src/pages/tc2/launcher_feed.astro

@@ -11,7 +11,7 @@ import { getCollection } from "astro:content";
 
 const news = (await getCollection("tc2News"))
   .sort((a, b) => b.data.date.valueOf() - a.data.date.valueOf())
-  .filter((post) => !post.data.draft && !post.data.update);
+  .filter((post) => !post.data.draft && !post.data.update && !post.id.endsWith("beta"));
 
 const firstNews = news[0];
 
@@ -57,7 +57,7 @@ const allPosts = news.concat(patches).sort((a, b) => {
   <Body>
     <AdvRedirector />
 
-    <section class="bg-dark px-4 py-0">
+    <section class="container px-4 py-0">
       <div class="row gy-4 gx-0 ms-0">
         {
           allPosts.map((post) => {
@@ -81,7 +81,7 @@ const allPosts = news.concat(patches).sort((a, b) => {
                             href={
                               post.data.update
                                 ? `/updates/${post.data.update}?launcher=1`
-                                : `/news/${post.id}?launcher=1`
+                                : `/newsLauncher/${post.id}?launcher=1`
                             }
                           >
                             Read more »
@@ -144,7 +144,7 @@ const allPosts = news.concat(patches).sort((a, b) => {
                         <small class="text-muted">
                           <a
                             class="stretched-link"
-                            href={`/patches/${post.id}?launcher=1`}
+                            href={`/patchesLauncher/${post.id}?launcher=1`}
                           >
                             Read more »
                           </a>

src/pages/tc2/news/[post].astro

@@ -6,7 +6,6 @@ import BaseHead from "@components/head/BaseHead.astro";
 import ImportHead from "@components/head/ImportHead.astro";
 import MainHead from "@components/head/MainHead.astro";
 import PreloadHead from "@components/head/PreloadHead.astro";
-import TC2LauncherLoader from "@components/loaders/TC2LauncherLoader.astro";
 import tfLogoImg from "@img/tc2/team-comtress-2.png";
 import Layout from "@layouts/Layout.astro";
 import { getCollection, render } from "astro:content";
@@ -43,8 +42,7 @@ const { Content } = await render(post);
   </head>
   <Body>
     <AdvRedirector />
-    <TC2LauncherLoader />
-    <div class="text-center p-4">
+    <div class="text-center p-4 hide-launcher">
       <a href="/">
         <img
           class="img-logo-sm"

src/pages/tc2/newsLauncher/[post].astro

@@ -0,0 +1,63 @@
+---
+import AdvRedirector from "@components/AdvRedirector.astro";
+import Body from "@components/Body.astro";
+import Footer from "@components/Footer.astro";
+import BaseHead from "@components/head/BaseHead.astro";
+import ImportHead from "@components/head/ImportHead.astro";
+import MainHead from "@components/head/MainHead.astro";
+import PreloadHead from "@components/head/PreloadHead.astro";
+import Layout from "@layouts/Layout.astro";
+import { getCollection, render } from "astro:content";
+
+export async function getStaticPaths() {
+  const news = (await getCollection("tc2News")).filter(
+    (post) => !post.data.draft && !post.data.update,
+  );
+  return news.map((post) => ({
+    params: {
+      post: post.id,
+    },
+    props: { post },
+  }));
+}
+
+const { post } = Astro.props;
+const { Content } = await render(post);
+---
+
+<Layout>
+  <head>
+    <BaseHead />
+    <PreloadHead />
+    <ImportHead />
+    <MainHead
+      title=`${post.data.title} | Team Comtress 2`
+      site="Team Comtress"
+      noSite={true}
+      description={post.data.description}
+      image="https://teamcomtress.com/img/tc2/team-comtress-2.png"
+      favicon="/img/tc2/favicon.ico"
+    />
+  </head>
+  <Body>
+    <AdvRedirector />
+
+    <section class="container p-4 bg-dark mb-4">
+      <a href="/launcher_feed">
+        <span class="fas fa-angles-left fa-fw"></span> Back
+      </a>
+      <h1>{post.data.title}</h1>
+      <p class="text-muted">
+        {
+          post.data.date.toLocaleDateString("en-US", {
+            year: "numeric",
+            month: "long",
+            day: "numeric",
+            timeZone: "UTC",
+          })
+        }
+      </p>
+      <Content />
+    </section>
+  </Body>
+</Layout>