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

several Checkstyle fixes in Card, GameAction and CardFactoryUtil

Browse Source
This commit is contained in:
slapshot5
2011-09-06 01:58:44 +00:00
parent 374d79e231
commit 8404824656
3 changed files with 457 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2650,42 +2650,32 @@ public class Card extends GameEntity implements Comparable<Card> {
public Player getController() { public Player getController() {
if (controllerObjects.size() == 0) return owner; if (controllerObjects.size() == 0) return owner;
Object topController = controllerObjects.get(controllerObjects.size() - 1); Object topController = controllerObjects.get(controllerObjects.size() - 1);
if(topController instanceof Player) if (topController instanceof Player) {
{
return (Player)topController; return (Player)topController;
} }
else else {
{
return ((Card)topController).getController(); return ((Card)topController).getController();
} }
} }
public void addController(Object controllerObject) public void addController(Object controllerObject) {
{
Object prevController = controllerObjects.size() == 0 ? owner : controllerObjects.get(controllerObjects.size()-1); Object prevController = controllerObjects.size() == 0 ? owner : controllerObjects.get(controllerObjects.size()-1);
if(!controllerObject.equals(prevController)) if (!controllerObject.equals(prevController)) {
{ if (controllerObject instanceof Player) {
if(controllerObject instanceof Player) for (int i = 0; i < controllerObjects.size(); i++) {
{ if(controllerObjects.get(i) instanceof Player) {
for(int i=0;i<controllerObjects.size();i++)
{
if(controllerObjects.get(i) instanceof Player)
{
controllerObjects.remove(i); controllerObjects.remove(i);
} }
} }
} }
controllerObjects.add(controllerObject); controllerObjects.add(controllerObject);
if(AllZone.getGameAction() != null && prevController != null) if (AllZone.getGameAction() != null && prevController != null) {
{ AllZone.getGameAction().controllerChangeZoneCorrection(this);
AllZone.getGameAction().controllerChange_ZoneCorrection(this);
} }
if(prevController != null) if (prevController != null) {
{ for (Command c : changeControllerCommandList) {
for(Command c : changeControllerCommandList)
{
c.execute(); c.execute();
} }
} }
@@ -2701,7 +2691,7 @@ public class Card extends GameEntity implements Comparable<Card> {
if(!currentController.equals(getController())) if(!currentController.equals(getController()))
{ {
AllZone.getGameAction().controllerChange_ZoneCorrection(this); AllZone.getGameAction().controllerChangeZoneCorrection(this);
for(Command c : changeControllerCommandList) for(Command c : changeControllerCommandList)
{ {
@@ -2712,18 +2702,15 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
} }
public void clearControllers() public void clearControllers() {
{
controllerObjects.clear(); controllerObjects.clear();
} }
public ArrayList<Object> getControllerObjects() public ArrayList<Object> getControllerObjects() {
{
return controllerObjects; return controllerObjects;
} }
public void setControllerObjects(ArrayList<Object> in) public void setControllerObjects(ArrayList<Object> in) {
{
controllerObjects = in; controllerObjects = in;
} }
@@ -5224,8 +5211,9 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public int getKillDamage() { public int getKillDamage() {
int killDamage = getLethalDamage() + getPreventNextDamage(); int killDamage = getLethalDamage() + getPreventNextDamage();
if (killDamage > getPreventNextDamage() && hasStartOfKeyword("When CARDNAME is dealt damage, destroy it.")) if (killDamage > getPreventNextDamage() && hasStartOfKeyword("When CARDNAME is dealt damage, destroy it.")) {
killDamage = 1 + getPreventNextDamage(); killDamage = 1 + getPreventNextDamage();
}
return killDamage; return killDamage;
} }
@@ -5268,13 +5256,16 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param sourceCard a {@link forge.Card} object. * @param sourceCard a {@link forge.Card} object.
*/ */
public void addAssignedDamage(int damage, Card sourceCard) { public void addAssignedDamage(int damage, Card sourceCard) {
if (damage < 0) damage = 0; if (damage < 0) {
damage = 0;
}
int assignedDamage = damage; int assignedDamage = damage;
Log.debug(this + " - was assigned " + assignedDamage + " damage, by " + sourceCard); Log.debug(this + " - was assigned " + assignedDamage + " damage, by " + sourceCard);
if (!assignedDamageMap.containsKey(sourceCard)) assignedDamageMap.put(sourceCard, assignedDamage); if (!assignedDamageMap.containsKey(sourceCard)) {
else { assignedDamageMap.put(sourceCard, assignedDamage);
} else {
assignedDamageMap.put(sourceCard, assignedDamageMap.get(sourceCard) + assignedDamage); assignedDamageMap.put(sourceCard, assignedDamageMap.get(sourceCard) + assignedDamage);
} }
@@ -5308,8 +5299,9 @@ public class Card extends GameEntity implements Comparable<Card> {
Collection<Integer> c = assignedDamageMap.values(); Collection<Integer> c = assignedDamageMap.values();
Iterator<Integer> itr = c.iterator(); Iterator<Integer> itr = c.iterator();
while (itr.hasNext()) while (itr.hasNext()) {
total += itr.next(); total += itr.next();
}
return total; return total;
} }
@@ -5383,7 +5375,9 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public int staticDamagePrevention(final int damage, final int possiblePrvenetion, final Card source, final boolean isCombat) { public int staticDamagePrevention(final int damage, final int possiblePrvenetion, final Card source, final boolean isCombat) {
if (AllZoneUtil.isCardInPlay("Leyline of Punishment")) return damage; if (AllZoneUtil.isCardInPlay("Leyline of Punishment")) {
return damage;
}
int restDamage = damage - possiblePrvenetion; int restDamage = damage - possiblePrvenetion;
@@ -5634,9 +5628,9 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
} }
//This function handles damage after replacement and prevention effects are applied
/** /**
* <p>addDamageAfterPrevention.</p> * <p>addDamageAfterPrevention.</p>
* This function handles damage after replacement and prevention effects are applied.
* *
* @param damageIn a int. * @param damageIn a int.
* @param source a {@link forge.Card} object. * @param source a {@link forge.Card} object.
@@ -5647,7 +5641,9 @@ public class Card extends GameEntity implements Comparable<Card> {
int damageToAdd = damageIn; int damageToAdd = damageIn;
boolean wither = false; boolean wither = false;
if (damageToAdd == 0) return; //Rule 119.8 if (damageToAdd == 0) {
return; //Rule 119.8
}
System.out.println("Adding " + damageToAdd + " damage to " + getName()); System.out.println("Adding " + damageToAdd + " damage to " + getName());
Log.debug("Adding " + damageToAdd + " damage to " + getName()); Log.debug("Adding " + damageToAdd + " damage to " + getName());
@@ -5670,13 +5666,18 @@ public class Card extends GameEntity implements Comparable<Card> {
return; return;
} }
if ((source.hasKeyword("Wither") || source.hasKeyword("Infect"))) if ((source.hasKeyword("Wither") || source.hasKeyword("Infect"))) {
wither = true; wither = true;
}
GameActionUtil.executeDamageToCreatureEffects(source, this, damageToAdd); GameActionUtil.executeDamageToCreatureEffects(source, this, damageToAdd);
if (AllZoneUtil.isCardInPlay(this) && wither) addCounter(Counters.M1M1, damageToAdd); if (AllZoneUtil.isCardInPlay(this) && wither) {
if (AllZoneUtil.isCardInPlay(this) && !wither) damage += damageToAdd; addCounter(Counters.M1M1, damageToAdd);
}
if (AllZoneUtil.isCardInPlay(this) && !wither) {
damage += damageToAdd;
}
} }
@@ -5732,8 +5733,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* <p>setRandomSetCode.</p> * <p>setRandomSetCode.</p>
*/ */
public void setRandomSetCode() { public void setRandomSetCode() {
if (Sets.size() < 1) if (Sets.size() < 1) {
return; return;
}
Random r = MyRandom.random; Random r = MyRandom.random;
SetInfo si = Sets.get(r.nextInt(Sets.size())); SetInfo si = Sets.get(r.nextInt(Sets.size()));
@@ -5779,9 +5781,11 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
public String getCurSetURL() { public String getCurSetURL() {
for (int i = 0; i < Sets.size(); i++) for (int i = 0; i < Sets.size(); i++) {
if (Sets.get(i).Code.equals(curSetCode)) if (Sets.get(i).Code.equals(curSetCode)) {
return Sets.get(i).URL; return Sets.get(i).URL;
}
}
return ""; return "";
} }

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

File diff suppressed because it is too large Load Diff

11
src/main/java/forge/card/cardFactory/CardFactoryUtil.java
View File

@@ -517,8 +517,7 @@ public class CardFactoryUtil {
value -= (toughness - 1) * 9; value -= (toughness - 1) * 9;
} }
if (c.hasKeyword("CARDNAME can't attack or block.")) if (c.hasKeyword("CARDNAME can't attack or block.")) {
{
value = 50 + c.getCMC() * 5; // reset everything - useless value = 50 + c.getCMC() * 5; // reset everything - useless
} }
if (c.hasKeyword("At the beginning of the end step, destroy CARDNAME.")) { if (c.hasKeyword("At the beginning of the end step, destroy CARDNAME.")) {
@@ -5124,9 +5123,13 @@ public class CardFactoryUtil {
final int m = Integer.parseInt(parse.substring(6)); final int m = Integer.parseInt(parse.substring(6));
final Trigger myTrigger = TriggerHandler.parseTrigger("Mode$ ChangesZone | ValidCard$ Creature.Other | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.", card, true); String trigStr = "Mode$ ChangesZone | ValidCard$ Creature.Other | Origin$ Any | Destination$ Battlefield";
trigStr += " | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ ";
trigStr += "Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.";
final Trigger myTrigger = TriggerHandler.parseTrigger(trigStr, card, true);
AbilityFactory af = new AbilityFactory(); AbilityFactory af = new AbilityFactory();
myTrigger.setOverridingAbility(af.getAbility("AB$ MoveCounter | Cost$ 0 | Source$ Self | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1", card)); String abStr = "AB$ MoveCounter | Cost$ 0 | Source$ Self | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1";
myTrigger.setOverridingAbility(af.getAbility(abStr, card));
card.addTrigger(myTrigger); card.addTrigger(myTrigger);
card.addIntrinsicKeyword("etbCounter:P1P1:" + m); card.addIntrinsicKeyword("etbCounter:P1P1:" + m);