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

- Fixed Tithe

Browse Source 
- updated some scripts
- removed unused imports
This commit is contained in:
swordshine
2013-08-06 08:58:51 +00:00
parent 47faabd7f6
commit 47db405dd5
8 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/r/rackling.txt
View File

@@ -2,8 +2,8 @@ Name:Rackling
ManaCost:4
Types:Artifact Creature Construct
PT:2/2
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.YouDontCtrl | PresentZone$ Hand | PresentCompare$ LT3 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ X | References$ X
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Opponent | IsPresent$ Card.YouDontCtrl | PresentZone$ Hand | PresentCompare$ LT3 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
SVar:X:TriggeredPlayer$CardsInHand/NMinus.3
SVar:Picture:http://www.wizards.com/global/images/magic/general/rackling.jpg
Oracle:At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in his or her hand.

9
res/cardsfolder/t/tithe.txt
View File

@@ -1,8 +1,11 @@
Name:Tithe
ManaCost:W
Types:Instant
A:SP$ ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 1 | Shuffle$ True | SpellDescription$ Search your library for a Plains card.
A:SP$ ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 2 | Shuffle$ True | IsPresent$ Land.YouCtrl | PresentCompare$ LTX | References$ X | SpellDescription$ If you control fewer lands than an opponent, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
SVar:X:Count$Valid Land.OppCtrl
A:SP$ Pump | Cost$ W | ValidTgts$ Opponent | StackDescription$ None | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ X | References$ X,Y,Z,MoreLand | Shuffle$ True
SVar:X:Count$Compare MoreLand GE1.2.1
SVar:Y:Count$Valid Land.YouCtrl
SVar:Z:Count$Valid Land.TargetedPlayerCtrl
SVar:MoreLand:SVar$Z/Minus.Y
SVar:Picture:http://www.wizards.com/global/images/magic/general/tithe.jpg
Oracle:Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.

6
res/cardsfolder/u/urborg_stalker.txt
View File

@@ -2,9 +2,7 @@ Name:Urborg Stalker
ManaCost:3 B
Types:Creature Horror
PT:2/4
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Permanent.nonBlack+nonLand+YouCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamageYou | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Permanent.nonBlack+nonLand+YouDontCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | Secondary$ True | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
SVar:TrigDamageYou:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
SVar:TrigDamageOpp:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | IsPresent$ Permanent.nonBlack+nonLand+ActivePlayerCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_stalker.jpg
Oracle:At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, Urborg Stalker deals 1 damage to that player.

6
res/cardsfolder/w/walking_archive.txt
View File

@@ -4,11 +4,9 @@ Types:Artifact Creature Golem
PT:1/1
K:etbCounter:P1P1:1
K:Defender
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigYouDraw | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigOppDraw | Secondary$ True | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
A:AB$ PutCounter | Cost$ 2 W U | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
SVar:TrigYouDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ You | References$ X
SVar:TrigOppDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ Opponent | References$ X
SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ X | Defined$ TriggeredPlayer | References$ X
SVar:X:Count$CardCounters.P1P1
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/walking_archive.jpg

1
src/main/java/forge/game/GameActionUtil.java
View File

@@ -32,7 +32,6 @@ import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.CardUtil;
import forge.Command;
import forge.Constant;
import forge.CounterType;

2
src/main/java/forge/game/GameNew.java
View File

@@ -19,9 +19,7 @@ import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.GameLogEntryType;
import forge.Singletons;
import forge.card.CardDb;
import forge.card.CardEdition;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler;
import forge.deck.CardPool;

2
src/main/java/forge/gui/match/controllers/CPicture.java
View File

@@ -25,13 +25,11 @@ import forge.Card;
import forge.CardCharacteristicName;
import forge.Command;
import forge.Singletons;
import forge.card.CardEdition;
import forge.gui.framework.ICDoc;
import forge.gui.match.views.VPicture;
import forge.gui.toolbox.special.CardZoomer;
import forge.item.IPaperCard;
import forge.item.InventoryItem;
import forge.util.MyRandom;
/**
* Controls the card picture panel in the match UI.

10
src/main/java/forge/gui/match/nonsingleton/CCommand.java
View File

@@ -17,19 +17,9 @@
*/
package forge.gui.match.nonsingleton;
import java.awt.Event;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import forge.Card;
import forge.Command;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.gui.framework.ICDoc;
import forge.gui.match.CMatchUI;
import forge.gui.match.controllers.CMessage;
/**
* Controls Swing components of a player's command instance.
*/