From c09dd530521fd41707f911d9cb51dbed6814e6e3 Mon Sep 17 00:00:00 2001
From: zoton2 <zoton2@gmail.com>
Date: Sat, 17 Feb 2024 09:56:26 +0100
Subject: [PATCH] Remove ESAW24 style from non-ESAW24 layout, add new layout
 16x9 variant, add code override for automation

---
 src/extension/layouts.ts                      |   8 +++++--
 src/graphics/_misc/themes/winter.theme.css    |   1 +
 .../themes/winter/OmnibarCharityLogo.png      | Bin 5099 -> 15929 bytes
 src/graphics/game-layout/esaw24-16x9-1p.vue   |  20 ++++++++++++++++++
 src/graphics/game-layout/esaw24-4x3-1p.vue    |  17 +++++++++++++++
 .../{1p-esaw24.vue => esaw24-base.vue}        |  18 +++++++++++-----
 src/graphics/game-layout/list.ts              |   7 +++---
 src/graphics/game-layout/main.ts              |  11 +++++++---
 src/graphics/omnibar/main.vue                 |   9 +++++++-
 9 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 src/graphics/game-layout/esaw24-16x9-1p.vue
 create mode 100644 src/graphics/game-layout/esaw24-4x3-1p.vue
 rename src/graphics/game-layout/{1p-esaw24.vue => esaw24-base.vue} (88%)

