fix(objects): defense computes as Java's getDefense(); frameworks are Powers; Flight delegates usesEND

defense: NND/AVLD force SPECIAL, UOO POWER, BOECV its option, BASEDONCON
NORMAL (GenericObject.java:1542-1567), over own + parent-list modifiers;
defense_ignoring() ports the getDefense(ignoreID) variant; raw orig_defense
kept for the template/document value.

is_power: a framework restored from the POWERS section is a Power in HD's
classification (Linked.java:455 asks the List itself) -- the loader now sets
it, closing LINKED-on-Multipower/VPP.

Flight.uses_end: the old override returned a private flag, bypassing the
base's computed usesEND() -- Java's Flight.usesEND() (Flight.java:41-47) is
GLIDING-in-6E-then-super. A Charges-carrying Flight claimed to use END.

Stateful matrix 12 -> 2 (only the 5E-fallback EXCLUDES decision pair
remains); parity 695/695, display 91,221, suite 1,727.

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

Author: pdbethke

kirby_cost/io/hdc_loader.py

@@ -1215,6 +1215,13 @@ def _load_powers_section(
                     fw.xmlid = "ELEMENTALCONTROL"
                 # Store the framework XML tag for round-trip serialization
                 fw._framework_tag = tag
+                # A framework restored from the POWERS section is a Power in
+                # HD's classification -- Linked.java:455 asks o.isPower() of
+                # the List itself and HD answers yes (GenericObject.java:3547
+                # returns the field the powers-section restore sets). The
+                # engine never set it, so LINKED refused a Multipower/VPP HD
+                # allows.
+                fw._is_power = True
                 # Load framework modifiers
                 for mod_elem in elem.findall("MODIFIER"):
                     mod = self._build_modifier(mod_elem, fw)

kirby_cost/objects/base.py

@@ -679,7 +679,7 @@ def apply_template(self, tmpl: "TemplateData", option_id: str = None) -> None:
         if "DEFENSE" in forced_xml:
             self.defense = tmpl.defense
         elif tmpl.defense and "DEFENSE" not in stated:
-            self.defense = tmpl.defense  # template beats the constructor, as DURATION above
+            self._defense = tmpl.defense  # template beats the constructor, as DURATION above
         # Combat facts stated by the template. These are what let a GM's house
         # rules reach the fight: kirby-cost reads the .hdt, so a campaign that
         # edits KILLING="No" on the killing attacks, or turns knockback off,
@@ -1027,13 +1027,50 @@ def orig_duration(self, value: str) -> None:
 
     @property
     def defense(self) -> str:
-        """Get the defense type."""
-        return self._defense
+        """Java's computed getDefense() (GenericObject.java:1542-1567), not
+        the raw field: BASEDONCON forces NORMAL, BOECV its option (STANDARD
+        NORMAL, else MENTAL), UOO POWER, NND and AVLD SPECIAL -- read over the
+        object's own modifiers plus its parent List's, as the Java does."""
+        return self.defense_ignoring("")
+
+    def defense_ignoring(self, ignore_id: str) -> str:
+        """getDefense(String ignoreID) (GenericObject.java:1578-1620): the
+        same computation with one modifier xmlid left out -- AVLD prices
+        itself against the defense the power would have without AVLD."""
+        ret = self._defense
+        mods = self.all_assigned_modifiers
+
+        def has(xmlid):
+            return xmlid != ignore_id and GenericObject.find_object_by_id(mods, xmlid) is not None
+
+        if has("BASEDONCON"):
+            ret = "NORMAL"
+        if has("BOECV"):
+            mod = GenericObject.find_object_by_id(mods, "BOECV")
+            opt = getattr(mod, "selected_option", None)
+            opt_id = (getattr(opt, "xmlid", "") or getattr(mod, "option_id", "") or "").upper()
+            ret = "NORMAL" if opt_id == "STANDARD" else "MENTAL"
+        if has("UOO"):
+            ret = "POWER"
+        if has("NND"):
+            ret = "SPECIAL"
+        if has("AVLD"):
+            ret = "SPECIAL"
+        return ret
 
     @defense.setter
     def defense(self, value: str) -> None:
         self._defense = value
 
+    @property
+    def orig_defense(self) -> str:
+        """The raw field -- what the template/document stated."""
+        return self._defense
+
+    @orig_defense.setter
+    def orig_defense(self, value: str) -> None:
+        self._defense = value
+
     @property
     def available_modifiers(self) -> List['Modifier']:
         """Get the available modifiers."""

kirby_cost/objects/powers/flight.py

@@ -41,11 +41,15 @@ def uses_end(self) -> bool:
         if is_6e() and GenericObject.find_object_by_id(
                 self.assigned_modifiers, "GLIDING") is not None:
             return False
-        return getattr(self, "_uses_end_flag", False)
+        # Java: `return super.usesEND()` -- the base's COMPUTED read (CHARGES
+        # forces False, COSTSEND True...), not a private flag. The old flag
+        # bypassed that computation and made a Charges-carrying Flight claim
+        # to use END.
+        return GenericObject.uses_end.fget(self)
 
     @uses_end.setter
     def uses_end(self, value: bool) -> None:
-        self._uses_end_flag = bool(value)
+        self._uses_end = bool(value)
 
     @property
     def damage_display(self) -> str:

tests/fixtures/included_stateful_known_gaps.json

@@ -1,18 +1,8 @@
 {
   "_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 12 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 2 remain (2026-08-30); loader precedence fix 2026-08-30: 107 closed, 6 new field-vs-computed cells accepted (now 36 remain)",
   "gaps": {
     "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: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)",
-    "template:20260830000045:CUMULATIVE": "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)",
-    "template:20260830000046:ARMORPIERCING": "template precedence for target/defense: defense HD=SPECIAL engine=NONE; Follow-ups (7)",
-    "template:20260830000046:CUMULATIVE": "template precedence for target/defense: defense HD=SPECIAL engine=NONE; Follow-ups (7)",
-    "template:20260830000054:LINKED": "message/verdict-only: states agree, verdicts differ -- a rule port defect; engine allowed=False 'Linked can only be applied to Powers.'  HD allowed=True ''  HD state={\"active_cost\": 1.0, \"defense\": \"NONE\", \"does_body\": false, \"does_damage\": false, \"does_kb\": false, \"duration",
-    "template:20260830000091:CANBEMISSILEDEFLECTED": "template precedence for target/defense: defense HD=SPECIAL engine=NORMAL; Follow-ups (7)",
-    "template:20260830000111:CANBEMISSILEDEFLECTED": "template precedence for target/defense: defense HD=POWER engine=NORMAL; Follow-ups (7)"
+    "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)."
   }
 }

tests/test_character_declared_template.py

@@ -71,4 +71,9 @@ def test_a_main6e_character_is_unaffected():
     assert hero.total_points == 1456.0
     flight = next((p for p in hero.powers if p.xmlid == "FLIGHT"), None)
     if flight is not None:
-        assert flight.uses_end is True
+        # This Flight carries REDUCEDEND (ZERO END): the raw field stays True,
+        # and the COMPUTED uses_end -- Java's usesEND(), GenericObject.java
+        # :4295-4328, where only HALFEND keeps END -- is False. The old
+        # `uses_end is True` assertion encoded the raw-field era.
+        assert flight.orig_uses_end is True
+        assert flight.uses_end is False