Commit b302136
committed
fix(ai): rank DamageSource::Target removal by the source's lethality (phase-rs#6582 class)
The phase-rs#6582 burn-lethality term in removal_lethality stopped the AI wasting
default-sourced burn on bodies it cannot kill, but it returned Unresolved
for DamageSource::Target damage — Self-Destruct and every "Target creature
deals X damage to ..." card. During the recipient slot of a multi-slot
selection the damage source is already committed to selected_slots, so its
power and wither/infect/deathtouch keywords are knowable. Resolving it
there lets the recipient be ranked by whether the damage actually destroys
the body instead of by raw threat value.
Changes (all in phase-ai):
- policies/context.rs: PolicyContext::first_selected_object_target() reads
the already-chosen first object target (the damage source) from the
in-flight TargetSelectionProgress (CR 120.1 + CR 120.3).
- policies/removal_lethality.rs: DamageSource::Target now resolves its
source from that leading slot (EachTarget / TriggeringSource stay
Unresolved — genuinely not resolvable from one recipient slot), and the
amount is resolved against a [source] target slice so a Power{Target}
amount reads the source's current power instead of silently 0 (CR 608.2h
+ CR 208.1). Scope boundary is explicit: a DamageSource::Target reached
from a triggered ability or the bulk MultiTargetSelection flow stays
Unresolved (source not resolvable from a single recipient slot).
- policies/tests/removal_lethality.rs: unit tests resolving a pre-chosen
power source and a pre-chosen deathtouch source.
- policies/evasion_removal_priority.rs: an end-to-end regression driving
real Self-Destruct through cast -> TargetSelection -> the registered
EvasionRemovalPriorityPolicy verdict, asserting the killable recipient
outranks the unkillable one and pinning the lethality arithmetic.
- search.rs: a confirmation test showing today's engine
targeted_exchange_verdict already rejects the turn-16 Clash of the Eikons
fight (AI 3/2 vs opponent 3/5), documenting that the fight-class "bad
play" is owned by that separate authority rather than this term.
Verification: cargo fmt clean; cargo clippy --all-targets -- -D warnings
clean; full phase-ai lib suite 1983 passed / 0 failed / 8 ignored. The
Self-Destruct e2e test was confirmed discriminating: reverting the
production change flips it to fail with the exact phase-rs#6582 misplay
(killable 2/2=0.644 < unkillable 3/3=1.38).
An independent fresh-context review-impl pass returned no HIGH/MED findings
and two LOW findings, both addressed with code: the damage-amount CR
citation corrected from 608.2c to CR 608.2h, and the coverable surface made
explicit for triggered-ability / MultiTargetSelection DamageSource::Target
cases. Comment-only, re-verified fmt/clippy/tests clean.
Note: this is scoped to recipient ranking for DamageSource::Target spells
(the precise phase-rs#6582 scope). It does not address the separate question of
whether the AI should cast a self-harming spell at all, which is handled by
engine::ai_support::targeted_exchange_verdict (phase-rs#6826) at the root-cast
gate.1 parent ed0a8e5 commit b302136
5 files changed
Lines changed: 489 additions & 16 deletions
File tree
- crates/phase-ai/src
- policies
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
135 | 167 | | |
136 | 168 | | |
137 | 169 | | |
| |||
Lines changed: 190 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
219 | | - | |
| 218 | + | |
| 219 | + | |
220 | 220 | | |
221 | 221 | | |
222 | 222 | | |
| |||
573 | 573 | | |
574 | 574 | | |
575 | 575 | | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
576 | 764 | | |
577 | 765 | | |
578 | 766 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
50 | | - | |
| 49 | + | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | 80 | | |
85 | 81 | | |
86 | 82 | | |
87 | 83 | | |
88 | 84 | | |
89 | 85 | | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
94 | 118 | | |
95 | 119 | | |
96 | 120 | | |
| |||
102 | 126 | | |
103 | 127 | | |
104 | 128 | | |
105 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
106 | 140 | | |
107 | 141 | | |
108 | 142 | | |
| |||
172 | 206 | | |
173 | 207 | | |
174 | 208 | | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
179 | 237 | | |
180 | 238 | | |
181 | 239 | | |
| |||
0 commit comments