diff --git a/src/extension/layouts.ts b/src/extension/layouts.ts
index 00784ea7..88a059f1 100644
--- a/src/extension/layouts.ts
+++ b/src/extension/layouts.ts
@@ -99,8 +99,12 @@ sc.runDataActiveRun.on('change', (newVal, oldVal) => {
   if (newVal && layoutInit) {
     // If there's no old run or we changed to a different run, try to automatically set the layout.
     if (!oldVal || newVal.id !== oldVal.id) {
-      const layout = gameLayouts.value.available
-        .find((l) => l.code.toLowerCase() === newVal.customData.layout?.toLowerCase());
+      // Overwrite code with new ESAW24 layout if 1 player.
+      let code = (newVal.customData.layout as string | undefined)?.toLowerCase();
+      if (code?.endsWith('-1p') && !code.startsWith('ds') && !code.startsWith('3ds')) {
+        code = `esaw24-${code}`;
+      }
+      const layout = gameLayouts.value.available.find((l) => l.code.toLowerCase() === code);
       gameLayouts.value.selected = layout?.code;
       if (newVal.customData.layout && !layout) {
         nodecg().log.warn(
diff --git a/src/graphics/_misc/themes/winter.theme.css b/src/graphics/_misc/themes/winter.theme.css
index b8abb793..421aa67b 100644
--- a/src/graphics/_misc/themes/winter.theme.css
+++ b/src/graphics/_misc/themes/winter.theme.css
@@ -14,5 +14,6 @@
 
 #Omnibar #CharityLogo {
   content: url('./winter/OmnibarCharityLogo.png');
+  height: 58px;
   margin: 0 15px;
 }
diff --git a/src/graphics/_misc/themes/winter/OmnibarCharityLogo.png b/src/graphics/_misc/themes/winter/OmnibarCharityLogo.png
index dbbca2ce523a04150e593b09df99e2f903f4b9e1..02e4c8575146c7e0e11e750a60b76d97c9513f10 100644
GIT binary patch
delta 15404
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
RFAcy5YD$`l)$$+0{vQx;YybcN

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

diff --git a/src/graphics/game-layout/esaw24-16x9-1p.vue b/src/graphics/game-layout/esaw24-16x9-1p.vue
new file mode 100644
index 00000000..d493cd33
--- /dev/null
+++ b/src/graphics/game-layout/esaw24-16x9-1p.vue
@@ -0,0 +1,20 @@
+<template>
+  <layout-base
+    top="105px"
+    height="632px"
+  />
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import LayoutBase from './esaw24-base.vue';
+
+@Component({
+  components: {
+    LayoutBase,
+  },
+})
+export default class extends Vue {
+  // code
+}
+</script>
diff --git a/src/graphics/game-layout/esaw24-4x3-1p.vue b/src/graphics/game-layout/esaw24-4x3-1p.vue
new file mode 100644
index 00000000..65f1f381
--- /dev/null
+++ b/src/graphics/game-layout/esaw24-4x3-1p.vue
@@ -0,0 +1,17 @@
+<template>
+  <layout-base />
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import LayoutBase from './esaw24-base.vue';
+
+@Component({
+  components: {
+    LayoutBase,
+  },
+})
+export default class extends Vue {
+  // code
+}
+</script>
diff --git a/src/graphics/game-layout/1p-esaw24.vue b/src/graphics/game-layout/esaw24-base.vue
similarity index 88%
rename from src/graphics/game-layout/1p-esaw24.vue
rename to src/graphics/game-layout/esaw24-base.vue
index a70ff0e4..d95dce4e 100644
--- a/src/graphics/game-layout/1p-esaw24.vue
+++ b/src/graphics/game-layout/esaw24-base.vue
@@ -5,10 +5,10 @@
       id="GameCapture1"
       class="BorderLeft"
       :style="{
-        left: '796px',
-        top: '0px',
-        width: '1124px',
-        height: '843px',
+        left: left || '796px',
+        top: top || '0px',
+        width: width || '1124px',
+        height: height || '843px',
       }"
     />
 
@@ -117,7 +117,7 @@
 import { CommentatorsNew, DonationReaderNew } from '@esa-layouts/types/schemas';
 import MediaBox from '@shared/graphics/mediabox';
 import { RunDataActiveRun } from 'speedcontrol-util/types';
-import { Component, Vue } from 'vue-property-decorator';
+import { Component, Prop, Vue } from 'vue-property-decorator';
 import { State } from 'vuex-class';
 import CommentatorsReader from './components/CommentatorsReader.vue';
 import DonationBar from './components/DonationBar.vue';
@@ -140,6 +140,10 @@ import Timer from './components/Timer.vue';
   },
 })
 export default class extends Vue {
+  @Prop({ type: String, required: false }) left!: string | undefined;
+  @Prop({ type: String, required: false }) top!: string | undefined;
+  @Prop({ type: String, required: false }) width!: string | undefined;
+  @Prop({ type: String, required: false }) height!: string | undefined;
   @State('runDataActiveRun') runData!: RunDataActiveRun;
   @State readonly commentatorsNew!: CommentatorsNew;
   @State readonly donationReaderNew!: DonationReaderNew;
@@ -152,3 +156,7 @@ export default class extends Vue {
   }
 }
 </script>
+
+<style>
+  @import url('../_misc/themes/esaw24.theme.css');
+</style>
diff --git a/src/graphics/game-layout/list.ts b/src/graphics/game-layout/list.ts
index 20744c88..88ef7a53 100644
--- a/src/graphics/game-layout/list.ts
+++ b/src/graphics/game-layout/list.ts
@@ -12,7 +12,6 @@ import L_16x9_2p_Bingo from './16x9-2p-bingo.vue';
 import L_16x9_2p_HEK from './16x9-2p-hek.vue';
 import L_16x9_2p from './16x9-2p.vue';
 import L_16x9_3p from './16x9-3p.vue';
-import L_1p_ESAW24 from './1p-esaw24.vue';
 import L_2CamsOnly from './2-cams-only.vue';
 import L_3DS_1p from './3ds-1p.vue';
 import L_4x3_1p_2Cams from './4x3-1p-2cams.vue';
@@ -26,6 +25,8 @@ import L_5x2_1p from './5x2-1p.vue';
 import L_9x16_1p_2Cams from './9x16-1p-2cams.vue';
 import L_9x16_1p from './9x16-1p.vue';
 import L_DS_1p from './ds-1p.vue';
+import L_ESAW24_4x3_1p from './esaw24-4x3-1p.vue';
+import L_ESAW24_16x9_1p from './esaw24-16x9-1p.vue';
 import L_FullCam from './full-cam.vue';
 import L_GB_1p from './gb-1p.vue';
 import L_GB_2p_ExtraSpace from './gb-2p-extraspace.vue';
@@ -38,5 +39,5 @@ import L_SWCF_16x9_2p_Bingo from './swcf_16x9-2p-bingo.vue';
 import L_SWCF_16x9_4p_Bingo from './swcf_16x9-4p-bingo.vue';
 import L_Taskmaster_Timer from './taskmaster-timer.vue';
 
-export { L_16x9_1p, L_16x9_1p_2Cams, L_16x9_1p_2Cams_NoGame, L_16x9_1p_HEK, L_16x9_1p_LargeCam, L_16x9_1p_LargeCrowdCam, L_16x9_2p, L_16x9_2p_Bingo, L_16x9_2p_HEK, L_16x9_3p, L_1p_ESAW24, L_2CamsOnly, L_3DS_1p, L_4x3_1p, L_4x3_1p_2Cams, L_4x3_2p, L_4x3_2p_ExtraMiddleSpace, L_4x3_2p_ExtraSpace, L_4x3_3p, L_4x3_4p, L_5x2_1p, L_9x16_1p, L_9x16_1p_2Cams, L_DS_1p, L_FullCam, L_GBA_1p, L_GBA_2p, L_GB_1p, L_GB_2p_ExtraSpace, L_PokemonEmerald_MapRando, L_SM64_PSP_2p, L_SWCF_16x9_2Feeds_DancePad as L_SWCF_16x9_2Feeds_Dancepad, L_SWCF_16x9_2p_Bingo, L_SWCF_16x9_4p_Bingo, L_Taskmaster_Timer };
-export const defaultCode = '4x3-1p';
+export { L_16x9_1p, L_16x9_1p_2Cams, L_16x9_1p_2Cams_NoGame, L_16x9_1p_HEK, L_16x9_1p_LargeCam, L_16x9_1p_LargeCrowdCam, L_16x9_2p, L_16x9_2p_Bingo, L_16x9_2p_HEK, L_16x9_3p, L_2CamsOnly, L_3DS_1p, L_4x3_1p, L_4x3_1p_2Cams, L_4x3_2p, L_4x3_2p_ExtraMiddleSpace, L_4x3_2p_ExtraSpace, L_4x3_3p, L_4x3_4p, L_5x2_1p, L_9x16_1p, L_9x16_1p_2Cams, L_DS_1p, L_ESAW24_4x3_1p, L_ESAW24_16x9_1p, L_FullCam, L_GBA_1p, L_GBA_2p, L_GB_1p, L_GB_2p_ExtraSpace, L_PokemonEmerald_MapRando, L_SM64_PSP_2p, L_SWCF_16x9_2Feeds_DancePad as L_SWCF_16x9_2Feeds_Dancepad, L_SWCF_16x9_2p_Bingo, L_SWCF_16x9_4p_Bingo, L_Taskmaster_Timer };
+export const defaultCode = 'esaw24-4x3-1p';
diff --git a/src/graphics/game-layout/main.ts b/src/graphics/game-layout/main.ts
index 7871820b..ca11d94d 100644
--- a/src/graphics/game-layout/main.ts
+++ b/src/graphics/game-layout/main.ts
@@ -30,9 +30,14 @@ const routes = [
     component: List.L_SWCF_16x9_4p_Bingo,
   }, */
   {
-    name: '(ESAW24) 1 Player',
-    path: '/1p-esaw24',
-    component: List.L_1p_ESAW24,
+    name: '(ESAW24) 4:3 1 Player',
+    path: '/esaw24-4x3-1p',
+    component: List.L_ESAW24_4x3_1p,
+  },
+  {
+    name: '(ESAW24) 16:9 1 Player',
+    path: '/esaw24-16x9-1p',
+    component: List.L_ESAW24_16x9_1p,
   },
   {
     name: '4:3 1 Player',
diff --git a/src/graphics/omnibar/main.vue b/src/graphics/omnibar/main.vue
index eb5004cd..595a440e 100644
--- a/src/graphics/omnibar/main.vue
+++ b/src/graphics/omnibar/main.vue
@@ -60,6 +60,13 @@ export default class extends Vue {
   /* Used to "fix" the omnibar background colour. */
   body {
     /* Copied from ".bg--darkgrey" */
-    background: var(--colour--darkgrey);
+    background: #191919;
+  }
+
+  #Omnibar {
+    color: white;
+    /* Copied from ".bg--dimmedgradient" */
+    background: linear-gradient(90deg, rgba(115, 78, 158, 0.5) 50%,
+      rgba(208, 152, 70, 0.5) 100%);
   }
 </style>