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

- Run SetInfo Script

Browse Source 
- Convert Mudbutton Torchrunner to Trigger
- Fix for Combat Display displaying the wrong attacking creatures.
This commit is contained in:
jendave
2011-08-06 17:00:54 +00:00
parent e37af942e4
commit 2188c38a0e
27 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/cardsfolder/bloodghast.txt
View File

@@ -9,4 +9,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodghast.jpg
SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/83.jpg
End

1
res/cardsfolder/bonehoard.txt
View File

@@ -8,4 +8,5 @@ K:Living Weapon
SVar:X:Count$TypeInAllYards.Creature
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/bonehoard.jpg
SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/100.jpg
End

1
res/cardsfolder/flayer_husk.txt
View File

@@ -6,4 +6,5 @@ K:eqPump 2:+1/+1
K:Living Weapon
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/flayer_husk.jpg
SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/107.jpg
End

1
res/cardsfolder/lightwielder_paladin.txt
View File

@@ -7,4 +7,5 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDama
SVar:TrigExile:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent.Black+YouDontCtrl,Permanent.Red+YouDontCtrl | TgtPrompt$ Choose target black or red permanent. | Origin$ Battlefield | Destination$ Exile | IsCurse$ True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/lightwielder_paladin.jpg
SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/19.jpg
End

3
res/cardsfolder/marshals_anthem.txt
View File

@@ -10,4 +10,5 @@ SVar:X:Count$TimesKicked
SVar:RemAIDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/marshals_anthem.jpg
End
SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/15.jpg
End

1
res/cardsfolder/moat.txt
View File

@@ -6,4 +6,5 @@ K:stPumpAll:Creature.withoutFlying:0/0/HIDDEN CARDNAME can't attack.:No Conditio
SVar:RemAIDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/moat.jpg
SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/197.jpg
End

1
res/cardsfolder/mudbrawler_raiders.txt
View File

@@ -6,4 +6,5 @@ PT:3/3
K:CantBeBlockedBy Creature.Blue
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/mudbrawler_raiders.jpg
SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/213.jpg
End

4
res/cardsfolder/mudbutton_torchrunner.txt
View File

@@ -1,8 +1,10 @@
Name:Mudbutton Torchrunner
ManaCost:2 R
Types:Creature Goblin Warrior
Text:When Mudbutton Torchrunner is put into a graveyard from play, it deals 3 damage to target creature or player.
Text:no text
PT:1/1
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, it deals 3 damage to target creature or player.
SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/mudbutton_torchrunner.jpg
SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/185.jpg

1
res/cardsfolder/noggle_bandit.txt
View File

@@ -6,4 +6,5 @@ PT:2/2
K:CantBeBlockedBy Creature.withoutDefender
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_bandit.jpg
SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/106.jpg
End

1
res/cardsfolder/noggle_hedge_mage.txt
View File

@@ -9,4 +9,5 @@ SVar:TrigTap:AB$Tap | Cost$ 0 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permane
SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtP | NumDmg$ 2
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_hedge_mage.jpg
SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/108.jpg
End

1
res/cardsfolder/opaline_bracers.txt
View File

@@ -8,4 +8,5 @@ K:Sunburst
SVar:X:Count$CardCounters.CHARGE
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/opaline_bracers.jpg
SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/141.jpg
End

1
res/cardsfolder/phyrexian_hydra.txt
View File

@@ -6,4 +6,5 @@ PT:7/7
K:Infect
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_hydra.jpg
SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/85.jpg
End

1
res/cardsfolder/ravens_run_dragoon.txt
View File

@@ -6,4 +6,5 @@ PT:3/3
K:CantBeBlockedBy Creature.Black
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/ravens_run_dragoon.jpg
SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/235.jpg
End

4
res/cardsfolder/relic_crush.txt
View File

@@ -6,5 +6,5 @@ A:SP$Destroy | Cost$ 4 G | ValidTgts$ Artifact,Enchantment | TargetMin$ 1 | Targ
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/Relic_Crush.jpg
End
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/179.jpg
End

3
res/cardsfolder/ruinous_minotaur.txt
View File

@@ -7,4 +7,5 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones
SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | SacValid$ Land | Defined$ You
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/Ruinous_Minotaur.jpg
End
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/145.jpg
End

1
res/cardsfolder/sacred_knight.txt
View File

@@ -6,4 +6,5 @@ PT:3/2
K:CantBeBlockedBy Creature.Black,Creature.Red
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/sacred_knight.jpg
SetInfo:POR|Common|http://magiccards.info/scans/en/po/186.jpg
End

1
res/cardsfolder/skinwing.txt
View File

@@ -6,4 +6,5 @@ K:eqPump 6:+2/+2/Flying
K:Living Weapon
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/skinwing.jpg
SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/133.jpg
End

