Add support for Big Run

2026-04-25 07:18:35 -05:00 · 2022-12-06 17:44:14 -08:00 · 2022-12-06 17:44:14 -08:00 · 650a886be4
commit 650a886be4
parent dc72cf13d4
20 changed files with 76 additions and 22 deletions
--- a/app/twitter/generators/SalmonRunTweet.mjs
+++ b/app/twitter/generators/SalmonRunTweet.mjs
@ -24,12 +24,13 @@ export default class SalmonRunTweet extends TweetGenerator

    let lines = [];

+    let mode = schedule.isBigRun ? 'BIG RUN' : 'Salmon Run';
    let hasMysteryWeapon = schedule.settings.weapons.some(w => w.name === 'Random');

    if (hasMysteryWeapon) {
-      lines.push(`Salmon Run is now open on ${schedule.settings.coopStage.name} with MYSTERY WEAPONS! #salmonrun #splatoon3`);
+      lines.push(`${mode} is now open on ${schedule.settings.coopStage.name} with MYSTERY WEAPONS! #salmonrun #splatoon3`);
    } else {
-      lines.push(`Salmon Run is now open on ${schedule.settings.coopStage.name}! #salmonrun #splatoon3`);
+      lines.push(`${mode} is now open on ${schedule.settings.coopStage.name}! #salmonrun #splatoon3`);
    }

    lines.push('');
