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

Fix some more references to getOpponent().

Browse Source
This commit is contained in:
elcnesh
2014-07-28 15:28:50 +00:00
parent 858c26745f
commit b59f77e2ac
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -222,9 +222,10 @@ public abstract class CardTraitBase extends GameObject {
list.addAll(this.getHostCard().getController().getCardsIn(presentZone)); list.addAll(this.getHostCard().getController().getCardsIn(presentZone));
} }
if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) { if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) {
for (Player p : this.getHostCard().getController().getOpponents()) for (final Player p : this.getHostCard().getController().getOpponents()) {
list.addAll(p.getCardsIn(presentZone)); list.addAll(p.getCardsIn(presentZone));
} }
}
list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard()); list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard());
@@ -262,7 +263,9 @@ public abstract class CardTraitBase extends GameObject {
list.addAll(this.getHostCard().getController().getCardsIn(presentZone)); list.addAll(this.getHostCard().getController().getCardsIn(presentZone));
} }
if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) { if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) {
list.addAll(this.getHostCard().getController().getOpponent().getCardsIn(presentZone)); for (final Player p : this.getHostCard().getController().getOpponents()) {
list.addAll(p.getCardsIn(presentZone));
}
} }
list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard()); list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard());

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

@@ -963,7 +963,7 @@ public class GameAction {
final Player pl = (Player) entity; final Player pl = (Player) entity;
boolean invalid = false; boolean invalid = false;
if (tgt.canOnlyTgtOpponent() && !c.getController().getOpponent().equals(pl)) { if (tgt.canOnlyTgtOpponent() && !c.getController().isOpponentOf(pl)) {
invalid = true; invalid = true;
} }
else if (pl.hasProtectionFrom(c)) { else if (pl.hasProtectionFrom(c)) {

4
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -886,10 +886,10 @@ public class AbilityUtils {
} }
} }
} }
else if (defined.equals("RememberedOpponent")) { else if (defined.equals("RememberedOpponents")) {
for (final Object rem : card.getRemembered()) { for (final Object rem : card.getRemembered()) {
if (rem instanceof Player) { if (rem instanceof Player) {
players.add(((Player) rem).getOpponent()); players.addAll(((Player) rem).getOpponents());
} }
} }
} }

2
forge-gui/res/cardsfolder/g/goblin_festival.txt
View File

@@ -4,7 +4,7 @@ Types:Enchantment
A:AB$ DealDamage | Cost$ 2 | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SubAbility$ RememberActivator | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of CARDNAME. A:AB$ DealDamage | Cost$ 2 | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SubAbility$ RememberActivator | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of CARDNAME.
SVar:RememberActivator:DB$ Pump | RememberObjects$ You | Static$ True | StackDescription$ None | SubAbility$ ControlFlip SVar:RememberActivator:DB$ Pump | RememberObjects$ You | Static$ True | StackDescription$ None | SubAbility$ ControlFlip
SVar:ControlFlip:DB$ FlipACoin | Defined$ Remembered | LoseSubAbility$ ChooseOpp | WinSubAbility$ DBCleanup SVar:ControlFlip:DB$ FlipACoin | Defined$ Remembered | LoseSubAbility$ ChooseOpp | WinSubAbility$ DBCleanup
SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ Remembered | Choices$ RememberedOpponent | AILogic$ Curse | SubAbility$ LoseControl SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ Remembered | Choices$ RememberedOpponents | AILogic$ Curse | SubAbility$ LoseControl
SVar:LoseControl:DB$ GainControl | Defined$ Self | NewController$ ChosenPlayer | SubAbility$ DBCleanup SVar:LoseControl:DB$ GainControl | Defined$ Self | NewController$ ChosenPlayer | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_festival.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_festival.jpg