*Corrected some scripts etbCounters->etbCounter.

*Added ThisTurnCast and ThisTurnNotCast to special conditions. See Hotheaded Giant for example.
*Added
	Dream Thief
	Goblin Cohort
	Hotheaded Giant
	Mogg Conscripts
	Soul Reap
This commit is contained in:
Hellfish
2011-10-18 08:49:02 +00:00
parent 6a136c54b7
commit b5f37803f3
12 changed files with 83 additions and 4 deletions

5
.gitattributes vendored
View File

@@ -2144,6 +2144,7 @@ res/cardsfolder/d/dream_fighter.txt -text
res/cardsfolder/d/dream_fracture.txt svneol=native#text/plain
res/cardsfolder/d/dream_prowler.txt svneol=native#text/plain
res/cardsfolder/d/dream_stalker.txt svneol=native#text/plain
res/cardsfolder/d/dream_thief.txt -text
res/cardsfolder/d/dream_thrush.txt -text
res/cardsfolder/d/dream_twist.txt -text
res/cardsfolder/d/dreamborn_muse.txt svneol=native#text/plain
@@ -3242,6 +3243,7 @@ res/cardsfolder/g/goblin_chariot.txt svneol=native#text/plain
res/cardsfolder/g/goblin_chieftain.txt svneol=native#text/plain
res/cardsfolder/g/goblin_chirurgeon.txt svneol=native#text/plain
res/cardsfolder/g/goblin_clearcutter.txt svneol=native#text/plain
res/cardsfolder/g/goblin_cohort.txt -text
res/cardsfolder/g/goblin_commando.txt svneol=native#text/plain
res/cardsfolder/g/goblin_deathraiders.txt svneol=native#text/plain
res/cardsfolder/g/goblin_digging_team.txt svneol=native#text/plain
@@ -3776,6 +3778,7 @@ res/cardsfolder/h/horror_of_horrors.txt svneol=native#text/plain
res/cardsfolder/h/horseshoe_crab.txt svneol=native#text/plain
res/cardsfolder/h/hostile_realm.txt svneol=native#text/plain
res/cardsfolder/h/hot_springs.txt svneol=native#text/plain
res/cardsfolder/h/hotheaded_giant.txt -text
res/cardsfolder/h/hoverguard_observer.txt svneol=native#text/plain
res/cardsfolder/h/hoverguard_sweepers.txt svneol=native#text/plain
res/cardsfolder/h/hovermyr.txt svneol=native#text/plain
@@ -5116,6 +5119,7 @@ res/cardsfolder/m/mobilization.txt svneol=native#text/plain
res/cardsfolder/m/mobilize.txt svneol=native#text/plain
res/cardsfolder/m/mogg_alarm.txt svneol=native#text/plain
res/cardsfolder/m/mogg_bombers.txt svneol=native#text/plain
res/cardsfolder/m/mogg_conscripts.txt -text
res/cardsfolder/m/mogg_fanatic.txt svneol=native#text/plain
res/cardsfolder/m/mogg_hollows.txt svneol=native#text/plain
res/cardsfolder/m/mogg_jailer.txt svneol=native#text/plain
@@ -7483,6 +7487,7 @@ res/cardsfolder/s/soul_manipulation.txt svneol=native#text/plain
res/cardsfolder/s/soul_net.txt svneol=native#text/plain
res/cardsfolder/s/soul_of_magma.txt svneol=native#text/plain
res/cardsfolder/s/soul_parry.txt svneol=native#text/plain
res/cardsfolder/s/soul_reap.txt -text
res/cardsfolder/s/soul_rend.txt svneol=native#text/plain
res/cardsfolder/s/soul_scourge.txt svneol=native#text/plain
res/cardsfolder/s/soul_shepherd.txt svneol=native#text/plain

View File

@@ -0,0 +1,13 @@
Name:Dream Thief
ManaCost:2 U
Types:Creature Faerie Rogue
Text:no text
PT:2/1
K:Flying
T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card if you've cast another blue spell this turn.
SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | CheckSVar$ X
SVar:X:Count$ThisTurnCast Card.Other+Blue+YouCtrl
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_thief.jpg
SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/20.jpg
End

View File

@@ -11,4 +11,5 @@ SVar:RemRandomDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/ethersworn_canonist.jpg
Oracle:Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells.
SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/10.jpg
End

View File

