fix(objects): getRangeValue ported in full -- all three RANGE-word branches

The port covered only word==YES and a bare word==LOS. Java's else branch
(GenericObject.java:2474-2545) makes an HTH power ranged via the RANGED
modifier (HKA Ranged: 150m); the LOS branch's NORMALRANGE case (:2419-2452)
converts a Line Of Sight power to cost-based range (Telepathy: 200m); plus
INCREASEDMAXRANGE's remove-recurse-multiply dance, UOO/UAA, and each branch's
exact rounding (half-up vs half-down). Parity 695/695; stateful matrix
36 -> 22 (all 14 getRangeValue cells closed); two named tests on the sink.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PrVDXgpDfQpzEGErZTLjEs

Author: pdbethke

kirby_cost/objects/base.py

@@ -1134,38 +1134,107 @@ def range_value(self) -> int:
         No Range and Damage Shield to nothing, Line Of Sight and Based On ECV
         to unlimited.
         """
-        from kirby_cost.util.rounder import round_half_up
+        from kirby_cost.util.rounder import round_half_down, round_half_up
         word = (self.range or "No").strip().upper()
         mods = self.all_assigned_modifiers
 
         def has(xmlid):
             return GenericObject.find_object_by_id(mods, xmlid) is not None
 
+        def cost_metres(round_fn):
+            # 6E: ten metres per point of TOTAL cost, before the adders that
+            # are not included in the base; 5E: five per Active Point.
+            if is_6e():
+                tot = self.total_cost
+                for ad in self.assigned_adders:
+                    if not ad.include_in_base() and not ad.custom:
+                        tot -= ad.total_cost
+                return int(round_fn(tot * 10))
+            return int(round_fn(self.active_cost * 5))
+
+        def increased_max_range():
+            """The recursive dance at GenericObject.java:2365-2382 (and its two
+            twins): remove INCREASEDMAXRANGE from the OWN list, re-derive the
+            range without it, restore, multiply by power^(levels*level_value),
+            round half DOWN. Returns None when the branch does not fire."""
+            inc = GenericObject.find_object_by_id(self.assigned_modifiers,
+                                                  "INCREASEDMAXRANGE")
+            if inc is None or inc.levels <= 0:
+                return None
+            value = float(inc.level_power) ** (inc.levels * inc.level_value)
+            if value <= 0:
+                return None
+            own = self.assigned_modifiers
+            own.remove(inc)
+            try:
+                real = self.range_value
+            finally:
+                own.append(inc)
+            return int(round_half_down(value * real))
+
+        def uoo_uaa():
+            mod = GenericObject.find_object_by_id(mods, "UOO")
+            if mod is None:
+                return None
+            opt = getattr(mod, "selected_option", None)
+            opt_id = (getattr(opt, "xmlid", "") or getattr(mod, "option_id", "") or "").upper()
+            return mod, opt_id == "UAA"
+
         ranged = word == "YES" or has("BASEDONCON")
         if ranged and (not has("MOBILE") or is_6e()):
+            # GenericObject.java:2346-2415
             if has("NORANGE") or has("DAMAGESHIELD"):
                 return 0
             if has("BOECV") and not has("NORMALRANGE"):
                 return -1
+            imr = increased_max_range()
+            if imr is not None:
+                return imr
             if has("LOS"):
                 return -1
-            total = self.total_cost
-            if is_6e():
-                for ad in self.assigned_adders:
-                    # Both halves were dead. `include_in_base` is a METHOD,
-                    # so the getattr handed back a bound method and `not` on
-                    # it was always False; and the attribute is `custom`, not
-                    # `is_custom`, so that getattr always defaulted. Nothing
-                    # was ever subtracted, and a Clairsentience with three
-                    # adders reported 500m of range where HD reports 200m.
-                    if not ad.include_in_base() and not ad.custom:
-                        total -= ad.total_cost
-                return int(round_half_up(total * 10))
-            return int(round_half_up(self.active_cost * 5))
+            ret = cost_metres(round_half_up)
+            uoo = uoo_uaa()
+            if uoo is not None:
+                _, uaa = uoo
+                if uaa:
+                    if has("LOS"):
+                        return -1
+                    if has("RANGED"):
+                        return ret
+                    return 0
+                return ret
+            return ret
         if word == "LOS" and not has("BASEDONCON") and (not has("MOBILE") or is_6e()):
+            # GenericObject.java:2419-2472: a Line Of Sight power.
             if has("DAMAGESHIELD"):
                 return 0
+            if has("NORMALRANGE"):
+                imr = increased_max_range()
+                if imr is not None:
+                    return imr
+                return cost_metres(round_half_up if is_6e() else round_half_down)
+            if has("SKINCONTACTREQUIRED"):
+                return 0
+            uoo = uoo_uaa()
+            if uoo is not None:
+                _, uaa = uoo
+                if uaa:
+                    if has("LOS"):
+                        return -1
+                    if has("RANGED"):
+                        return cost_metres(round_half_down)
+                    return 0
+                return -1
             return -1
+        # GenericObject.java:2474-2545: any other RANGE word (No, Self, HTH...)
+        # -- the RANGED (or Ranged Recombination) modifier makes it ranged.
+        if has("RANGED") or has("RANGEDRECOMBINATION"):
+            if has("BOECV") or has("LOS"):
+                return -1
+            imr = increased_max_range()
+            if imr is not None:
+                return imr
+            return cost_metres(round_half_down)
         return 0
 
     @property

tests/fixtures/included_stateful_known_gaps.json

@@ -1,26 +1,12 @@
 {
   "_comment": "SHRINK-ONLY. Cells where the engine's included() disagrees with Hero Designer's, with what each side said. Written once as the raw survey baseline (2026-08-30); every later commit may only remove entries. The target is empty.",
-  "_baseline": "304 of 9627 cells disagree (2026-08-30) (fixture regenerated after Task 4 added one state); re-seeded 236 of 9744 (2026-08-30) after the oracle tier-2 fix (Task 6 item 0); re-seeded 137 of 9744 (2026-08-30) after the raw-.target batch (Task 6 item 2, 23 overrides switched to effective_target(), plus the assigned-tier survey harness itself made to detach-then-ask like GenericObject.java:4584-4661 -- SELFONLY-on-Adjustable-Drain would otherwise regress, since it is asked about its own target while still attached) -- 100 closed across the 23 raw-target overrides + SELFONLY-on-Adjustable-Drain, 1 new: PERSISTENT-on-Resistant-Protection surfaced by the detach, the same constructor-hardcoded-duration loader follow-up as test_verify_modifiers.LOADER_DIVERGENCE); still shrink-only from here; now 36 remain (2026-08-30); loader precedence fix 2026-08-30: 107 closed, 6 new field-vs-computed cells accepted (now 36 remain)",
+  "_baseline": "304 of 9627 cells disagree (2026-08-30) (fixture regenerated after Task 4 added one state); re-seeded 236 of 9744 (2026-08-30) after the oracle tier-2 fix (Task 6 item 0); re-seeded 137 of 9744 (2026-08-30) after the raw-.target batch (Task 6 item 2, 23 overrides switched to effective_target(), plus the assigned-tier survey harness itself made to detach-then-ask like GenericObject.java:4584-4661 -- SELFONLY-on-Adjustable-Drain would otherwise regress, since it is asked about its own target while still attached) -- 100 closed across the 23 raw-target overrides + SELFONLY-on-Adjustable-Drain, 1 new: PERSISTENT-on-Resistant-Protection surfaced by the detach, the same constructor-hardcoded-duration loader follow-up as test_verify_modifiers.LOADER_DIVERGENCE); still shrink-only from here; now 22 remain (2026-08-30); loader precedence fix 2026-08-30: 107 closed, 6 new field-vs-computed cells accepted (now 36 remain)",
   "gaps": {
-    "assigned:20260830000020:LOS": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
     "assigned:20260830000135:DOUBLEENDCOST": "5E-fallback EXCLUDES/REQUIRES precedence, restated 2026-08-30 (anatomy note Follow-ups (2)): DOUBLEENDCOST/ENDRESERVEOREND are not Main6E.hdt modifiers at all (0 hits; only the 5E Main.hdt sibling declares them), so their assigned _excludes come from HDTTemplateProvider's fallback pass (hdt_provider.py:405-427) naming each other. HD's real assigned-tier ask (detached per Task 6 item 0) is allowed=True for both. A definitions-only fallback fix (clear excludes/requires/types on a fallback-sourced TemplateData in apply_template) was built and verified to close exactly this pair, but was reverted because it broke test_included_generic.py::test_requires_any_of_lists_the_options_and_is_met_by_one, whose docstring claimed MULTIPLESFX's REQUIRES was \"Main6E's only REQUIRES\" -- that claim was false: MULTIPLESFX's REQUIRES is ALSO fallback-only (5E Main.hdt has it, Main6E does not), with 0 Main6E entries and 0 HD rows in either fixture backing it, so the fix was blocked by an untested assertion, not a genuine 6E rule. The open question -- whether MULTIPLESFX's REQUIRES is real -- is settled by adding a MULTIPLESFX state to the sink and asking HD directly, not by more reading. HD state={\"active_cost\": 50.0, \"defense\": \"NORMAL\", \"does_body\": true, \"does_damage\": true, \"does_kb\": true, \"duration\": \"INSTANT\", \"end_usage\": 5, \"orig_duration\": \"INSTANT\", \"range_value\": 400, \"target\": \"DCV\"}",
     "assigned:20260830000135:ENDRESERVEOREND": "5E-fallback EXCLUDES/REQUIRES precedence, restated 2026-08-30: see the DOUBLEENDCOST cell at this same object -- identical cause and identical deferral (fix built, reverted only because it broke an untested REQUIRES assertion on MULTIPLESFX, not because MULTIPLESFX's REQUIRES is a genuine rule).",
     "template:20260830000009:TIMELIMIT": "follow-up: uses_end is a field (True) independent of end_usage (0 here) -- HD state end_usage=0 satisfies TimeLimit's END check directly; the engine's uses_end==True check (a stale/unrelated flag) trips the refusal instead. 2026-08-30 anatomy note Follow-ups (4).",
     "template:20260830000011:TIMELIMIT": "loader: duration HD=CONSTANT engine=PERSISTENT; a constructor/loader duration still beats the template here after the 2026-08-30 apply_template fix -- see Follow-ups (1)",
     "template:20260830000015:COSTSENDTOMAINTAIN:FULL": "follow-up: continuing_effect is inferred, not the HD field -- engine continuing_effect=True (inferred from duration modifiers) where HD's own field is False, which is what lets \"...do not already cost END to maintain\" apply on HD's side and not the engine's (orig_duration=INSTANT on both). 2026-08-30 anatomy note Follow-ups (4).",
-    "template:20260830000020:INCREASEDMAXRANGE": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000020:LIMITEDRANGE": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000020:LOS": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000020:MEGASCALE": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000020:NORMALRANGE": "rule: getRangeValue() port -- range_value HD=200 engine=-1; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:BEAM": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:HALFRANGEMODIFIER": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:INCREASEDMAXRANGE": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:LOS": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:MEGASCALE": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:NORANGEMODIFIER": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:RANGED:RANGED": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
-    "template:20260830000024:REDUCEDBYRANGE": "rule: getRangeValue() port -- range_value HD=150 engine=0; the engine's range for this shape differs from HD's (GenericObject.java:2342); Follow-ups (8)",
     "template:20260830000043:CUMULATIVE": "sink cost shape: active_cost HD=2.0 engine=3; defense HD=SPECIAL engine=NONE; HD costs this sink object differently from the engine -- the sink is not yet a cost fixture; Follow-ups (9)",
     "template:20260830000043:LINKED": "sink cost shape: active_cost HD=2.0 engine=3; defense HD=SPECIAL engine=NONE; HD costs this sink object differently from the engine -- the sink is not yet a cost fixture; Follow-ups (9)",
     "template:20260830000045:ARMORPIERCING": "sink cost shape: active_cost HD=0.0 engine=9.0; defense HD=SPECIAL engine=NONE; HD costs this sink object differently from the engine -- the sink is not yet a cost fixture; Follow-ups (9)",

tests/test_included_generic.py

@@ -807,3 +807,24 @@ def test_the_raw_target_batch_reads_the_modifier_aware_target():
     reason = template_modifier("RANGED").included(drain)
     assert reason == stateful_cell["reason"]
     assert reason == "Ranged cannot be applied to Self-Only Powers."
+
+
+def test_a_ranged_modifier_gives_an_hth_power_cost_based_range():
+    """RANGE is a word; an HKA says HTH, and the RANGED advantage makes it
+    ranged anyway -- GenericObject.java:2474-2545's else branch: ten metres
+    per point of total cost in 6E. HD rule, no page (the book states range
+    as 10m x Active Points/5 on 6E1 p.316; HD derives from total cost)."""
+    from tests.matrix_support import object_index, sink_hero
+    hka = next(o for o in sink_hero().powers if o.name == "HKA Ranged")
+    assert hka.range == "HTH"
+    assert hka.range_value == 150  # HD's echo for object 20260830000024
+
+
+def test_a_los_power_with_normal_range_reports_cost_based_range():
+    """Telepathy is RANGE="LOS"; the Normal Range limitation converts it to a
+    ranged power -- GenericObject.java:2419-2452: 6E, total cost x 10.
+    HD rule, no page."""
+    from tests.matrix_support import object_index, sink_hero
+    tp = next(o for o in sink_hero().powers if o.name == "Telepathy LOS")
+    assert tp.range == "LOS"
+    assert tp.range_value == 200  # HD's echo for object 20260830000020