From a83a09946b20a5d425af8b0c9a797a1d13af23c3 Mon Sep 17 00:00:00 2001
From: TorsteinTenstad <99toten@gmail.com>
Date: Sun, 8 Oct 2023 19:41:28 +0200
Subject: [PATCH 1/2] Add RTC fast mode. Fix multiplier not being reset on
 segment selection.

---
 src/components/RtcGameInput.vue    | 48 ++++++++++++++++++++++++++++--
 src/components/RtcOptionsInput.vue | 18 ++++++++++-
 src/components/X01GameInput.vue    |  1 +
 src/games/rtc.ts                   | 18 ++++++++---
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/src/components/RtcGameInput.vue b/src/components/RtcGameInput.vue
index d46236b..3ea7f1e 100644
--- a/src/components/RtcGameInput.vue
+++ b/src/components/RtcGameInput.vue
@@ -1,14 +1,56 @@
 <template>
+  <div
+    v-if="
+      gameStore.game
+        ? getTypeAttribute < Boolean > (gameStore.game, 'fast', false)
+        : false
+    "
+    div
+    class="row"
+    style="justify-content: space-between"
+  >
+    <button
+      v-for="i in [1, 2, 3]"
+      @click="selectedMultiplier = i"
+      :class="{
+        selected: selectedMultiplier == i,
+      }"
+    >
+      {{ multiplierToString(i) }}
+    </button>
+  </div>
   <div class="row" style="height: 12em">
-    <button @click="emit('miss')">&#10008;</button>
-    <button @click="emit('hit')">&#10004;</button>
+    <button @click="registerMiss()">&#10008;</button>
+    <button @click="registerHit()">&#10004;</button>
   </div>
   <button @click="emit('undo')">&#x232B;</button>
 </template>
 
 <script lang="ts" setup>
+import { Segment, multiplierToString } from '@/types/game'
+import { ref } from 'vue'
+import { useGameStore } from '@/stores/game'
+import { getTypeAttribute } from '@/types/game'
+
+const gameStore = useGameStore()
+
+const selectedMultiplier = ref(1)
+
+const registerMiss = () => {
+  emit('miss')
+  selectedMultiplier.value = 1
+}
+
+const registerHit = () => {
+  emit('hit', {
+    multiplier: selectedMultiplier.value,
+    sector: -1, //probably bad
+  })
+  selectedMultiplier.value = 1
+}
+
 const emit = defineEmits<{
-  hit: []
+  hit: [segment: Segment]
   miss: []
   undo: []
 }>()
diff --git a/src/components/RtcOptionsInput.vue b/src/components/RtcOptionsInput.vue
index 51566d3..4160855 100644
--- a/src/components/RtcOptionsInput.vue
+++ b/src/components/RtcOptionsInput.vue
@@ -27,12 +27,27 @@
       Random order
     </button>
   </div>
+  <div class="row">
+    <button
+      :class="{ selected: fast }"
+      :disabled="mode!=1"
+      @click="
+        () => {
+          fast = !fast
+          update()
+        }
+      "
+    >
+      Fast
+    </button>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue'
 
 const random = ref(false)
+const fast = ref(false)
 const mode = ref<1 | 2 | 3>(1)
 
 const emit = defineEmits<{
@@ -40,6 +55,7 @@ const emit = defineEmits<{
 }>()
 
 const update = () => {
-  emit('update', [`mode:${mode.value}`, `random:${random.value}`])
+  fast.value &&= mode.value==1
+  emit('update', [`mode:${mode.value}`, `random:${random.value}`, `fast:${fast.value}`])
 }
 </script>
diff --git a/src/components/X01GameInput.vue b/src/components/X01GameInput.vue
index 75c7773..02ed247 100644
--- a/src/components/X01GameInput.vue
+++ b/src/components/X01GameInput.vue
@@ -64,6 +64,7 @@ const selectSector = (sector: number) => {
       sector: sector,
     })
   }
+  selectedMultiplier.value = 1
 }
 </script>
 
