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

Fully clean Blessing & Monarch

Browse Source
This commit is contained in:
tool4EvEr
2021-08-01 09:09:35 +02:00
parent 7a615c3a7c
commit c2e4b8fab0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
View File

@@ -49,6 +49,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
game.clearCounterAddedThisTurn(); game.clearCounterAddedThisTurn();
game.resetPlayersAttackedOnNextTurn(); game.resetPlayersAttackedOnNextTurn();
game.resetPlayersAttackedOnNextTurn(); game.resetPlayersAttackedOnNextTurn();
game.setMonarch(null);
GameAction action = game.getAction(); GameAction action = game.getAction();
for (Player p: players) { for (Player p: players) {
@@ -59,6 +60,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
p.setLandsPlayedLastTurn(0); p.setLandsPlayedLastTurn(0);
p.resetCommanderStats(); p.resetCommanderStats();
p.resetCompletedDungeons(); p.resetCompletedDungeons();
p.setBlessing(false);
CardCollection newLibrary = new CardCollection(p.getCardsIn(restartZones, false)); CardCollection newLibrary = new CardCollection(p.getCardsIn(restartZones, false));
List<Card> filteredCards = null; List<Card> filteredCards = null;
@@ -111,4 +113,3 @@ public class RestartGameEffect extends SpellAbilityEffect {
return TextUtil.fastReplace(desc, "CARDNAME", sa.getHostCard().getName()); return TextUtil.fastReplace(desc, "CARDNAME", sa.getHostCard().getName());
} }
} }

10
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -3221,21 +3221,21 @@ public class Player extends GameEntity implements Comparable<Player> {
} }
public void updateKeywordCardAbilityText() { public void updateKeywordCardAbilityText() {
if(getKeywordCard() == null) if (getKeywordCard() == null)
return; return;
final PlayerZone com = getZone(ZoneType.Command); final PlayerZone com = getZone(ZoneType.Command);
keywordEffect.setText(""); keywordEffect.setText("");
keywordEffect.updateAbilityTextForView(); keywordEffect.updateAbilityTextForView();
boolean headerAdded = false; boolean headerAdded = false;
StringBuilder kw = new StringBuilder(); StringBuilder kw = new StringBuilder();
for(KeywordInterface k : keywords) { for (KeywordInterface k : keywords) {
if(!headerAdded) { if (!headerAdded) {
headerAdded = true; headerAdded = true;
kw.append(this.getName()).append(" has: \n"); kw.append(this.getName()).append(" has: \n");
} }
kw.append(k).append("\n"); kw.append(k).append("\n");
} }
if(!kw.toString().isEmpty()) { if (!kw.toString().isEmpty()) {
keywordEffect.setText(trimKeywords(kw.toString())); keywordEffect.setText(trimKeywords(kw.toString()));
keywordEffect.updateAbilityTextForView(); keywordEffect.updateAbilityTextForView();
} }
@@ -3275,7 +3275,7 @@ public class Player extends GameEntity implements Comparable<Player> {
final PlayerZone com = getZone(ZoneType.Command); final PlayerZone com = getZone(ZoneType.Command);
if(bless) { if (bless) {
blessingEffect = new Card(game.nextCardId(), null, game); blessingEffect = new Card(game.nextCardId(), null, game);
blessingEffect.setOwner(this); blessingEffect.setOwner(this);
blessingEffect.setImageKey("t:blessing"); blessingEffect.setImageKey("t:blessing");