github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Chorus of the Conclave - Fixed a problem with game copy logic (related to rollback and AI) (fixed #7195).

Browse source
This commit is contained in:
LevelX2 2020-11-24 16:07:53 +01:00
parent 3bc3ca6a50
commit 137070d523
2 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java
View file

@ -44,4 +44,58 @@ public class ChorusOfTheConclaveTest extends CardTestPlayerBase {
}
/*
Scenario: I have both Hamza, Guardian of Arashin and Chorus of the Conclave on the board, as well as a bunch of creature's with +1/+1 counters.
Hamza doesn't reduce the mana I want to pay extra with Chorus based on the amount of creatures with counters.
I'm unsure if this is due to Hamza not properly reducing additional costs, or Chorus not properly adding the cost to the creature in a way that Hamza can reduce it.
*/
@Test
public void testWithHamza() {
setStrictChooseMode(true);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
addCard(Zone.BATTLEFIELD, playerA, "Forest", 4);
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
addCard(Zone.HAND, playerA, "Mountain");
// As an additional cost to cast creature spells, you may pay any amount of mana.
// If you do, that creature enters the battlefield with that many additional +1/+1 counters on it.
addCard(Zone.BATTLEFIELD, playerA, "Chorus of the Conclave");
addCard(Zone.HAND, playerA, "Goblin Roughrider",1); // Creature {2}{R}
addCard(Zone.HAND, playerA, "Akki Drillmaster",1); // Creature {2}{R}
// This spell costs {1} less to cast for each creature you control with a +1/+1 counter on it.
// Creature spells you cast cost {1} less to cast for each creature you control with a +1/+1 counter on it.
addCard(Zone.HAND, playerA, "Hamza, Guardian of Arashin"); // {4}{G}{W}
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Roughrider");
setChoice(playerA, "Yes");
setChoice(playerA, "X=1");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Hamza, Guardian of Arashin");
setChoice(playerA, "Yes");
setChoice(playerA, "X=1");
playLand(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Mountain");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Akki Drillmaster");
setChoice(playerA, "Yes");
setChoice(playerA, "X=1");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
assertPermanentCount(playerA, "Goblin Roughrider", 1); // costs {R}{2} + {1} = 4
assertCounterCount("Goblin Roughrider", CounterType.P1P1, 1);
assertPermanentCount(playerA, "Hamza, Guardian of Arashin", 1); // costs {G}{W}{3} + {1} = 6
assertCounterCount("Hamza, Guardian of Arashin", CounterType.P1P1, 1);
assertPermanentCount(playerA, "Akki Drillmaster", 1);// costs {R} + {1} = 2
assertCounterCount("Akki Drillmaster", CounterType.P1P1, 1);
}
}

2
Mage/src/main/java/mage/game/GameState.java
View file

@ -167,6 +167,8 @@ public class GameState implements Serializable, Copyable<GameState> {
this.values.put(entry.getKey(), ((HashSet) entry.getValue()).clone());
} else if (entry.getValue() instanceof EnumSet) {
this.values.put(entry.getKey(), ((EnumSet) entry.getValue()).clone());
} else if (entry.getValue() instanceof HashMap){
this.values.put(entry.getKey(), ((HashMap) entry.getValue()).clone());
} else {
this.values.put(entry.getKey(), entry.getValue());
}