Implement rooms (Bottomless Pool // Locker Room) #13786

oscscull · 2025-06-26T16:08:37Z

Had a go at building room card functionality. There were some difficult parts, though the name issue wasn't really that bad (it seems the existing work around for split cards is basically fine).
It seems to work.

Part of #12534

Added Bottomless Pool // Locker Room
Added Surgical Suite // Hospital Room

JayDi85

Code style looks good, but it can be fully reviewed after unit tests added to make sure it's support all rule parts (the most important part -- copy and zone changing logic, also name searching/compare).

JayDi85 · 2025-06-26T16:48:10Z

Mage/src/main/java/mage/game/permanent/Permanent.java

+
+    boolean unlockLeftHalf(Game game, Ability source);
+
+    boolean unlockRightHalf(Game game, Ability source);


Try to use "room/door" prefixes in methods and fields

JayDi85 · 2025-06-26T16:51:29Z

Mage/src/main/java/mage/game/permanent/PermanentImpl.java

+        this.leftHalfUnlocked = true;
+
+        // Fire generic door unlock event
+        game.fireEvent(new GameEvent(GameEvent.EventType.UNLOCK_DOOR, getId(), source, source.getControllerId()));


"Unlock" naming for replacement and "unlocked" naming for passed events.

JayDi85 · 2025-06-26T16:55:16Z

Mage/src/main/java/mage/game/ZonesHandler.java

@@ -378,7 +388,11 @@ private static boolean maybeRemoveFromSourceZone(ZoneChangeInfo info, Game game,
                Permanent permanent;
                if (card instanceof MeldCard) {


Meld cards are badly tested by unit tests, so it's better to write room related tests for blinks, hand/stack/battlefield copy, etc.

JayDi85 · 2025-06-26T16:57:29Z

Mage/src/main/java/mage/abilities/condition/common/RoomLeftHalfLockedCondition.java

+ * @author oscscull
+ * Checks if a Permanent's left half is LOCKED (i.e., NOT unlocked).
+ */
+public enum RoomLeftHalfLockedCondition implements Condition {


It's good to use card hint to show rooms status in popup hints, e.g. "green icon left door unlocked", "red icon right door locked", etc

JayDi85 · 2025-06-26T17:12:53Z

Mage/src/main/java/mage/cards/RoomCard.java

+        // Add abilities to remove locked door abilities - keep triggers or they won't trigger
+        if (leftAbility != null && !(leftAbility instanceof UnlockThisDoorTriggeredAbility)) {
+            Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
+                    new LoseAbilitySourceEffect(leftAbility, Duration.WhileOnBattlefield),


Well, that's smells bad. Why you need to use such workaround with lose abilities effects? Use static trigger with conditional instead.

mostly was trying to follow the word of

"709.5. Some split cards are permanent cards with a single shared type line. A shared type line on such an object represents two static abilities that function on the battlefield. These are “As long as this permanent doesn’t have the ‘left half unlocked’ designation, it doesn’t have the name, mana cost, or rules text of this object’s left half” and “As long as this permanent doesn’t have the ‘right half unlocked’ designation, it doesn’t have the name, mana cost, or rules text of this object’s right half.” These abilities, as well as which half of that permanent a characteristic is in, are part of that object’s copiable values."

So, as my understanding of the above, the room loses the ability when it's not unlocked. That approach is probably simpler though.

Sadly it doesn't work cleanly (in the way I did it) because if the ability is lost, and the ability triggers on the unlock, the code that does the unlocking (including the event dispatch) happens in the wrong order. (The unlock happens, the event is fired, then the event checks for triggers, then the permanent gets the triggered ability back and misses the event)

JayDi85 · 2025-06-26T17:21:06Z

Mage/src/main/java/mage/game/permanent/PermanentCard.java

@@ -50,7 +50,7 @@ public PermanentCard(Card card, UUID controllerId, Game game) {
            goodForBattlefield = false;
        } else if (card instanceof SplitCard) {
            // fused spells allowed (it uses main card)
-            if (card.getSpellAbility() != null && !card.getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) {
+            if (card.getSpellAbility() != null && !card.getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED) && !(card instanceof RoomCard)) {


Make sure all places with SPLIT_FUSED usage checked, same for SPLIT_LEFT and SPLIT_RIGHT:

Grath · 2025-06-26T17:26:50Z

Edge case for room names which I do not believe is handled by the current hacky workaround for name:

Play a room with one side unlocked
Play [[Opalescence]] to turn it into a creature
Give it a non-mana activated ability (such as [[Diviner's Wand]]'s {4}: Draw a Card)
[[Pithing Needle]] the name of the locked side (may or may not be possible as currently coded?)
Validate that the room can still activate the gained ability
Unlock the other side, so it gains the name of the other side
Validate that you can no longer activate the ability.

github-actions · 2025-06-26T17:27:00Z

Opalescence - (Gatherer) (Scryfall) (EDHREC)

{2}{W}{W}
Enchantment
Each other non-Aura enchantment is a creature in addition to its other types and has base power and base toughness each equal to its mana value.

Diviner's Wand - (Gatherer) (Scryfall) (EDHREC)

{3}
Kindred Artifact — Wizard Equipment
Equipped creature has "Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn" and "{4}: Draw a card."
Whenever a Wizard creature enters, you may attach this Equipment to it.
Equip {3}

Pithing Needle - (Gatherer) (Scryfall) (EDHREC)

{1}
Artifact
As this artifact enters, choose a card name.
Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.

Grath · 2025-06-26T17:32:28Z

(Also speaking of Opalescence - make sure that the mana value of the room reflects the mana value of the unlocked sides; a non-cast Room should have zero mana value and die with Opalesence in play, a half-unlocked room should have the mana value of that unlocked side, and a fully unlocked room should have the total mana value.)

JayDi85 · 2025-06-27T09:02:30Z

Also check other room cards — some of it can contain unique logic and can require additional changes to support it.

oscscull · 2025-07-03T15:07:23Z

Edge case for room names which I do not believe is handled by the current hacky workaround for name:

Play a room with one side unlocked

Play [[Opalescence]] to turn it into a creature

Give it a non-mana activated ability (such as [[Diviner's Wand]]'s {4}: Draw a Card)

[[Pithing Needle]] the name of the locked side (may or may not be possible as currently coded?)

Validate that the room can still activate the gained ability

Unlock the other side, so it gains the name of the other side

Validate that you can no longer activate the ability.

I will check these specifically. I have done a lot of changes to the code with opalescence + bile blight for local testing so that works for sure. Also testing mirage mirror and similar copy effects have a lot of edge cases. I asked the judge reddit for what happens when a room loses all its abilities + opalescence + muraganda petroglyphs but, got no definite answer.

oscscull · 2025-07-03T15:10:27Z

Thanks to all for the extensive reviews. Apologies, I've got limited time to work on this so I expect I will proceed in bursts when I get a chance. I'll address all of these and add unit tests this week if possible.

oscscull · 2025-07-03T15:11:58Z

Also check other room cards — some of it can contain unique logic and can require additional changes to support it.

this is a good point, I'll probably pull in several more to this PR.

JayDi85 · 2025-07-06T15:11:17Z

Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java

@@ -433,6 +434,15 @@ public boolean hasObjectTargetNameOrAlias(MageObject object, String nameOrAlias)
            return true;
        }

+        if (object instanceof RoomCard && object.getName().contains(" // ")) {


That's wrong. CardUtil.haveSameNames must do all the work with search.

JayDi85 · 2025-07-06T15:13:46Z

Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/RoomCardTest.java

+        checkPlayableAbility("one land", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Bottomless Pool", true);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bottomless Pool");
+        addTarget(playerA, "Grizzly Bears");
+        execute();


Must use setStrictChooseMode(true); to find miss commands in all tests. Also I recommend to use standard tests structure/format and comments:

Example with test_TriggerOnBigBoosted:

I'll follow this template - I added some tests already.
There are a lot of cases that might have issues so i'll be testing
Flicker - done
copy on stack
clone (etb)
copy (on battlefield)
a permanent that copies one room, then later copies a different room (mirage mirror)

then name related
on the stack
on the battlefield
in the graveyard (is there such an effect? I'll have to check)

before this can come out of drafts. might be more.

…over it with tests before i make this change

…ing something here?)

oscscull · 2025-07-21T16:16:12Z

Mage.Tests/src/test/java/org/mage/test/testapi/AliasesApiTest.java

@@ -56,8 +56,6 @@ public void test_NamesEquals() {
        Assert.assertTrue(CardUtil.haveSameNames(splitCard1, "Armed // Dangerous", currentGame));
        Assert.assertTrue(CardUtil.haveSameNames(splitCard1, splitCard1));
        Assert.assertFalse(CardUtil.haveSameNames(splitCard1, "Other", currentGame));
-        Assert.assertFalse(CardUtil.haveSameNames(splitCard1, "Other // Dangerous", currentGame));
-        Assert.assertFalse(CardUtil.haveSameNames(splitCard1, "Armed // Other", currentGame));
        Assert.assertFalse(CardUtil.haveSameNames(splitCard1, splitCard2));


NOTE: If this test is relevant to an actual case, I'll have to adjust my approach. I couldn't think of a scenario where it comes up. Please check and confirm!

oscscull · 2025-07-21T16:46:45Z

Edge case for room names which I do not believe is handled by the current hacky workaround for name:

Play a room with one side unlocked

Play [[Opalescence]] to turn it into a creature

Give it a non-mana activated ability (such as [[Diviner's Wand]]'s {4}: Draw a Card)

[[Pithing Needle]] the name of the locked side (may or may not be possible as currently coded?)

Validate that the room can still activate the gained ability

Unlock the other side, so it gains the name of the other side

Validate that you can no longer activate the ability.

Specifically tested this

oscscull added 9 commits June 17, 2025 12:15

get rooms entering the battlefield

b1c96aa

gets etb working properly

82f6025

mostly working, needs text and mana costs to be perfected

c69cb9c

adds mana values

1a29e7e

adds rules text hiding

d634c3c

working except on rules text

b3e4fab

adds more needed stuff

d27f3bb

finish main room features

0309c12

clean up, revert accidental formatting

63f5e29

github-actions bot added cards engine labels Jun 26, 2025

JayDi85 reviewed Jun 26, 2025

View reviewed changes

JayDi85 requested review from theelk801 June 26, 2025 17:06

JayDi85 reviewed Jun 26, 2025

View reviewed changes

oscscull added 2 commits July 4, 2025 00:26

renames

6a9ff16

Add first test, add matching code for rooms to test code

f0ec5cc

github-actions bot added the tests label Jul 6, 2025

JayDi85 reviewed Jul 6, 2025

View reviewed changes

oscscull added 3 commits July 10, 2025 01:46

expand testing, fix issues

6240446

unneeded import

8c0eb8d

fix name predicate edge case

cc87208

oscscull added 13 commits July 10, 2025 11:05

add unlock test

159825a

simplify

4db99d5

revert this. I don't know that the logic here was wrong - i need to c…

08f8452

…over it with tests before i make this change

add flicker tests

fc130c9

checkpoint up to failing test (copy not working)

947b55a

Get copy on stack working

57f304f

Add clone test

524ec0f

Test name match (stack)

f6943ca

reanimate after counter

3b32f07

on battlefield tests

53463bd

add the pithing needle example

49dbf27

Add test of changing one permanent into two rooms

7f49d1a

Don't think this is correct behaviour pinned in test. (Maybe I'm miss…

13c6f3b

…ing something here?)

oscscull marked this pull request as ready for review July 21, 2025 16:14

oscscull commented Jul 21, 2025

View reviewed changes

revert this (formatted accidentally)

8a239cb

oscscull requested a review from JayDi85 July 21, 2025 16:29

oscscull added 2 commits July 22, 2025 01:42

fix

c1db8f1

Merge remote-tracking branch 'upstream/master' into implement-rooms

52b846f

oscscull added 3 commits July 22, 2025 10:23

add subtype to halves

2aa0784

Merge remote-tracking branch 'upstream/master' into implement-rooms

75a347f

fix subtype

3d054f6


		boolean unlockLeftHalf(Game game, Ability source);

		boolean unlockRightHalf(Game game, Ability source);

		@@ -378,7 +388,11 @@ private static boolean maybeRemoveFromSourceZone(ZoneChangeInfo info, Game game,
		Permanent permanent;
		if (card instanceof MeldCard) {

Implement rooms (Bottomless Pool // Locker Room) #13786

Are you sure you want to change the base?

Implement rooms (Bottomless Pool // Locker Room) #13786

Uh oh!

Conversation

oscscull commented Jun 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JayDi85 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JayDi85 Jun 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oscscull Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Grath commented Jun 26, 2025

Uh oh!

github-actions bot commented Jun 26, 2025

Uh oh!

Grath commented Jun 26, 2025

Uh oh!

JayDi85 commented Jun 27, 2025

Uh oh!

oscscull commented Jul 3, 2025

Uh oh!

oscscull commented Jul 3, 2025

Uh oh!

oscscull commented Jul 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oscscull Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oscscull Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oscscull commented Jul 21, 2025

Uh oh!

Uh oh!

oscscull commented Jun 26, 2025 •

edited

Loading

JayDi85 Jun 26, 2025 •

edited

Loading

oscscull Jul 3, 2025 •

edited

Loading

oscscull Jul 10, 2025 •

edited

Loading

oscscull Jul 21, 2025 •

edited

Loading