Merge remote-tracking branch 'Inkception/main' into main

src/components/salmonrun/ExpandedSalmonRunRow.vue

@@ -10,7 +10,7 @@
       </div>
 
       <div class="hidden ss:block text-shadow text-white text-xl">
-        <KingSalmonid v-if="!eggstra" :schedule="schedule" class="inline-block -mb-1 mr-2" />
+        <KingSalmonid v-if="!eggstra" :schedule="schedule" class="inline-block -mb-1 mr-2 drop-shadow-ruleIcon" />
 
         <div v-if="time.isUpcoming(schedule.startTime)" class="inline-block">
           Shift opens
@@ -31,7 +31,7 @@
     </div>
 
     <div v-if="!time.isUpcoming(schedule.startTime)" class="text-shadow text-zinc-300 ss:hidden">
-      <KingSalmonid v-if="!eggstra" :schedule="schedule" class="inline-block align-middle" />
+      <KingSalmonid v-if="!eggstra" :schedule="schedule" class="inline-block align-middle drop-shadow-ruleIcon" />
 
       {{ $t('time.remaining', { time: formatDurationFromNow(schedule.endTime) }) }}
     </div>

src/components/salmonrun/KingSalmonid.vue

@@ -12,6 +12,12 @@
       :class="size"
       :title="$t(`splatnet.bosses.${boss.id}.name`, boss.name)"
     />
+    <img
+      v-if="schedule.setting.boss.name === 'Megalodontia'"
+      src="@/assets/img/king-megalodontia.png"
+      :class="size"
+      :title="$t(`splatnet.boss.${schedule.setting.boss.id}.name`, schedule.setting.boss.name)"
+    />
   </div>
 </template>
 

src/components/salmonrun/SalmonRunRow.vue

@@ -21,7 +21,7 @@
       <StageImage class="w-1/5" img-class="rounded" :stage="schedule.settings.coopStage" hide-label />
 
       <div class="flex-1 text-sm text-zinc-300 text-shadow">
-        <KingSalmonid :schedule="schedule" class="inline-block align-middle" size="w-5" />
+        <KingSalmonid :schedule="schedule" class="inline-block align-middle drop-shadow-ruleIcon" size="w-5" />
 
         {{ $t(`splatnet.stages.${schedule.settings.coopStage.id}.name`, schedule.settings.coopStage.name) }}