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

- Renamed the parameter RememberCards to RememberObjects in AF Effect and allowed storing of any remembered objects.

Browse Source 
- The property "IsRemembered" can now also be used for players.
- Added Abeyance.
This commit is contained in:
Sloth
2011-11-19 21:24:36 +00:00
parent c498f39b0d
commit 2d4e42f536
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2209,6 +2209,10 @@ public abstract class Player extends GameEntity {
} if (this.isComputer() && !source.getDealtDmgToComputerThisGame()) {
return false;
}
} else if (property.equals("IsRemembered")) {
if (!source.getRemembered().contains(this)) {
return false;
}
}
return true;

13
src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
View File

@@ -201,9 +201,10 @@ public class AbilityFactoryEffect {
final Random r = MyRandom.getRandom();
final HashMap<String, String> params = af.getMapParams();
boolean randomReturn = r.nextFloat() <= .6667;
String logic = "";
if (params.containsKey("AILogic")) {
final String logic = params.get("AILogic");
logic = params.get("AILogic");
final Phase phase = AllZone.getPhase();
if (logic.equals("BeginningOfOppTurn")) {
if(phase.isPlayerTurn(AllZone.getComputerPlayer())
@@ -244,7 +245,7 @@ public class AbilityFactoryEffect {
final Target tgt = sa.getTarget();
if (tgt != null) {
tgt.resetTargets();
if (tgt.canOnlyTgtOpponent()) {
if (tgt.canOnlyTgtOpponent() || logic.equals("BeginningOfOppTurn")) {
tgt.addTarget(AllZone.getHumanPlayer());
} else {
tgt.addTarget(AllZone.getComputerPlayer());
@@ -331,8 +332,8 @@ public class AbilityFactoryEffect {
effectKeywords = params.get("Keywords").split(",");
}
if (params.containsKey("RememberCard")) {
effectRemembered = params.get("RememberCard");
if (params.containsKey("RememberObjects")) {
effectRemembered = params.get("RememberObjects");
}
// Effect eff = new Effect();
@@ -409,8 +410,8 @@ public class AbilityFactoryEffect {
// Set Remembered
if (effectRemembered != null) {
for (final Card c : AbilityFactory.getDefinedCards(card, effectRemembered, sa)) {
eff.addRemembered(c);
for (final Object o : AbilityFactory.getDefinedObjects(card, effectRemembered, sa)) {
eff.addRemembered(o);
}
}