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

cleanup regarding params in a couple AFs

Browse Source
This commit is contained in:
jendave
2011-08-07 01:43:07 +00:00
parent 54a4aca2ab
commit 680cfd54a0
3 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/card/abilityFactory/AbilityFactory_PreventDamage.java
View File

@@ -116,7 +116,7 @@ public class AbilityFactory_PreventDamage {
ArrayList<Object> tgts;
if(sa.getTarget() == null)
tgts = AbilityFactory.getDefinedObjects(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgts = AbilityFactory.getDefinedObjects(sa.getSourceCard(), params.get("Defined"), sa);
else
tgts = sa.getTarget().getTargets();

54
src/forge/card/abilityFactory/AbilityFactory_Reveal.java
View File

@@ -128,7 +128,7 @@ public class AbilityFactory_Reveal {
if (tgt != null)
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
sb.append(host.getController()).append(" looks at the top ").append(numToDig);
sb.append(" card");
@@ -241,7 +241,7 @@ public class AbilityFactory_Reveal {
if (tgt != null)
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
for(Player p : tgtPlayers) {
if (tgt == null || p.canTarget(af.getHostCard())) {
@@ -493,10 +493,11 @@ public class AbilityFactory_Reveal {
}
private static String revealHandStackDescription(AbilityFactory af, SpellAbility sa){
HashMap<String,String> params = af.getMapParams();
StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub))
sb.append(sa.getSourceCard().getName()).append(" - ");
sb.append(sa.getSourceCard()).append(" - ");
else
sb.append(" ");
@@ -506,7 +507,7 @@ public class AbilityFactory_Reveal {
if (tgt != null)
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
sb.append(sa.getActivatingPlayer()).append(" looks at ");
@@ -738,7 +739,7 @@ public class AbilityFactory_Reveal {
if (tgt != null)
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
for(Player p : tgtPlayers) {
if (tgt == null || p.canTarget(af.getHostCard())){
@@ -767,7 +768,8 @@ public class AbilityFactory_Reveal {
return scryTargetAI(af, sa);
}// scryTargetAI()
private static String scryStackDescription(AbilityFactory af, SpellAbility sa){
private static String scryStackDescription(AbilityFactory af, SpellAbility sa) {
HashMap<String,String> params = af.getMapParams();
StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub))
@@ -781,14 +783,14 @@ public class AbilityFactory_Reveal {
if (tgt != null)
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
for(Player p : tgtPlayers)
sb.append(p.toString()).append(" ");
int num = 1;
if (af.getMapParams().containsKey("ScryNum"))
num = AbilityFactory.calculateAmount(sa.getSourceCard(), af.getMapParams().get("ScryNum"), sa);
if (params.containsKey("ScryNum"))
num = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("ScryNum"), sa);
sb.append("scrys (").append(num).append(").");
@@ -918,25 +920,26 @@ public class AbilityFactory_Reveal {
return dbDraw;
}
private static String rearrangeTopOfLibraryStackDescription(final AbilityFactory AF, final SpellAbility sa)
private static String rearrangeTopOfLibraryStackDescription(final AbilityFactory af, final SpellAbility sa)
{
HashMap<String,String> params = af.getMapParams();
int numCards = 0;
ArrayList<Player> tgtPlayers;
boolean shuffle = false;
Target tgt = AF.getAbTgt();
if (tgt != null && !AF.getMapParams().containsKey("Defined"))
Target tgt = af.getAbTgt();
if (tgt != null && !params.containsKey("Defined"))
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), AF.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
numCards = AbilityFactory.calculateAmount(AF.getHostCard(), AF.getMapParams().get("NumCards"), sa);
shuffle = AF.getMapParams().containsKey("MayShuffle") ? true : false;
numCards = AbilityFactory.calculateAmount(af.getHostCard(), params.get("NumCards"), sa);
shuffle = params.containsKey("MayShuffle") ? true : false;
StringBuilder ret = new StringBuilder();
if(!(sa instanceof Ability_Sub))
{
ret.append(AF.getHostCard().getName());
ret.append(af.getHostCard().getName());
ret.append(" - ");
}
ret.append("Look at the top ");
@@ -970,7 +973,7 @@ public class AbilityFactory_Reveal {
return ret.toString();
}
private static boolean rearrangeTopOfLibraryTrigger(final AbilityFactory AF, final SpellAbility sa, final boolean mandatory)
private static boolean rearrangeTopOfLibraryTrigger(final AbilityFactory af, final SpellAbility sa, final boolean mandatory)
{
if(!ComputerUtil.canPayCost(sa))
return false;
@@ -983,26 +986,27 @@ public class AbilityFactory_Reveal {
return false;
}
private static void rearrangeTopOfLibraryResolve(final AbilityFactory AF,final SpellAbility sa)
private static void rearrangeTopOfLibraryResolve(final AbilityFactory af, final SpellAbility sa)
{
HashMap<String,String> params = af.getMapParams();
int numCards = 0;
ArrayList<Player> tgtPlayers = new ArrayList<Player>();
boolean shuffle = false;
if(sa.getActivatingPlayer().isHuman())
{
Target tgt = AF.getAbTgt();
if (tgt != null && !AF.getMapParams().containsKey("Defined"))
Target tgt = af.getAbTgt();
if (tgt != null && !params.containsKey("Defined"))
tgtPlayers = tgt.getTargetPlayers();
else
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), AF.getMapParams().get("Defined"), sa);
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
numCards = AbilityFactory.calculateAmount(AF.getHostCard(), AF.getMapParams().get("NumCards"), sa);
shuffle = AF.getMapParams().containsKey("MayShuffle") ? true : false;
numCards = AbilityFactory.calculateAmount(af.getHostCard(), params.get("NumCards"), sa);
shuffle = params.containsKey("MayShuffle") ? true : false;
for(Player p : tgtPlayers)
if (tgt == null || p.canTarget(AF.getHostCard()))
rearrangeTopOfLibrary(AF.getHostCard(), p, numCards, shuffle);
if (tgt == null || p.canTarget(af.getHostCard()))
rearrangeTopOfLibrary(af.getHostCard(), p, numCards, shuffle);
}
}

13
src/forge/card/abilityFactory/AbilityFactory_Sacrifice.java
View File

@@ -101,7 +101,8 @@ public class AbilityFactory_Sacrifice {
return dbSacrifice;
}
public static String sacrificeDescription(final AbilityFactory af, SpellAbility sa){
public static String sacrificeDescription(final AbilityFactory af, SpellAbility sa) {
HashMap<String,String> params = af.getMapParams();
StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub)
@@ -109,7 +110,7 @@ public class AbilityFactory_Sacrifice {
else
sb.append(sa.getSourceCard().getName()).append(" - ");
String conditionDesc = af.getMapParams().get("ConditionDescription");
String conditionDesc = params.get("ConditionDescription");
if (conditionDesc != null)
sb.append(conditionDesc).append(" ");
@@ -118,13 +119,13 @@ public class AbilityFactory_Sacrifice {
if (tgt != null)
tgts = tgt.getTargetPlayers();
else
tgts = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), af.getMapParams().get("Defined"), sa);
tgts = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
String valid = af.getMapParams().get("SacValid");
String valid = params.get("SacValid");
if (valid == null)
valid = "Self";
String num = af.getMapParams().get("Amount");
String num = params.get("Amount");
num = (num == null) ? "1" : num;
int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), num, sa);
@@ -138,7 +139,7 @@ public class AbilityFactory_Sacrifice {
for(Player p : tgts)
sb.append(p.getName()).append(" ");
String msg = af.getMapParams().get("SacMessage");
String msg = params.get("SacMessage");
if (msg == null)
msg = valid;