From 3755fea0355407af88cb243a562a7c34fd81b8b1 Mon Sep 17 00:00:00 2001
From: Svante Bengtson <svante@swantzter.se>
Date: Tue, 27 Aug 2024 00:21:24 +0200
Subject: [PATCH] Add DD difficulty

---
 src/models.ts                                 |  24 +--
 src/views/scoring/ijru@4.0.0/DDDifficulty.vue | 145 ++++++++++++++++++
 src/views/scoring/ijru@4.0.0/Presentation.vue |   9 +-
 .../scoring/ijru@4.0.0/SRWHDifficulty.vue     |  83 ----------
 4 files changed, 161 insertions(+), 100 deletions(-)
 create mode 100644 src/views/scoring/ijru@4.0.0/DDDifficulty.vue
 delete mode 100644 src/views/scoring/ijru@4.0.0/SRWHDifficulty.vue

diff --git a/src/models.ts b/src/models.ts
index d466c71..4ce6f1c 100644
--- a/src/models.ts
+++ b/src/models.ts
@@ -199,18 +199,18 @@ const models: Model[] = [
       }
     }
   },
-  // {
-  //   rulesId: ['ijru.freestyle.dd@4.0.0'],
-  //   judgeType: 'Dt',
-  //   name: 'Turner Difficulty (Double Dutch)',
-  //   component: defineAsyncComponent(async () => await import('./views/scoring/ijru@4.0.0/DDTurnerDifficulty.vue'))
-  // },
-  // {
-  //   rulesId: ['ijru.freestyle.dd@4.0.0'],
-  //   judgeType: 'Dj',
-  //   name: 'Jumper Difficulty (Double Dutch)',
-  //   component: defineAsyncComponent(async () => await import('./views/scoring/ijru@4.0.0/DDJumperDifficulty.vue'))
-  // },
+  {
+    rulesId: ['ijru.freestyle.dd@4.0.0'],
+    judgeType: 'Dt',
+    name: 'Turner Difficulty (Double Dutch)',
+    component: defineAsyncComponent(async () => await import('./views/scoring/ijru@4.0.0/DDDifficulty.vue'))
+  },
+  {
+    rulesId: ['ijru.freestyle.dd@4.0.0'],
+    judgeType: 'Dj',
+    name: 'Jumper Difficulty (Double Dutch)',
+    component: defineAsyncComponent(async () => await import('./views/scoring/ijru@4.0.0/DDDifficulty.vue'))
+  },
   {
     rulesId: ['ijru.freestyle.sr@4.0.0', 'ijru.freestyle.wh@4.0.0'],
     judgeType: ['Dp', 'Dm', 'Dr', 'Da', 'Db'],
diff --git a/src/views/scoring/ijru@4.0.0/DDDifficulty.vue b/src/views/scoring/ijru@4.0.0/DDDifficulty.vue
new file mode 100644
index 0000000..db6b113
--- /dev/null
+++ b/src/views/scoring/ijru@4.0.0/DDDifficulty.vue
@@ -0,0 +1,145 @@
+<template>
+  <main class="grid grid-cols-3 grid-rows-score">
+    <score-button
+      color="none"
+      label="Score"
+      :value="result"
+      single-row
+      class="col-span-3"
+    />
+
+    <template
+      v-for="btn in levelButtons"
+      :key="btn?.[0]"
+    >
+      <score-button
+        v-if="btn == null"
+        label=""
+        color="none"
+        disabled
+      />
+      <score-button
+        v-else
+        color="indigo"
+        :label="`Level ${btn?.[1]}`"
+        :value="tally(btn?.[0]) + tally(`${btn?.[0]}Plus`) + tally(`${btn?.[0]}Minus`)"
+        :disabled="!!scoresheet?.completedAt"
+        @click="addMark({ schema: btn?.[0] })"
+      />
+    </template>
+
+    <score-button
+      label="-"
+      color="red"
+      single-row
+      :disabled="!!scoresheet?.completedAt || modDisabled"
+      class="col-start-1 row-start-4"
+      @click="addMod('Minus')"
+    />
+    <score-button
+      v-if="hasBreaks"
+      label="Break"
+      color="orange"
+      :disabled="!!scoresheet?.completedAt"
+      :value="tally('break')"
+      class="col-start-2 row-start-4"
+      @click="addMark({ schema: 'break' })"
+    />
+    <score-button
+      label="+"
+      color="green"
+      single-row
+      :disabled="!!scoresheet?.completedAt || modDisabled"
+      class="col-start-3 row-start-4"
+      @click="addMod('Plus')"
+    />
+  </main>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import ScoreButton from '../../../components/ScoreButton.vue'
+import { useScoresheet } from '../../../hooks/scoresheet'
+
+import type { Model } from '../../../models'
+import type { PropType } from 'vue'
+
+type DiffBaseSchema = `diffL${1 | 2 | 3 | 4 | 5}`
+export type Schema = 'break' | `${DiffBaseSchema}${'Plus' | 'Minus' | ''}`
+
+defineProps({
+  model: {
+    type: Object as PropType<Model>,
+    required: true
+  }
+})
+
+const { addMark, tally, scoresheet } = useScoresheet<Schema>()
+
+const judgeType = computed(() => scoresheet.value?.judgeType)
+const hasBreaks = computed(() => judgeType.value === 'Dj')
+
+const diffMarkSchemaRegex = /^diffL\d+$/
+function isDiffBaseSchema (x: unknown): x is DiffBaseSchema {
+  return typeof x === 'string' && diffMarkSchemaRegex.test(x)
+}
+
+const modDisabled = computed(() => !isDiffBaseSchema(scoresheet.value?.marks.at(-1)?.schema ?? ''))
+
+function L (level: number): number {
+  if (level === 0) return 0
+  return Math.round(Math.pow(1.5, level) * 10) / 100
+}
+
+const levelButtons = computed((): Array<[DiffBaseSchema, number] | null> => [
+  ['diffL1', 1],
+  ['diffL5', 5],
+  ['diffL2', 2],
+
+  ['diffL3', 3],
+  null,
+  ['diffL4', 4],
+])
+
+const levels = computed(() => ([5, 4, 3, 2, 1] as const).map<Array<[Schema, number]>>(l => [
+  [`diffL${l}Plus`, l + 0.5],
+  [`diffL${l}`, l],
+  [`diffL${l}Minus`, l - 0.25],
+]).flat(1))
+
+async function addMod (type: 'Plus' | 'Minus') {
+  const prevMark = scoresheet.value?.marks.at(-1)
+  if (isDiffBaseSchema(prevMark?.schema)) {
+    await addMark({ schema: 'undo', target: prevMark.sequence  })
+    await addMark({ schema: `${prevMark.schema}${type}` })
+  }
+}
+
+const result = computed(() => {
+  let score = 0
+  if (judgeType.value === 'Dj') {
+    let numMarks = tally('break')
+    for (const [schema, level] of levels.value) {
+      score += tally(schema) * L(level)
+      numMarks += tally(schema)
+    }
+    if (score === 0) return 0
+    score /= numMarks
+  } else {
+    let remaining = 20
+    for (const [schema, level] of levels.value) {
+      const n = tally(schema)
+      if (n >= remaining) {
+        score += remaining * L(level)
+        break
+      } else {
+        score += n * L(level)
+        remaining -= n
+      }
+    }
+    if (score === 0) return 0
+    score /= 20
+  }
+  return score
+})
+</script>
diff --git a/src/views/scoring/ijru@4.0.0/Presentation.vue b/src/views/scoring/ijru@4.0.0/Presentation.vue
index 1e423ec..1682df0 100644
--- a/src/views/scoring/ijru@4.0.0/Presentation.vue
+++ b/src/views/scoring/ijru@4.0.0/Presentation.vue
@@ -222,11 +222,10 @@ const CHANGE = 1
 
 function componentScore (type: Component) {
   let score = 12
-  for (const mark of scoresheet.value?.marks ?? []) {
-    if (mark.schema === `${type}Plus`) score += CHANGE
-    else if (mark.schema === `${type}Minus`) score -= CHANGE
-    else if (mark.schema === 'miss') score -= CHANGE
-  }
+
+  score += tally(`${type}Plus`) * CHANGE
+  score -= tally(`${type}Minus`) * CHANGE
+  score -= tally('miss') * CHANGE
 
   score = Math.round(clamp(score, 0, 24))
 
diff --git a/src/views/scoring/ijru@4.0.0/SRWHDifficulty.vue b/src/views/scoring/ijru@4.0.0/SRWHDifficulty.vue
deleted file mode 100644
index 1db9b38..0000000
--- a/src/views/scoring/ijru@4.0.0/SRWHDifficulty.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <main class="grid grid-cols-3 grid-rows-score">
-    <score-button
-      color="orange"
-      label="Rep. Skill"
-      :value="tally('rep')"
-      :disabled="!!scoresheet?.completedAt"
-      single-row
-      @click="addMark({ schema: 'rep' })"
-    />
-    <score-button
-      color="none"
-      label="Score"
-      :value="result"
-      single-row
-    />
-    <score-button
-      color="orange"
-      label="Rep. Skill"
-      :value="tally('rep')"
-      :disabled="!!scoresheet?.completedAt"
-      single-row
-      @click="addMark({ schema: 'rep' })"
-    />
-
-    <score-button
-      v-for="[schema, level] in levels"
-      :key="schema"
-      :color="level < 7 ? 'green' : 'indigo'"
-      :label="`Level ${level}`"
-      :value="tally(schema)"
-      :disabled="!!scoresheet?.completedAt"
-      @click="addMark({ schema })"
-    />
-  </main>
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue'
-import ScoreButton from '../../../components/ScoreButton.vue'
-import { useScoresheet } from '../../../hooks/scoresheet'
-
-import type { Model } from '../../../models'
-import type { PropType } from 'vue'
-
-export type Schema = `diffL${'0.5' | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8}` | 'rep'
-
-defineProps({
-  model: {
-    type: Object as PropType<Model>,
-    required: true
-  }
-})
-
-const { addMark, tally, scoresheet } = useScoresheet<Schema>()
-
-function L (level: number): number {
-  if (level === 0) return 0
-  return Math.round(Math.pow(1.5, level) * 10) / 100
-}
-
-const levels = computed((): Array<[Schema, number]> => [
-  ['diffL1', 1],
-  ['diffL0.5', 0.5],
-  ['diffL4', 4],
-
-  ['diffL2', 2],
-  ['diffL7', 7],
-  ['diffL5', 5],
-
-  ['diffL3', 3],
-  ['diffL8', 8],
-  ['diffL6', 6]
-])
-
-const result = computed(() => {
-  let res = 0
-  for (const [schema, level] of levels.value) {
-    res += L(level) * tally(schema)
-  }
-  return res
-})
-</script>