@@ -3,7 +3,7 @@ ManaCost:W
Types:Enchantment Aura
Text:no text
K:Enchant creature
K:etbCounters:HEALING:4
K:etbCounter:HEALING:4
A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump
A:AB$ PreventDamage | Cost$ SubCounter<1/HEALING> | Defined$ Enchanted | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to enchanted creature this turn.
A:AB$ PutCounter | Cost$ 2 W | CounterType$ HEALING | CounterNum$ 1 | SpellDescription$ Put a healing counter on CARDNAME.

View File

@@ -0,0 +1,12 @@
Name:Goblin Cohort
ManaCost:R
Types:Creature Goblin Warrior
Text:no text
PT:2/2
S:Mode$ Continuous | AffectedCards$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn.
SVar:X:Count$ThisTurnCast Creature.YouCtrl
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_cohort.jpg
Oracle:Goblin Cohort can't attack unless you've cast a creature spell this turn.
SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/106.jpg
End

View File

@@ -0,0 +1,12 @@
Name:Hotheaded Giant
ManaCost:3 R
Types:Creature Giant Warrior
Text:no text
PT:4/4
K:Haste
K:etbCounter:M1M1:2:ThisTurnNotCast Card.Red+Other+YouCtrl:CARDNAME enters the battlefield with two -1/-1 counters on it unless you've cast another red spell this turn.
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/hotheaded_giant.jpg
Oracle:Haste\nHotheaded Giant enters the battlefield with two -1/-1 counters on it unless you've cast another red spell this turn.
SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/57.jpg
End

View File

@@ -0,0 +1,12 @@
Name:Mogg Conscripts
ManaCost:R
Types:Creature Goblin
Text:no text
PT:2/2
S:Mode$ Continuous | AffectedCards$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn.
SVar:X:Count$ThisTurnCast Creature.YouCtrl
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_conscripts.jpg
Oracle:Mogg Conscripts can't attack unless you've cast a creature spell this turn.
SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/189.jpg
End

View File

@@ -3,7 +3,7 @@ ManaCost:3 UR
Types:Creature Elemental
Text:no text
PT:6/6
K:etbCounters:M1M1:4
K:etbCounter:M1M1:4
T:Mode$ SpellCast | ValidCard$ Card.Red | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a red spell, remove a -1/-1 counter from CARDNAME.
T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a blue spell, remove a -1/-1 counter from CARDNAME.
SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1

View File

@@ -0,0 +1,12 @@
Name:Soul Reap
ManaCost:1 B
Types:Sorcery
Text:no text
A:SP$Destroy | Cost$ 1 B | ValidTgts$ Creature.nonGreen | TgtPrompt$ Select target nongreen creature. | SubAbility$ DBLoseLife | SpellDescription$ Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
SVar:DBLoseLife:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 3 | CheckSVar$ X
SVar:X:Count$ThisTurnCast Card.Black+Other+YouCtrl
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_reap.jpg
SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/44.jpg
Oracle:Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
End

View File

@@ -3,7 +3,7 @@ ManaCost:3 G G
Types:Creature Spike
Text:no text
PT:0/0
K:etbCounters:P1P1:3
K:etbCounter:P1P1:3
A:AB$ PutCounter | Cost$ 2 SubCounter<1/P1P1> | Tgt$ TgtC | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
A:AB$ Animate | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Land | TgtPrompt$ Choose target land. | Power$ 2 | Toughness$ 2 | Types$ Creature | Permanent$ True | SubAbility$ SVar=DBPutCounter | SpellDescription$ Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it.
SVar:DBPutCounter:DB$PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1

View File

@@ -3,7 +3,7 @@ ManaCost:4 W
Types:Creature Spirit Bear
Text:no text
PT:3/3
K:etbCounters:HEALING:4
K:etbCounter:HEALING:4
A:AB$ PreventDamage | Cost$ SubCounter<1/HEALING> | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
A:AB$ PutCounter | Cost$ 2 W | CounterType$ HEALING | CounterNum$ 1 | SpellDescription$ Put a healing counter on CARDNAME.
SVar:Rarity:Uncommon

View File

@@ -1580,6 +1580,18 @@ public final class GameActionUtil {
return false;
}
}
if (specialConditions.contains("ThisTurnCast")) {
String valid = specialConditions.split(" ")[1];
if(CardUtil.getThisTurnCast(valid, sourceCard).size() == 0) {
return false;
}
}
if(specialConditions.contains("ThisTurnNotCast")) {
String valid = specialConditions.split(" ")[1];
if(CardUtil.getThisTurnCast(valid, sourceCard).size() != 0) {
return false;
}
}
return true;
}