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

Merge branch 'master' into 'master'

Browse Source 
Account for double damage coming from Mishra Vanguard avatar.

See merge request core-developers/forge!1103
This commit is contained in:
Michael Kamensky
2018-11-14 20:15:05 +00:00
parent c71ceca3a9 f3912e4eb0
commit 3925b57180
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -4666,7 +4666,7 @@ public class Card extends GameEntity implements Comparable<Card> {
// TODO: improve such that this can be predicted from the replacement effect itself // TODO: improve such that this can be predicted from the replacement effect itself
// (+ move this function out into ComputerUtilCombat?) // (+ move this function out into ComputerUtilCombat?)
for (Card c : getGame().getCardsIn(ZoneType.Command)) { for (Card c : getGame().getCardsIn(ZoneType.Command)) {
if (c.getName().equals("Insult Effect")) { if (c.getName().equals("Insult Effect") || c.getName().equals("Mishra")) {
if (c.getController().equals(source.getController())) { if (c.getController().equals(source.getController())) {
restDamage *= 2; restDamage *= 2;
} }

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

@@ -723,7 +723,7 @@ public class Player extends GameEntity implements Comparable<Player> {
// TODO: improve such that this can be predicted from the replacement effect itself // TODO: improve such that this can be predicted from the replacement effect itself
// (+ move this function out into ComputerUtilCombat?) // (+ move this function out into ComputerUtilCombat?)
for (Card c : game.getCardsIn(ZoneType.Command)) { for (Card c : game.getCardsIn(ZoneType.Command)) {
if (c.getName().equals("Insult Effect")) { if (c.getName().equals("Insult Effect") || c.getName().equals("Mishra")) {
if (c.getController().equals(source.getController())) { if (c.getController().equals(source.getController())) {
restDamage *= 2; restDamage *= 2;
} }