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

*Fixed a trigger problem that arose when the new controller code autocorrected the zone of a card.

Browse Source 
*Removed some ambiguity in Triggers' parameter names.
This commit is contained in:
Hellfish
2011-08-27 18:34:08 +00:00
parent 99d7410adb
commit 0888f2b7d4
28 changed files with 81 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/Card.java
View File

@@ -1666,6 +1666,8 @@ public class Card extends MyObservable implements Comparable<Card> {
sb.delete(sb.lastIndexOf("\r\n"), sb.lastIndexOf("\r\n") + 3);
}
return sb.toString().replaceAll("CARDNAME", getName());
}
@@ -1766,6 +1768,15 @@ public class Card extends MyObservable implements Comparable<Card> {
}
}
/*
sb.append("\r\nOwner: ").append(owner).append("\r\n");
sb.append("Controller(s):");
for(Object o : controllerObjects)
{
sb.append(o);
}
sb.append("\r\n");
*/
return sb.toString().replaceAll("CARDNAME", getName()).trim();
}//getText()

4
src/main/java/forge/GameAction.java
View File

@@ -122,7 +122,7 @@ public class GameAction {
}
if (!(c.isToken() || suppress || zone.is(Constant.Zone.Battlefield)))
if (!(c.isToken() || suppress || zone.is(Constant.Zone.Battlefield)) && !zone.is(Constant.Zone.Battlefield))
copied = AllZone.getCardFactory().copyCard(copied);
//remove all counters from the card if destination is not the battlefield
@@ -222,7 +222,7 @@ public class GameAction {
{
System.out.println("Correcting zone for " + c.toString());
PlayerZone oldBattlefield = AllZone.getZone(c);
PlayerZone newBattlefield = AllZone.getZone("Battlefield",c.getController());
PlayerZone newBattlefield = AllZone.getZone(oldBattlefield.getZoneName(),c.getController());
if(oldBattlefield == null || newBattlefield == null)
{

2
src/main/java/forge/card/trigger/Trigger_Always.java
View File

@@ -26,7 +26,7 @@ public class Trigger_Always extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
return true;
}

6
src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java
View File

@@ -26,14 +26,14 @@ public class Trigger_AttackerBlocked extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("ValidBlocker")) {
if (!matchesValid(runParams.get("Blocker"), mapParams.get("ValidBlocker").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Blocker"), mapParams.get("ValidBlocker").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java
View File

@@ -26,9 +26,9 @@ public class Trigger_AttackerUnblocked extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}

6
src/main/java/forge/card/trigger/Trigger_Attacks.java
View File

@@ -27,15 +27,15 @@ public class Trigger_Attacks extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Attacker"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("Alone")) {
CardList otherAttackers = (CardList) runParams.get("OtherAttackers");
CardList otherAttackers = (CardList) runParams2.get("OtherAttackers");
if (otherAttackers == null) {
return false;
}

8
src/main/java/forge/card/trigger/Trigger_BecomesTarget.java
View File

@@ -28,9 +28,9 @@ public class Trigger_BecomesTarget extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
if (mapParams.containsKey("SourceType")) {
SpellAbility sa = (SpellAbility) runParams.get("SourceSA");
SpellAbility sa = (SpellAbility) runParams2.get("SourceSA");
if (mapParams.get("SourceType").equalsIgnoreCase("spell")) {
if (!sa.isSpell()) {
return false;
@@ -42,12 +42,12 @@ public class Trigger_BecomesTarget extends Trigger {
}
}
if (mapParams.containsKey("ValidSource")) {
if (!matchesValid(((SpellAbility) runParams.get("SourceSA")).getSourceCard(), mapParams.get("ValidSource").split(","), hostCard)) {
if (!matchesValid(((SpellAbility) runParams2.get("SourceSA")).getSourceCard(), mapParams.get("ValidSource").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("ValidTarget")) {
if (!matchesValid(runParams.get("Target"), mapParams.get("ValidTarget").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Target"), mapParams.get("ValidTarget").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_Blocks.java
View File

@@ -27,14 +27,14 @@ public class Trigger_Blocks extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(Map<String, Object> runParams) {
public boolean performTest(Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Blocker"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("ValidBlocked")) {
if (!matchesValid(runParams.get("Attacker"), mapParams.get("ValidBlocked").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Attacker"), mapParams.get("ValidBlocked").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_Championed.java
View File

@@ -26,8 +26,8 @@ public class Trigger_Championed extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card championed = (Card) runParams.get("Championed");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card championed = (Card) runParams2.get("Championed");
if (mapParams.containsKey("ValidCard")) {
if (!championed.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

8
src/main/java/forge/card/trigger/Trigger_ChangesZone.java
View File

@@ -25,13 +25,13 @@ public class Trigger_ChangesZone extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("Origin")) {
if (!mapParams.get("Origin").equals("Any")) {
if (mapParams.get("Origin") == null) {
return false;
}
if (!mapParams.get("Origin").equals((String) runParams.get("Origin"))) {
if (!mapParams.get("Origin").equals((String) runParams2.get("Origin"))) {
return false;
}
}
@@ -39,14 +39,14 @@ public class Trigger_ChangesZone extends Trigger {
if (mapParams.containsKey("Destination")) {
if (!mapParams.get("Destination").equals("Any")) {
if (!mapParams.get("Destination").equals((String) runParams.get("Destination"))) {
if (!mapParams.get("Destination").equals((String) runParams2.get("Destination"))) {
return false;
}
}
}
if (mapParams.containsKey("ValidCard")) {
Card moved = (Card) runParams.get("Card");
Card moved = (Card) runParams2.get("Card");
if (!moved.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {
return false;
}

4
src/main/java/forge/card/trigger/Trigger_Clashed.java
View File

@@ -25,7 +25,7 @@ public class Trigger_Clashed extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
@@ -33,7 +33,7 @@ public class Trigger_Clashed extends Trigger {
}
if (mapParams.containsKey("Won")) {
if (!mapParams.get("Won").equals(runParams.get("Won")))
if (!mapParams.get("Won").equals(runParams2.get("Won")))
return false;
}

6
src/main/java/forge/card/trigger/Trigger_CounterAdded.java
View File

@@ -26,9 +26,9 @@ public class Trigger_CounterAdded extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card addedTo = (Card) runParams.get("Card");
Counters addedType = (Counters) runParams.get("CounterType");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card addedTo = (Card) runParams2.get("Card");
Counters addedType = (Counters) runParams2.get("CounterType");
if (mapParams.containsKey("ValidCard")) {
if (!addedTo.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

2
src/main/java/forge/card/trigger/Trigger_Cycled.java
View File

@@ -44,7 +44,7 @@ public class Trigger_Cycled extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;

12
src/main/java/forge/card/trigger/Trigger_DamageDone.java
View File

@@ -26,9 +26,9 @@ public class Trigger_DamageDone extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card src = (Card) runParams.get("DamageSource");
Object tgt = runParams.get("DamageTarget");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card src = (Card) runParams2.get("DamageSource");
Object tgt = runParams2.get("DamageTarget");
if (mapParams.containsKey("ValidSource")) {
if (!src.isValidCard(mapParams.get("ValidSource").split(","), hostCard.getController(), hostCard)) {
@@ -44,10 +44,10 @@ public class Trigger_DamageDone extends Trigger {
if (mapParams.containsKey("CombatDamage")) {
if (mapParams.get("CombatDamage").equals("True")) {
if (!((Boolean) runParams.get("IsCombatDamage")))
if (!((Boolean) runParams2.get("IsCombatDamage")))
return false;
} else if (mapParams.get("CombatDamage").equals("False")) {
if (((Boolean) runParams.get("IsCombatDamage")))
if (((Boolean) runParams2.get("IsCombatDamage")))
return false;
}
}
@@ -57,7 +57,7 @@ public class Trigger_DamageDone extends Trigger {
String operator = fullParam.substring(0, 2);
int operand = Integer.parseInt(fullParam.substring(2));
int actualAmount = (Integer) runParams.get("DamageAmount");
int actualAmount = (Integer) runParams2.get("DamageAmount");
if (!AllZoneUtil.compare(actualAmount, operator, operand))
return false;

10
src/main/java/forge/card/trigger/Trigger_Discarded.java
View File

@@ -25,24 +25,24 @@ public class Trigger_Discarded extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
}
}
if (mapParams.containsKey("ValidCause")) {
if (runParams.get("Cause") == null) {
if (runParams2.get("Cause") == null) {
return false;
}
if (!matchesValid(runParams.get("Cause"), mapParams.get("ValidCause").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Cause"), mapParams.get("ValidCause").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_Drawn.java
View File

@@ -25,8 +25,8 @@ public class Trigger_Drawn extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card draw = ((Card) runParams.get("Card"));
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card draw = ((Card) runParams2.get("Card"));
if (mapParams.containsKey("ValidCard")) {
if (!draw.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

2
src/main/java/forge/card/trigger/Trigger_LandPlayed.java
View File

@@ -55,7 +55,7 @@ public class Trigger_LandPlayed extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;

4
src/main/java/forge/card/trigger/Trigger_LifeGained.java
View File

@@ -25,9 +25,9 @@ public class Trigger_LifeGained extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_LifeLost.java
View File

@@ -25,9 +25,9 @@ public class Trigger_LifeLost extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
}
}

8
src/main/java/forge/card/trigger/Trigger_Phase.java
View File

@@ -25,12 +25,12 @@ public class Trigger_Phase extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("Phase")) {
if (mapParams.get("Phase").contains(",")) {
boolean found = false;
for (String s : mapParams.get("Phase").split(",")) {
if (s.equals(runParams.get("Phase"))) {
if (s.equals(runParams2.get("Phase"))) {
found = true;
break;
}
@@ -39,13 +39,13 @@ public class Trigger_Phase extends Trigger {
if (!found)
return false;
} else {
if (!mapParams.get("Phase").equals(runParams.get("Phase"))) {
if (!mapParams.get("Phase").equals(runParams2.get("Phase"))) {
return false;
}
}
}
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
}
}

4
src/main/java/forge/card/trigger/Trigger_Sacrificed.java
View File

@@ -25,8 +25,8 @@ public class Trigger_Sacrificed extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card sac = (Card) runParams.get("Card");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card sac = (Card) runParams2.get("Card");
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(sac.getController(), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;

4
src/main/java/forge/card/trigger/Trigger_Shuffled.java
View File

@@ -25,9 +25,9 @@ public class Trigger_Shuffled extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidPlayer")) {
if (!matchesValid(runParams.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Player"), mapParams.get("ValidPlayer").split(","), hostCard)) {
return false;
}
}

6
src/main/java/forge/card/trigger/Trigger_SpellAbilityCast.java
View File

@@ -29,8 +29,8 @@ public class Trigger_SpellAbilityCast extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
SpellAbility SA = (SpellAbility) runParams.get("CastSA");
public boolean performTest(java.util.Map<String, Object> runParams2) {
SpellAbility SA = (SpellAbility) runParams2.get("CastSA");
Card cast = SA.getSourceCard();
SpellAbility_StackInstance si = AllZone.getStack().getInstanceFromSpellAbility(SA);
@@ -126,7 +126,7 @@ public class Trigger_SpellAbilityCast extends Trigger {
}
if (mapParams.containsKey("NonTapCost")) {
Cost cost = (Cost) (runParams.get("Cost"));
Cost cost = (Cost) (runParams2.get("Cost"));
if (cost.getTap()) return false;
}

4
src/main/java/forge/card/trigger/Trigger_Taps.java
View File

@@ -25,8 +25,8 @@ public class Trigger_Taps extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card tapper = (Card) runParams.get("Card");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card tapper = (Card) runParams2.get("Card");
if (mapParams.containsKey("ValidCard")) {
if (!tapper.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

4
src/main/java/forge/card/trigger/Trigger_TapsForMana.java
View File

@@ -25,8 +25,8 @@ public class Trigger_TapsForMana extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card tapper = (Card) runParams.get("Card");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card tapper = (Card) runParams2.get("Card");
if (mapParams.containsKey("ValidCard")) {
if (!tapper.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

4
src/main/java/forge/card/trigger/Trigger_TurnFaceUp.java
View File

@@ -25,9 +25,9 @@ public class Trigger_TurnFaceUp extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
public boolean performTest(java.util.Map<String, Object> runParams2) {
if (mapParams.containsKey("ValidCard")) {
if (!matchesValid(runParams.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
if (!matchesValid(runParams2.get("Card"), mapParams.get("ValidCard").split(","), hostCard)) {
return false;
}
}

6
src/main/java/forge/card/trigger/Trigger_Unequip.java
View File

@@ -25,9 +25,9 @@ public class Trigger_Unequip extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card equipped = (Card) runParams.get("Card");
Card equipment = (Card) runParams.get("Equipment");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card equipped = (Card) runParams2.get("Card");
Card equipment = (Card) runParams2.get("Equipment");
if (mapParams.containsKey("ValidCard")) {
if (!equipped.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {

4
src/main/java/forge/card/trigger/Trigger_Untaps.java
View File

@@ -25,8 +25,8 @@ public class Trigger_Untaps extends Trigger {
/** {@inheritDoc} */
@Override
public boolean performTest(java.util.Map<String, Object> runParams) {
Card untapper = (Card) runParams.get("Card");
public boolean performTest(java.util.Map<String, Object> runParams2) {
Card untapper = (Card) runParams2.get("Card");
if (mapParams.containsKey("ValidCard")) {
if (!untapper.isValidCard(mapParams.get("ValidCard").split(","), hostCard.getController(), hostCard)) {