feat(studio): a slot's signal is the rule's board index, and a rule that plays nothing matches a slot that plays nothing

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Author: sp00ktober

apps/studio/src/mhfu_studio/monster/rule_game.py

@@ -34,7 +34,7 @@
 READING = "reading the game…"
 DOT = "·"
 NO_SIGNAL = -1
-"""`Slot.signal` of a rule no signal fires: a manifest of this schema has none."""
+"""`Slot.signal` of a rule no signal fires."""
 
 
 class Read(NamedTuple):
@@ -75,7 +75,7 @@ def match(brain: Brain, m: Manifest) -> dict[int, int] | str:
         s = slots.get(k)
         same = s is not None and (
             s.on == kind(rule.on)
-            and s.signal == NO_SIGNAL
+            and s.signal == (NO_SIGNAL if rule.signal is None else rule.signal)
             and s.plays == bool(rule.play)
             and s.min_frames == rule.min_frames
             and s.cooldown == rule.cooldown

apps/studio/tests/monster/test_rule_game.py

@@ -64,12 +64,32 @@ def brain(m: Manifest, fired: list[int], ticks: int = 100) -> Brain:
         CFG,
         ticks,
         tuple(
-            Slot(k, rg.kind(r.on), -1, True, r.min_frames, r.cooldown, n, UNLIMITED, 0)
+            Slot(
+                k,
+                rg.kind(r.on),
+                -1 if r.signal is None else r.signal,
+                bool(r.play),
+                r.min_frames,
+                r.cooldown,
+                n,
+                UNLIMITED,
+                0,
+            )
             for k, (r, n) in enumerate(zip(model.compile(m), fired, strict=True))
         ),
     )
 
 
+@pytest.fixture
+def ms(m: Manifest) -> Manifest:
+    """`m` and a rule on the signal roar and a rule on a tail cut that only counts."""
+    b = m.behaviour
+    b.blocks["b5"] = Block("on_signal", (260.0, 480.0), {"name": "roar"}, play=["howl"])
+    b.blocks["b6"] = Block("on_tail_cut", (260.0, 640.0), next=["b7"])
+    b.blocks["b7"] = Block("counter_add", (460.0, 640.0), {"counter": "cuts", "by": 1})
+    return m
+
+
 # ---- match ----------------------------------------------------------------------------------- #
 
 
@@ -105,6 +125,26 @@ def test_fewer_slots_than_rules_is_another_build_and_more_are_not_looked_at(m: M
     assert rg.match(replace(good, slots=(*good.slots, extra)), m) == {1: 1, 2: 2, 3: 3}
 
 
+def test_a_signal_rule_and_a_rule_that_plays_nothing_match_what_the_slots_say(
+    ms: Manifest,
+) -> None:
+    rules = model.compile(ms)
+    sig = next(k for k, r in enumerate(rules) if r.signal is not None)
+    idle = next(k for k, r in enumerate(rules) if not r.play)
+    good = brain(ms, list(range(10, 10 + len(rules))))
+    assert good.slots[sig].signal == model.signals(ms)["roar"] and not good.slots[idle].plays
+    assert rg.match(good, ms) == {k + 1: 10 + k for k in range(len(rules))}
+    for k, field, value in (
+        (sig, "signal", model.signals(ms)["roar"] + 1),
+        (sig, "signal", -1),
+        (idle, "plays", True),
+        (0, "signal", 0),
+    ):
+        slots = list(good.slots)
+        slots[k] = replace(slots[k], **{field: value})
+        assert rg.match(replace(good, slots=tuple(slots)), ms) == rg.OTHER_BUILD, (k, field)
+
+
 def test_a_changed_manifest_no_longer_matches(m: Manifest) -> None:
     good = brain(m, [1, 2, 3])
     m.behaviour.blocks["b4"].params["frames"] = 31

apps/studio/tests/monster/ui/test_marks.py

@@ -63,7 +63,17 @@ def __call__(
     ) -> rg.Read:
         self.calls.append(cfg)
         slots = tuple(
-            Slot(k, rg.kind(r.on), -1, True, r.min_frames, r.cooldown, n, UNLIMITED, 0)
+            Slot(
+                k,
+                rg.kind(r.on),
+                -1 if r.signal is None else r.signal,
+                bool(r.play),
+                r.min_frames,
+                r.cooldown,
+                n,
+                UNLIMITED,
+                0,
+            )
             for k, (r, n) in enumerate(zip(self.rules, self.fired, strict=True))
         )
         return rg.Read(CFG, Brain(CFG, self.ticks, slots))