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

*Only intrinsic triggers are now copied.

Browse Source 
*Removed som debug output.
This commit is contained in:
Hellfish
2011-10-29 08:42:30 +00:00
parent df80bd64a8
commit eabe14fee8
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,9 +565,11 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void setTriggers(final ArrayList<Trigger> trigs) { public final void setTriggers(final ArrayList<Trigger> trigs) {
ArrayList<Trigger> copyList = new ArrayList<Trigger>(); ArrayList<Trigger> copyList = new ArrayList<Trigger>();
for (Trigger t : trigs) { for (Trigger t : trigs) {
Trigger newtrig = t.getCopy(); if(t.getIsIntrinsic()) {
newtrig.setHostCard(this); Trigger newtrig = t.getCopy();
copyList.add(newtrig); newtrig.setHostCard(this);
copyList.add(newtrig);
}
} }
getCharacteristics().setTriggers(copyList); getCharacteristics().setTriggers(copyList);

3
src/main/java/forge/Gui_DownloadPictures_LQ.java
View File

@@ -46,9 +46,6 @@ public class Gui_DownloadPictures_LQ extends GuiDownloader {
String base = ForgeProps.getFile(IMAGE_BASE).getPath(); String base = ForgeProps.getFile(IMAGE_BASE).getPath();
for (Card c : AllZone.getCardFactory()) { for (Card c : AllZone.getCardFactory()) {
if (c.getName().equals("Gatstaf Shepherd")) {
System.out.println("Heyo!");
}
cList.addAll(createDLObjects(c, base)); cList.addAll(createDLObjects(c, base));
if (c.hasAlternateState()) { if (c.hasAlternateState()) {
c.changeState(); c.changeState();

4
src/main/java/forge/card/cardFactory/AbstractCardFactory.java
View File

@@ -193,10 +193,6 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
out.addRemembered(o); out.addRemembered(o);
} }
out.clearTriggersNew();
for (Trigger trigger : in.getTriggers()) {
out.moveTrigger(trigger);
}
return out; return out;
} }