Merge pull request #88 from jatkinson1000/lancaster

Lancaster Scoring
jatkinson1000 · Mar 25, 2024 · cd4dc92 · cd4dc92
2 parents 347e105 + 1498c3d
commit cd4dc92
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/archeryutils/handicaps/tests/test_handicaps.py b/archeryutils/handicaps/tests/test_handicaps.py
@@ -350,6 +350,8 @@ def test_different_handicap_systems(
             ("10_zone_6_ring", 7.397557278),
             ("10_zone_5_ring", 7.059965360),
             ("10_zone_5_ring_compound", 6.993772436),
+            ("11_zone", 7.574675221),
+            ("11_zone_5_ring", 7.087430458),
             ("WA_field", 4.115600784),
             ("IFAA_field", 4.265744101),
             ("IFAA_field_expert", 4.021942762),

diff --git a/archeryutils/round_data_files/Miscellaneous.json b/archeryutils/round_data_files/Miscellaneous.json
@@ -6,6 +6,23 @@
    "passes" : [{"n_arrows" : 36, "diameter" : 80, "scoring" : "10_zone", "distance" : 30, "dist_unit" : "metre"}]
   },
 
+  {"name" : "Lancaster",
+   "codename" : "lancaster",
+   "location" : "indoor",
+   "body" : "custom",
+   "passes" : [{"n_arrows" : 30, "diameter" : 40, "scoring" : "11_zone", "distance" : 18, "dist_unit" : "metre"},
+               {"n_arrows" : 30, "diameter" : 40, "scoring" : "11_zone", "distance" : 18, "dist_unit" : "metre"}
+   ]
+  },
+  {"name" : "Lancaster Triple",
+   "codename" : "lancaster_triple",
+   "location" : "indoor",
+   "body" : "custom",
+   "passes" : [{"n_arrows" : 30, "diameter" : 40, "scoring" : "11_zone_5_ring", "distance" : 18, "dist_unit" : "metre"},
+               {"n_arrows" : 30, "diameter" : 40, "scoring" : "11_zone_5_ring", "distance" : 18, "dist_unit" : "metre"}
+   ]
+  },
+
   {"name" : "252 100",
    "codename" : "c_252_100",
    "location" : "outdoor",

diff --git a/archeryutils/targets.py b/archeryutils/targets.py
@@ -16,6 +16,8 @@
     "10_zone_6_ring",
     "10_zone_5_ring",
     "10_zone_5_ring_compound",
+    "11_zone",
+    "11_zone_5_ring",
     "WA_field",
     "IFAA_field",
     "IFAA_field_expert",
@@ -381,6 +383,7 @@ def gen_face_spec(system: ScoringSystem, diameter: float) -> FaceSpec:
             "10_zone_6_ring": 4,
             "10_zone_5_ring": 5,
             "10_zone_5_ring_compound": 5,
+            "11_zone_5_ring": 5,
             "Worcester_2_ring": 3,
         }
 
@@ -396,6 +399,11 @@ def gen_face_spec(system: ScoringSystem, diameter: float) -> FaceSpec:
                 _rnd6(n * diameter / 10): 11 - n for n in range(2, 11 - missing)
             }
 
+        elif system in ("11_zone", "11_zone_5_ring"):
+            spec = {_rnd6(diameter / 20): 11} | {
+                _rnd6(n * diameter / 10): 11 - n for n in range(1, 11 - missing)
+            }
+
         elif system == "WA_field":
             spec = {_rnd6(diameter / 10): 6} | {
                 _rnd6(n * diameter / 5): 6 - n for n in range(1, 6)

diff --git a/archeryutils/tests/test_targets.py b/archeryutils/tests/test_targets.py
@@ -167,6 +167,8 @@ def test_default_location(self) -> None:
             ("10_zone_6_ring", 10),
             ("10_zone_5_ring", 10),
             ("10_zone_5_ring_compound", 10),
+            ("11_zone", 11),
+            ("11_zone_5_ring", 11),
             ("WA_field", 6),
             ("IFAA_field", 5),
             ("IFAA_field_expert", 5),
@@ -193,6 +195,8 @@ def test_max_score(
             ("10_zone_6_ring", 5),
             ("10_zone_5_ring", 6),
             ("10_zone_5_ring_compound", 6),
+            ("11_zone", 1),
+            ("11_zone_5_ring", 6),
             ("WA_field", 1),
             ("IFAA_field", 3),
             ("IFAA_field_expert", 1),
@@ -240,6 +244,23 @@ def test_min_score(
                     0.8: 1,
                 },
             ),
+            (
+                "11_zone",
+                40,
+                {
+                    0.02: 11,
+                    0.04: 10,
+                    0.08: 9,
+                    0.12: 8,
+                    0.16: 7,
+                    0.20: 6,
+                    0.24: 5,
+                    0.28: 4,
+                    0.32: 3,
+                    0.36: 2,
+                    0.40: 1,
+                },
+            ),
             (
                 "WA_field",
                 80,