diff --git a/src/games/rtc.ts b/src/games/rtc.ts
index b5b65ba..16ff096 100644
--- a/src/games/rtc.ts
+++ b/src/games/rtc.ts
@@ -28,9 +28,13 @@ export const getRtcController = (game: Game): GameController => {
     getSegmentText(segment) {
       return segment ? `${segment.sector}` : '-'
     },
-    recordHit() {
+    recordHit(segment) {
+      console.log(getTypeAttribute<Boolean>(game, 'fast', false))
+      if (!segment) return
       gameStore.saveScore({
-        multiplier: getTypeAttribute<Multiplier>(game, 'mode', 1),
+        multiplier: getTypeAttribute<Boolean>(game, 'fast', false)
+          ? segment.multiplier
+          : getTypeAttribute<Multiplier>(game, 'mode', 1),
         sector: getCurrentSector(getVisitsOfUser(game, gameStore.userId)),
       })
     },
@@ -41,7 +45,7 @@ export const getRtcController = (game: Game): GameController => {
 }
 
 const getCurrentSector = (visits: Visit[]) => {
-  return Math.max(1, ...visits.flat().map((s) => (s ? s.sector + 1 : 0)))
+  return getRtcLegScore(visits) + 1
 }
 
 const sumNumbers = (numbers: number[]) => {
@@ -53,5 +57,11 @@ export const getRtcLegScore = (visits: Visit[]) => {
 }
 
 const getVisitScore = (visit: Visit) => {
-  return visit.filter((seg) => seg != null && seg.sector != 0).length
+  const gameStore = useGameStore()
+  const isFast = gameStore.game
+    ? getTypeAttribute<Boolean>(gameStore.game, 'fast', false)
+    : false
+  return sumNumbers(
+    visit.map((seg) => (seg ? (isFast ? seg.multiplier : 1) : 0))
+  )
 }

From d3935fd6f16815c71b2573de1221298fa34d9443 Mon Sep 17 00:00:00 2001
From: magnetenstad <tenstad.magne@gmail.com>
Date: Sun, 8 Oct 2023 20:24:59 +0200
Subject: [PATCH 2/2] Fix bugs in RTC modes

---
 src/components/RtcGameInput.vue    | 29 ++++++++++++++--------
 src/components/RtcOptionsInput.vue | 12 ++++++---
 src/games/rtc-random.ts            | 28 +++------------------
 src/games/rtc.ts                   | 39 ++++++++++++++----------------
 src/types/game.ts                  |  2 +-
 5 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/src/components/RtcGameInput.vue b/src/components/RtcGameInput.vue
index 3ea7f1e..347fddf 100644
--- a/src/components/RtcGameInput.vue
+++ b/src/components/RtcGameInput.vue
@@ -27,14 +27,24 @@
 </template>
 
 <script lang="ts" setup>
-import { Segment, multiplierToString } from '@/types/game'
+import { Multiplier, Segment, multiplierToString } from '@/types/game'
 import { ref } from 'vue'
 import { useGameStore } from '@/stores/game'
 import { getTypeAttribute } from '@/types/game'
+import { RtcController, getRtcLegScore } from '@/games/rtc'
 
 const gameStore = useGameStore()
 
-const selectedMultiplier = ref(1)
+const emit = defineEmits<{
+  hit: [segment: Segment]
+  miss: []
+  undo: []
+}>()
+
+const getDefaultMultiplier = () =>
+  gameStore.game ? getTypeAttribute<Multiplier>(gameStore.game, 'mode', 1) : 1
+
+const selectedMultiplier = ref(getDefaultMultiplier())
 
 const registerMiss = () => {
   emit('miss')
@@ -42,18 +52,17 @@ const registerMiss = () => {
 }
 
 const registerHit = () => {
+  if (!gameStore.game) throw Error()
+  const sequence = (gameStore.getController() as RtcController).sequence
+  const score = getRtcLegScore(gameStore.game, gameStore.getCurrentVisits)
+  const sector = sequence.at(score)
+  if (!sector) throw Error()
   emit('hit', {
     multiplier: selectedMultiplier.value,
-    sector: -1, //probably bad
+    sector,
   })
-  selectedMultiplier.value = 1
+  selectedMultiplier.value = getDefaultMultiplier()
 }
-
-const emit = defineEmits<{
-  hit: [segment: Segment]
-  miss: []
-  undo: []
-}>()
 </script>
 
 <style scoped>
diff --git a/src/components/RtcOptionsInput.vue b/src/components/RtcOptionsInput.vue
index 4160855..ce7114c 100644
--- a/src/components/RtcOptionsInput.vue
+++ b/src/components/RtcOptionsInput.vue
@@ -30,7 +30,7 @@
   <div class="row">
     <button
       :class="{ selected: fast }"
-      :disabled="mode!=1"
+      :disabled="mode != 1"
       @click="
         () => {
           fast = !fast
@@ -55,7 +55,13 @@ const emit = defineEmits<{
 }>()
 
 const update = () => {
-  fast.value &&= mode.value==1
-  emit('update', [`mode:${mode.value}`, `random:${random.value}`, `fast:${fast.value}`])
+  if (mode.value != 1) {
+    fast.value = false
+  }
+  emit('update', [
+    `mode:${mode.value}`,
+    `random:${random.value}`,
+    `fast:${fast.value}`,
+  ])
 }
 </script>
diff --git a/src/games/rtc-random.ts b/src/games/rtc-random.ts
index 6df9c39..7a52f9c 100644
--- a/src/games/rtc-random.ts
+++ b/src/games/rtc-random.ts
@@ -1,15 +1,7 @@
-import { useGameStore } from '@/stores/game'
-import {
-  Game,
-  GameController,
-  Multiplier,
-  getTypeAttribute,
-  getVisitsOfUser,
-} from '@/types/game'
-import { getRtcController, getRtcLegScore } from './rtc'
+import { Game } from '@/types/game'
+import { RtcController, getRtcController } from './rtc'
 
-export const getRtcRandomController = (game: Game): GameController => {
-  const gameStore = useGameStore()
+export const getRtcRandomController = (game: Game): RtcController => {
   const sequence = Array(20)
     .fill(undefined)
     .map((_, i) => i + 1)
@@ -17,18 +9,6 @@ export const getRtcRandomController = (game: Game): GameController => {
 
   return {
     ...getRtcController(game),
-    getUserDisplayText(userId) {
-      const score = getRtcLegScore(getVisitsOfUser(game, userId))
-      return `${sequence.at(score)}`
-    },
-    recordHit() {
-      const score = getRtcLegScore(gameStore.getCurrentVisits)
-      const sector = sequence.at(score)
-      if (!sector) return
-      gameStore.saveScore({
-        multiplier: getTypeAttribute<Multiplier>(game, 'mode', 1),
-        sector,
-      })
-    },
+    sequence,
   }
 }
diff --git a/src/games/rtc.ts b/src/games/rtc.ts
index 16ff096..42f939c 100644
--- a/src/games/rtc.ts
+++ b/src/games/rtc.ts
@@ -9,12 +9,19 @@ import {
   getTypeAttribute,
 } from '@/types/game'
 
-export const getRtcController = (game: Game): GameController => {
+export type RtcController = GameController & { sequence: number[] }
+
+export const getRtcController = (game: Game): RtcController => {
   const gameStore = useGameStore()
+  const sequence = Array(20)
+    .fill(undefined)
+    .map((_, i) => i + 1)
+
   return {
     game,
+    sequence,
     getCurrentLegScore() {
-      return getRtcLegScore(getVisitsOfUser(game, gameStore.userId))
+      return getRtcLegScore(game, getVisitsOfUser(game, gameStore.userId))
     },
     getUserResultText(userId) {
       const name = useUsersStore().getUser(userId)?.name ?? 'Unknown'
@@ -22,21 +29,14 @@ export const getRtcController = (game: Game): GameController => {
       return `${name}, ${visits?.length} visits`
     },
     getUserDisplayText(userId) {
-      const currentSector = getCurrentSector(getVisitsOfUser(game, userId))
-      return `${currentSector}`
+      const score = getRtcLegScore(game, getVisitsOfUser(game, userId))
+      return `${sequence.at(score)}`
     },
     getSegmentText(segment) {
       return segment ? `${segment.sector}` : '-'
     },
     recordHit(segment) {
-      console.log(getTypeAttribute<Boolean>(game, 'fast', false))
-      if (!segment) return
-      gameStore.saveScore({
-        multiplier: getTypeAttribute<Boolean>(game, 'fast', false)
-          ? segment.multiplier
-          : getTypeAttribute<Multiplier>(game, 'mode', 1),
-        sector: getCurrentSector(getVisitsOfUser(game, gameStore.userId)),
-      })
+      gameStore.saveScore(segment)
     },
     recordMiss() {
       gameStore.saveScore({ multiplier: Multiplier.None, sector: 0 })
@@ -44,23 +44,20 @@ export const getRtcController = (game: Game): GameController => {
   }
 }
 
-const getCurrentSector = (visits: Visit[]) => {
-  return getRtcLegScore(visits) + 1
+export const getCurrentSector = (game: Game, visits: Visit[]) => {
+  return getRtcLegScore(game, visits) + 1
 }
 
 const sumNumbers = (numbers: number[]) => {
   return numbers.reduce((prev, current) => prev + current, 0)
 }
 
-export const getRtcLegScore = (visits: Visit[]) => {
-  return sumNumbers(visits.map(getVisitScore))
+export const getRtcLegScore = (game: Game, visits: Visit[]) => {
+  return sumNumbers(visits.map((v) => getVisitScore(game, v)))
 }
 
-const getVisitScore = (visit: Visit) => {
-  const gameStore = useGameStore()
-  const isFast = gameStore.game
-    ? getTypeAttribute<Boolean>(gameStore.game, 'fast', false)
-    : false
+const getVisitScore = (game: Game, visit: Visit) => {
+  const isFast = getTypeAttribute<Boolean>(game, 'fast', false)
   return sumNumbers(
     visit.map((seg) => (seg ? (isFast ? seg.multiplier : 1) : 0))
   )
diff --git a/src/types/game.ts b/src/types/game.ts
index f1a976c..c2d6d0d 100644
--- a/src/types/game.ts
+++ b/src/types/game.ts
@@ -56,7 +56,7 @@ export interface GameController {
   getUserResultText(userId: string): string
   getUserDisplayText(userId: string): string
   getSegmentText(segment?: Segment | null): string
-  recordHit(segment?: Segment): void
+  recordHit(segment: Segment): void
   recordMiss(): void
 }