WIP small mark adjustments for ruleset version

src/views/scoring/ijru@4.0.0/DDDifficulty.vue

@@ -55,7 +55,7 @@
       single-row
       :disabled="!!scoresheet?.completedAt || modDisabled"
       class="col-start-3 row-start-4"
-      @click="addMod('Minus')"
+      @click="addMark({ schema: 'diffMinus' })"
     />
     <score-button
       v-if="hasBreaks"
@@ -72,7 +72,7 @@
       single-row
       :disabled="!!scoresheet?.completedAt || modDisabled"
       class="col-start-2 row-start-4"
-      @click="addMod('Plus')"
+      @click="addMark({ schema: 'diffPlus' })"
     />
   </main>
 </template>
@@ -86,7 +86,7 @@ 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' | ''}`
+export type Schema = 'break' | 'diffPlus' | 'diffMinus' | DiffBaseSchema
 
 defineProps({
   model: {
@@ -118,14 +118,6 @@ const levels = computed(() => ([5, 4, 3, 2, 1] as const).map<Array<[Schema, numb
   [`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') {

src/views/scoring/ijru@4.0.0/Presentation.vue

@@ -39,9 +39,9 @@
       label="Repetitive -"
       class="row-start-6"
       color="red"
-      :value="tally('varietyMinus')"
+      :value="tally('variMinus')"
       :disabled="!!scoresheet?.completedAt"
-      @click="addMark({ schema: 'varietyMinus' })"
+      @click="addMark({ schema: 'variMinus' })"
     />
 
     <score-button
@@ -75,9 +75,9 @@
     <score-button
       label="Variety +"
       class="row-start-6 col-start-3"
-      :value="tally('varietyPlus')"
+      :value="tally('variPlus')"
       :disabled="!!scoresheet?.completedAt"
-      @click="addMark({ schema: 'varietyPlus' })"
+      @click="addMark({ schema: 'variPlus' })"
     />
 
     <score-button
@@ -142,7 +142,7 @@
       class="row-start-6"
       color="red"
       :disabled="!!scoresheet?.completedAt"
-      @click="addMark({ schema: 'varietyMinusAdj' })"
+      @click="addMark({ schema: 'variMinusAdj' })"
     />
 
     <div
@@ -187,7 +187,7 @@
       label="Variety +"
       class="row-start-6 col-start-4"
       :disabled="!!scoresheet?.completedAt"
-      @click="addMark({ schema: 'varietyPlusAdj' })"
+      @click="addMark({ schema: 'variPlusAdj' })"
     />
   </main>
 </template>
@@ -200,7 +200,7 @@ import { computed, type PropType } from 'vue'
 import type { Model } from '../../../models'
 import { clamp } from '@vueuse/core'
 
-const components = ['crea', 'music', 'ent', 'form', 'variety'] as const
+const components = ['crea', 'music', 'ent', 'form', 'vari'] as const
 type Component = typeof components[number]
 
 export type Schema = 'miss' | `${Component}${'Plus' | 'Minus'}${'' | 'Adj'}`
@@ -242,7 +242,7 @@ const weights = {
   form: 0.25,
   music: 0.2,
   crea: 0.15,
-  variety: 0.15
+  vari: 0.15
 }
 
 const result = computed(() => {
@@ -251,7 +251,7 @@ const result = computed(() => {
     form: componentScore('form'),
     ent: componentScore('ent'),
     crea: componentScore('crea'),
-    variety: componentScore('variety')
+    vari: componentScore('vari')
   }
   let sum = 0