4
res/cardsfolder/soul_stair_expedition.txt
View File

@@ -8,5 +8,5 @@ SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/Soul_Stair_Expedition.jpg
End
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/112.jpg
End

1
res/cardsfolder/strandwalker.txt
View File

@@ -6,4 +6,5 @@ K:eqPump 4:+2/+4/Reach
K:Living Weapon
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/strandwalker.jpg
SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/137.jpg
End

4
res/cardsfolder/summoners_bane.txt
View File

@@ -6,5 +6,5 @@ A:SP$Counter | Cost$ 2 U U | ValidCard$ Creature | Destination$ Graveyard | SubA
SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Illusion | TokenTypes$ Creature,Illusion | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ B 2 2 Illusion
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/summoners_bane.jpg
End
SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/71.jpg
End

1
res/cardsfolder/sunspring_expedition.txt
View File

@@ -8,4 +8,5 @@ SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/sunspring_expedition.jpg
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/37.jpg
End

3
res/cardsfolder/tajuru_archer.txt
View File

@@ -3,10 +3,11 @@ ManaCost:2 G
Types:Creature Elf Archer Ally
Text:no text
PT:1/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control,
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control,
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature.withFlying | NumDmg$ NumAllies | TgtPrompt$ Select a target creature with flying.
SVar:NumAllies:Count$Valid Ally.YouCtrl
SVar:Picture:http://www.wizards.com/global/images/magic/general/tajuru_archer.jpg
SVar:Rarity:Uncommon
SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/185.jpg
End

3
res/cardsfolder/tempest_owl.txt
View File

@@ -9,4 +9,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigTap:AB$Tap | Cost$ 0 | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Select up to three target permanents | ValidTgts$ Permanent
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/tempest_owl.jpg
End
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/72.jpg
End

1
res/cardsfolder/torch_slinger.txt
View File

@@ -8,4 +8,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 2
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/torch_slinger.jpg
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/151.jpg
End

4
res/cardsfolder/zektar_shrine_expedition.txt
View File

@@ -8,5 +8,5 @@ SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/Zektar_Shrine_Expedition.jpg
End
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/155.jpg
End

35
src/forge/CardFactory_Creatures.java
View File

@@ -425,41 +425,6 @@ public class CardFactory_Creatures {
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Mudbutton Torchrunner")) {
final SpellAbility ability = new Ability(card, "0") {
@Override
public void resolve() {
if(getTargetCard() != null
&& CardFactoryUtil.canTarget(card, getTargetCard())) getTargetCard().addDamage(3, card);
else getTargetPlayer().addDamage(3, card);
}
};
Command leavesPlay = new Command() {
private static final long serialVersionUID = 2740098107360213191L;
public void execute() {
if(card.getController().equals(AllZone.HumanPlayer)) AllZone.InputControl.setInput(CardFactoryUtil.input_targetCreaturePlayer(
ability, true, false));
else {
CardList list = CardFactoryUtil.AI_getHumanCreature(3, card, true);
CardListUtil.sortAttack(list);
if(MyRandom.percentTrue(50)) CardListUtil.sortFlying(list);
for(int i = 0; i < list.size(); i++)
if(2 <= list.get(i).getNetAttack()) ability.setTargetCard(list.get(i));
if(ability.getTargetCard() == null) ability.setTargetPlayer(AllZone.HumanPlayer);
AllZone.Stack.add(ability);
}
}//execute()
};//Command
card.addDestroyCommand(leavesPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Crater Hellion")) {
final SpellAbility ability = new Ability(card, "0") {

18
src/forge/CombatUtil.java
View File

@@ -754,8 +754,7 @@ public class CombatUtil {
public static void showCombat() {
AllZone.Display.showCombat("");
Card attack[] = AllZone.Combat.getAttackers();
Card defend[] = null;
StringBuilder display = new StringBuilder();
@@ -775,18 +774,19 @@ public class CombatUtil {
display.append("Defender - ");
display.append(defenders.get(def).toString());
display.append("\n");
int len = attackers[def].size();
//loop through attackers
for(int i = 0; i < len; i++) {
CardList list = attackers[def];
for(Card c : list){
//loop through attackers
display.append("-> ");
display.append(combatantToString(attack[i])).append("\n");
display.append(combatantToString(c)).append("\n");
defend = AllZone.Combat.getBlockers(attack[i]).toArray();
defend = AllZone.Combat.getBlockers(c).toArray();
//loop through blockers
for(int inner = 0; inner < defend.length; inner++) {
display.append("---< ");
display.append(" [ ");
display.append(combatantToString(defend[inner])).append("\n");
}
}//loop through attackers