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

- Added Spike Cannibal

Browse Source 
- Added Stuffy Doll Avatar
This commit is contained in:
swordshine
2013-02-19 08:31:46 +00:00
parent 8d4635fd3d
commit b9d5b8827c
5 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/forge/card/ability/ai/CountersMoveAi.java
View File

@@ -26,8 +26,10 @@ public class CountersMoveAi extends SpellAbilityAi {
final String amountStr = sa.getParam("CounterNum");
// TODO handle proper calculation of X values based on Cost
final int amount = AbilityUtils.calculateAmount(sa.getSourceCard(), amountStr, sa);
int amount = 0;
if (!sa.getParam("CounterNum").equals("All")) {
amount = AbilityUtils.calculateAmount(sa.getSourceCard(), amountStr, sa);
}
// don't use it if no counters to add
if (amount <= 0) {
return false;
@@ -49,13 +51,19 @@ public class CountersMoveAi extends SpellAbilityAi {
final Target abTgt = sa.getTarget();
final String type = sa.getParam("CounterType");
final String amountStr = sa.getParam("CounterNum");
final int amount = AbilityUtils.calculateAmount(sa.getSourceCard(), amountStr, sa);
int amount = 0;
if (!sa.getParam("CounterNum").equals("All")) {
amount = AbilityUtils.calculateAmount(sa.getSourceCard(), amountStr, sa);
}
boolean chance = false;
boolean preferred = true;
final CounterType cType = CounterType.valueOf(sa.getParam("CounterType"));
final List<Card> srcCards = AbilityUtils.getDefinedCards(host, sa.getParam("Source"), sa);
final List<Card> destCards = AbilityUtils.getDefinedCards(host, sa.getParam("Defined"), sa);
if ((srcCards.size() > 0 && sa.getParam("CounterNum").equals("All"))) {
amount = srcCards.get(0).getCounters(cType);
}
if (abTgt == null) {
if ((srcCards.size() > 0)
&& cType.equals(CounterType.P1P1) // move +1/+1 counters away

8
src/main/java/forge/card/ability/effects/CountersMoveEffect.java
View File

@@ -48,7 +48,10 @@ public class CountersMoveEffect extends SpellAbilityEffect {
final Card host = sa.getSourceCard();
final CounterType cType = CounterType.valueOf(sa.getParam("CounterType"));
final int amount = AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("CounterNum"), sa);
int amount = 0;
if (!sa.getParam("CounterNum").equals("All")) {
amount = AbilityUtils.calculateAmount(host, sa.getParam("CounterNum"), sa);
}
Card source = null;
List<Card> srcCards;
@@ -61,6 +64,9 @@ public class CountersMoveEffect extends SpellAbilityEffect {
if (srcCards.size() > 0) {
source = srcCards.get(0);
}
if (sa.getParam("CounterNum").equals("All")) {
amount = source.getCounters(cType);
}
List<Card> tgtCards;
if (!sa.hasParam("Defined") && tgt != null) {
tgtCards = tgt.getTargetCards();