Added valid shot by shot values to their own functions like constants.

pairshaped · Nov 17, 2023 · d5bc92f · d5bc92f
1 parent 7e754f7
commit d5bc92f
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/src/Scoring.elm b/src/Scoring.elm
@@ -110,17 +110,6 @@ type alias TeamCurler =
     }
 
 
-type TurnType
-    = Inturn
-    | Outturn
-
-
-type ThrowType
-    = Esomthing
-    | Fsomething
-    | Hsomething
-
-
 type alias RockColor =
     { pos : Int
     , key : String
@@ -138,6 +127,22 @@ type SideResult
 
 
 
+-- Define acceptable (valid) values for turns, throws, and ratings.
+
+
+validShotTurns =
+    [ "I", "O", "X" ]
+
+
+validShotThrows =
+    [ "A", "B", "C", "D", "E", "F", "G", "H", "J", "X" ]
+
+
+validShotRatings =
+    [ "0", "1", "2", "3", "4", "V", "X" ]
+
+
+
 -- DECODERS
 
 
@@ -1267,11 +1272,8 @@ update msg model =
                             formattedVal =
                                 String.toUpper val
 
-                            valids =
-                                [ "I", "O", "X" ]
-
                             validated =
-                                if List.member formattedVal valids then
+                                if List.member formattedVal validShotTurns then
                                     Just formattedVal
 
                                 else
@@ -1317,11 +1319,8 @@ update msg model =
                             formattedVal =
                                 String.toUpper val
 
-                            valids =
-                                [ "A", "B", "C", "D", "E", "F", "G", "H", "J", "X" ]
-
                             validated =
-                                if List.member formattedVal valids then
+                                if List.member formattedVal validShotThrows then
                                     Just formattedVal
 
                                 else
@@ -1368,11 +1367,8 @@ update msg model =
                             formattedVal =
                                 String.toUpper val
 
-                            valids =
-                                [ "0", "1", "2", "3", "4", "V", "X" ]
-
                             validated =
-                                if List.member formattedVal valids then
+                                if List.member formattedVal validShotRatings then
                                     Just formattedVal
 
                                 else