--- a/src/assets/i18n/de-DE.json
+++ b/src/assets/i18n/de-DE.json
@ -34,7 +34,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Verfügbare Waffen"
+    "weapons": "Verfügbare Waffen",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Ausrüstung",
--- a/src/assets/i18n/en-GB.json
+++ b/src/assets/i18n/en-GB.json
@ -33,7 +33,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Supplied Weapons"
+    "weapons": "Supplied Weapons",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Gear",
--- a/src/assets/i18n/en-US.json
+++ b/src/assets/i18n/en-US.json
@ -34,7 +34,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Supplied Weapons"
+    "weapons": "Supplied Weapons",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Gear",
--- a/src/assets/i18n/es-ES.json
+++ b/src/assets/i18n/es-ES.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Armas asignadas"
+    "weapons": "Armas asignadas",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Equipamiento",
--- a/src/assets/i18n/es-MX.json
+++ b/src/assets/i18n/es-MX.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Armas disponibles"
+    "weapons": "Armas disponibles",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Artículos",
--- a/src/assets/i18n/fr-CA.json
+++ b/src/assets/i18n/fr-CA.json
@ -33,7 +33,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Armes fournies"
+    "weapons": "Armes fournies",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Équipement",
--- a/src/assets/i18n/fr-FR.json
+++ b/src/assets/i18n/fr-FR.json
@ -34,7 +34,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Armes fournies"
+    "weapons": "Armes fournies",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Équipement",
--- a/src/assets/i18n/it-IT.json
+++ b/src/assets/i18n/it-IT.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Armi fornite"
+    "weapons": "Armi fornite",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Oggetti",
--- a/src/assets/i18n/ja-JP.json
+++ b/src/assets/i18n/ja-JP.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "サーモンラン",
-    "weapons": "支給ブキ"
+    "weapons": "支給ブキ",
+    "bigrun": "ビッグラン"
  },
  "gear": {
    "title": "ギア",
--- a/src/assets/i18n/ko-KR.json
+++ b/src/assets/i18n/ko-KR.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "새먼 런",
-    "weapons": "지급 무기"
+    "weapons": "지급 무기",
+    "bigrun": "빅 런"
  },
  "gear": {
    "title": "기어",
--- a/src/assets/i18n/nl-NL.json
+++ b/src/assets/i18n/nl-NL.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Beschikbare wapens"
+    "weapons": "Beschikbare wapens",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Uitrusting",
--- a/src/assets/i18n/ru-RU.json
+++ b/src/assets/i18n/ru-RU.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "Salmon Run",
-    "weapons": "Табельное оружие"
+    "weapons": "Табельное оружие",
+    "bigrun": "Big Run"
  },
  "gear": {
    "title": "Снаряжение",
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@ -33,7 +33,8 @@
  },
  "salmonrun": {
    "title": "鲑鱼跑",
-    "weapons": "发放武器"
+    "weapons": "发放武器",
+    "bigrun": "大型跑"
  },
  "gear": {
    "title": "装备",
--- a/src/assets/i18n/zh-TW.json
+++ b/src/assets/i18n/zh-TW.json
@ -32,7 +32,8 @@
  },
  "salmonrun": {
    "title": "SALMON RUN",
-    "weapons": "派發武器"
+    "weapons": "派發武器",
+    "bigrun": "大型跑"
  },
  "gear": {
    "title": "裝備",
--- a/src/assets/img/modes/coop.bigrun.svg
+++ b/src/assets/img/modes/coop.bigrun.svg
@ -0,0 +1,13 @@
+<svg width="25" height="22" viewBox="0 0 25 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.4578 20.0468C16.9862 20.1576 17.6415 21.2273 17.871 21.5861C18.1005 21.9448 18.4182 21.5861 18.7641 21.3926C19.1101 21.1992 20.0331 20.0121 19.8601 19.5161C19.6872 19.0201 18.3899 18.6613 17.9575 18.6051C17.5251 18.5489 15.4578 20.0452 15.4578 20.0452V20.0468Z" fill="#B322FF"/>
+<path d="M9.42928 19.0432C9.31951 19.2962 7.75116 20.5246 6.61522 20.2038C6.1379 20.0683 5.21484 18.238 5.43771 17.7949C5.55745 17.5568 5.8535 17.5337 6.32084 17.7304C6.83642 17.947 7.34701 17.6494 7.52663 17.613C7.81103 17.5552 9.42928 19.0432 9.42928 19.0432V19.0432Z" fill="#B322FF"/>
+<path d="M1.86169 12.1307L2.15275 10.1649L3.41674 11.1354L2.54525 12.5804L1.86169 12.1307Z" fill="#B322FF"/>
+<path d="M4.77377 7.96574L3.77588 7.22835L5.17792 6.06274L5.53716 6.53229L4.77377 7.96574Z" fill="#B322FF"/>
+<path d="M5.79867 9.40076L5.06189 8.44844L6.69178 7.49115L6.95123 8.15745L5.79867 9.40076Z" fill="#B322FF"/>
+<path d="M6.00623 9.96642L7.31347 9.83084L7.33675 10.5715L6.43033 11.0775L6.00623 9.96642Z" fill="#B322FF"/>
+<path d="M24.0349 15.6043C23.3946 15.2306 22.4499 14.4965 22.3701 12.782C22.3468 12.2992 22.4399 11.0758 22.5381 9.94982C22.6695 8.44197 21.8429 8.92806 21.171 9.54806C19.7007 10.9088 20.4392 13.0317 19.882 13.7542C19.4296 14.3395 18.2388 14.7098 17.7166 13.283C17.4605 12.5836 15.6177 10.6657 14.5383 9.80433C14.4219 9.71174 14.4318 9.53153 14.5582 9.45217C14.693 9.36785 14.8493 9.26534 15.0322 9.14134C16.589 8.0832 15.8904 6.50591 15.8904 6.50591C15.6227 7.48799 14.8925 7.70624 14.1225 7.70293C14.3936 7.45989 15.606 7.07797 15.3715 5.43785C14.6813 2.7429 12.466 1.46486 12.466 1.46486C13.3109 4.20445 11.9305 4.99971 11.9305 4.99971C12.4976 2.88839 11.7957 0.808485 9.84819 0C10.9093 1.69137 10.7962 5.43123 9.32097 5.99337C9.23283 6.02644 9.1347 6.00329 9.06817 5.93716C8.66403 5.52878 8.09356 4.93854 7.33849 4.34829C6.26576 3.5117 5.26953 3.19591 4.65749 3.65885C4.33151 3.9052 3.14734 4.55331 3.09745 5.24275C3.05919 5.7834 3.5149 6.59519 4.03879 6.19343C4.65915 5.71561 5.27951 6.46292 5.89321 7.23834C6.87946 8.48331 7.00919 10.1466 7.13392 11.671C7.22872 12.8399 7.02083 14.0782 7.02083 14.0782C7.02083 14.0782 6.0379 13.3805 4.89532 13.1408C3.23549 12.7919 3.65128 12.9903 2.34736 12.3852C1.04345 11.7784 1.53075 11.4163 1.11995 10.7533C0.976923 10.5219 0.552819 10.2094 0.11042 11.2543C-0.33198 12.2992 0.611029 13.1738 1.93989 13.9096C2.96772 14.4783 6.33062 17.4014 7.64618 17.6263C8.46611 18.1901 8.51601 18.9209 10.4453 20.275C12.3995 21.6472 14.3188 20.4783 17.9461 19.0151C20.0916 18.1504 19.4579 16.7385 20.6936 16.3929C21.2425 16.2391 21.3323 16.211 22.6029 16.9732C23.3613 17.4279 24.5056 17.084 24.7783 16.8922C25.0927 16.669 25.2407 16.3036 24.0382 15.6043H24.0349ZM8.99 16.2011L9.01495 16.1284C10.9808 17.4279 14.4684 15.3546 13.1928 12.8101L13.2643 12.782C15.4514 16.0722 11.6876 18.7026 8.99 16.2011V16.2011Z" fill="#B322FF"/>
+<path d="M14.3153 11.5273C14.262 11.4281 16.2063 10.2443 16.5156 9.54987C16.5156 9.54987 17.3356 10.9453 17.585 12.7078C17.7214 13.6766 18.2686 14.5942 18.7176 14.7612C18.7176 14.7612 16.04 14.7166 14.3136 11.5289L14.3153 11.5273Z" fill="#B322FF"/>
+<path d="M9.66834 12.5886C8.44759 12.2662 7.62932 11.1849 7.78732 9.94491C7.99188 8.3329 9.44382 7.08793 11.3415 7.90303C13.3339 8.75946 12.9048 10.7931 12.4541 11.6396C12.0034 12.4861 10.7527 12.873 9.66834 12.5869V12.5886Z" fill="#CFF622"/>
+<path d="M10.3003 9.07697C9.84464 9.04555 9.49538 9.25553 9.26586 9.63745C8.92991 10.1979 9.16607 11.023 10.0392 11.3073C10.7677 11.5438 11.4812 11.023 11.4812 10.269C11.4812 9.54982 10.8342 9.115 10.2987 9.07697H10.3003Z" fill="#FF00B5"/>
+<path d="M10.5786 9.94325C10.4755 9.82586 10.3408 9.7928 10.1927 9.83082C9.97486 9.88538 9.83183 10.1417 9.97486 10.4194C10.0929 10.6509 10.3923 10.6972 10.5753 10.5153C10.7582 10.3334 10.7 10.0805 10.5786 9.94325Z" fill="#040000"/>
+</svg>
--- a/src/components/salmonrun/ExpandedSalmonRunRow.vue
+++ b/src/components/salmonrun/ExpandedSalmonRunRow.vue
@ -1,17 +1,26 @@
 <template>
  <div class="font-splatoon2 space-y-1" v-if="schedule">
-    <div>
+    <div class="flex gap-2">
      <div class="text-lg text-shadow text-zinc-200 ss:hidden">
        {{ $d(schedule.startTime, 'dateTimeShort') }}
        &ndash;
        {{ $d(schedule.endTime, 'dateTimeShort') }}
      </div>
-      <div class="text-shadow text-zinc-300 ss:hidden">
-        {{ $t('time.remaining', { time: formatDurationFromNow(schedule.endTime) }) }}
-      </div>
+
      <div class="hidden ss:block text-shadow text-white text-xl">
        {{ $t('time.remaining', { time: formatDurationHoursFromNow(schedule.endTime) }) }}
      </div>
+
+      <div
+        class="bg-zinc-800 bg-opacity-80 text-sm text-white rounded-lg px-2 border-2 border-splatoon-bigRun"
+        v-if="schedule.isBigRun">
+        <img src="@/assets/img/modes/coop.bigrun.svg" :title="$t('salmonrun.bigrun')" class="w-4 inline-block" />
+        {{ $t('salmonrun.bigrun') }}
+      </div>
+    </div>
+
+    <div class="text-shadow text-zinc-300 ss:hidden">
+      {{ $t('time.remaining', { time: formatDurationFromNow(schedule.endTime) }) }}
    </div>

    <div class="flex items-center space-x-2">
--- a/src/components/salmonrun/SalmonRunRow.vue
+++ b/src/components/salmonrun/SalmonRunRow.vue
@ -2,7 +2,8 @@
  <div class="font-splatoon2 space-y-1" v-if="schedule">
    <div class="flex items-center">
      <div>
-        <img src="@/assets/img/modes/coop.svg" class="w-6 mr-1" />
+        <img src="@/assets/img/modes/coop.bigrun.svg" :title="$t('salmonrun.bigrun')" class="w-6 mr-1" v-if="schedule.isBigRun" />
+        <img src="@/assets/img/modes/coop.svg" :title="$t('salmonrun.title')" class="w-6 mr-1" v-else />
      </div>

      <div class="flex-1 text-shadow text-zinc-200">
@ -21,6 +22,10 @@

      <div class="flex-1 text-sm text-zinc-300 text-shadow">
        {{ $t(`splatnet.stages.${schedule.settings.coopStage.id}.name`, schedule.settings.coopStage.name) }}
+
+        <span class="text-xs inline-block bg-splatoon-bigRun bg-opacity-80 text-white rounded px-2" v-if="schedule.isBigRun">
+          {{ $t('salmonrun.bigrun') }}
+        </span>
      </div>

      <div class="flex flex-col items-center space-y-1">
--- a/src/stores/schedules.mjs
+++ b/src/stores/schedules.mjs
@ -2,6 +2,7 @@ import { acceptHMRUpdate, defineStore } from "pinia";
 import { computed } from "vue";
 import { useSchedulesDataStore } from "./data.mjs";
 import { useTimeStore } from "./time.mjs";
+import sortBy from 'lodash/sortBy.js';

 // Schedule store definition (used for each type of schedule)
 function defineScheduleStore(id, options) {
@ -76,7 +77,17 @@ export const useSplatfestSchedulesStore = defineScheduleStore('splatfest', {

 // Salmon Run
 export const useSalmonRunSchedulesStore = defineScheduleStore('salmonRun', {
-  nodes: () => useSchedulesDataStore().data?.coopGroupingSchedule.regularSchedules.nodes,
+  nodes: () => {
+    const data = useSchedulesDataStore().data;
+
+    // Combine Salmon Run and Big Run schedules
+    let nodes = []
+      .concat(data?.coopGroupingSchedule.regularSchedules.nodes.map(n => ({ ...n, isBigRun: false })))
+      .concat(data?.coopGroupingSchedule.bigRunSchedules.nodes.map(n => ({ ...n, isBigRun: true })))
+      .filter(n => n);
+
+    return sortBy(nodes, 'startTime');
+  },
  settings: node => node.setting,
 });

--- a/tailwind.config.js
+++ b/tailwind.config.js
@ -25,6 +25,7 @@ module.exports = {
          },

          salmonRun: '#ff5600',
+          bigRun: '#b322ff',
        },
      },
      fontFamily: {