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

Merge remote-tracking branch 'core/master'

Browse Source
This commit is contained in:
Anthony Calosa
2021-03-05 01:57:48 +08:00
parent e030e28d80 22a2263247
commit 317a2ed7a4
7 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
View File

@@ -223,6 +223,19 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
if (!movedCard.getZone().equals(originZone)) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard);
if (c.getMeldedWith() != null) {
Card meld = game.getCardState(c.getMeldedWith(), null);
if (meld != null) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), meld);
}
}
if (c.hasMergedCard()) {
for (final Card cm : c.getMergedCards()) {
if (cm == c) continue;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), cm);
}
}
}
}

22
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -728,16 +728,28 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
}
if (!movedCard.getZone().equals(originZone)) {
Card meld = null;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard);
if (gameCard.getMeldedWith() != null) {
meld = game.getCardState(gameCard.getMeldedWith(), null);
if (meld != null) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), meld);
}
}
if (gameCard.hasMergedCard()) {
for (final Card c : gameCard.getMergedCards()) {
if (c == gameCard) continue;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), c);
}
}
if (remember != null) {
hostCard.addRemembered(movedCard);
// addRememberedFromCardState ?
if (gameCard.getMeldedWith() != null) {
Card meld = game.getCardState(gameCard.getMeldedWith(), null);
if (meld != null) {
hostCard.addRemembered(meld);
}
if (meld != null) {
hostCard.addRemembered(meld);
}
if (gameCard.hasMergedCard()) {
for (final Card c : gameCard.getMergedCards()) {

6
forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
View File

@@ -68,8 +68,10 @@ public class RollDiceEffect extends SpellAbilityEffect {
total += roll;
}
String message = Localizer.getInstance().getMessage("lblPlayerRolledResult", player, StringUtils.join(rolls, ", "));
player.getGame().getAction().nofityOfValue(sa, player, message, null);
if (amount > 0) {
String message = Localizer.getInstance().getMessage("lblPlayerRolledResult", player, StringUtils.join(rolls, ", "));
player.getGame().getAction().nofityOfValue(sa, player, message, null);
}
if (sa.hasParam("ResultSVar")) {
host.setSVar(sa.getParam("ResultSVar"), ""+total);