external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'card-fixes' into 'master'

Browse Source 
Two Topsy Turvies cancel out

See merge request core-developers/forge!4235
This commit is contained in:
Michael Kamensky
2021-03-21 05:16:39 +00:00
parent fe9284ce10 05547bfda6
commit 53b2088b33
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/Game.java
View File

@@ -435,7 +435,7 @@ public class Game {
* The Direction in which the turn order of this Game currently proceeds. * The Direction in which the turn order of this Game currently proceeds.
*/ */
public final Direction getTurnOrder() { public final Direction getTurnOrder() {
if (phaseHandler.getPlayerTurn() != null && phaseHandler.getPlayerTurn().hasKeyword("The turn order is reversed.")) { if (phaseHandler.getPlayerTurn() != null && phaseHandler.getPlayerTurn().getAmountOfKeyword("The turn order is reversed.") % 2 == 1) {
return turnOrder.getOtherDirection(); return turnOrder.getOtherDirection();
} }
return turnOrder; return turnOrder;

2
forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
View File

@@ -20,7 +20,7 @@ public class AddPhaseEffect extends SpellAbilityEffect {
@Override @Override
public void resolve(SpellAbility sa) { public void resolve(SpellAbility sa) {
boolean isTopsy = sa.getActivatingPlayer().hasKeyword("The phases of your turn are reversed."); boolean isTopsy = sa.getActivatingPlayer().getAmountOfKeyword("The phases of your turn are reversed.") % 2 == 1;
PhaseHandler phaseHandler = sa.getActivatingPlayer().getGame().getPhaseHandler(); PhaseHandler phaseHandler = sa.getActivatingPlayer().getGame().getPhaseHandler();
PhaseType currentPhase = phaseHandler.getPhase(); PhaseType currentPhase = phaseHandler.getPhase();

5
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -167,7 +167,7 @@ public class PhaseHandler implements java.io.Serializable {
private void advanceToNextPhase() { private void advanceToNextPhase() {
PhaseType oldPhase = phase; PhaseType oldPhase = phase;
boolean isTopsy = playerTurn.hasKeyword("The phases of your turn are reversed."); boolean isTopsy = playerTurn.getAmountOfKeyword("The phases of your turn are reversed.") % 2 == 1;
boolean turnEnded = false; boolean turnEnded = false;
if (bRepeatCleanup) { // for when Cleanup needs to repeat itself if (bRepeatCleanup) { // for when Cleanup needs to repeat itself
@@ -1154,7 +1154,8 @@ public class PhaseHandler implements java.io.Serializable {
} }
public final boolean devAdvanceToPhase(PhaseType targetPhase) { public final boolean devAdvanceToPhase(PhaseType targetPhase) {
while (phase.isBefore(targetPhase, playerTurn.hasKeyword("The phases of your turn are reversed."))) { boolean isTopsy = playerTurn.getAmountOfKeyword("The phases of your turn are reversed.") % 2 == 1;
while (phase.isBefore(targetPhase, isTopsy)) {
if (checkStateBasedEffects()) { if (checkStateBasedEffects()) {
return false; return false;
} }