Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cmake

Browse Source
This commit is contained in:
xawotihs
2016-06-26 11:25:23 +02:00
parent 47704f7591 0b1be02c38
commit a23b96ba75
18 changed files with 4664 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
CHANGELOG.md
View File

@@ -1,6 +1,67 @@
# Changelog
## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
#### 6/23/16
- *Merged pull-request:* Fix producecolor:color [#\704] (https://github.com/WagicProject/wagic/pull/704) ([kevlahnota](https://github.com/kevlahnota))
#### 6/17/16
- *Merged pull-request:* Force Mounting 2 [#\699] (https://github.com/WagicProject/wagic/pull/699) ([kevlahnota](https://github.com/kevlahnota))
#### 6/16/16
- *Merged pull-request:* Import Deck Options [#\697] (https://github.com/WagicProject/wagic/pull/697) ([kevlahnota](https://github.com/kevlahnota))
#### 6/11/16
- *Merged pull-request:* Refactor & Devotion [#\690] (https://github.com/WagicProject/wagic/pull/690) ([kevlahnota](https://github.com/kevlahnota))
#### 6/3/16
- *Merged pull-request:* Cost Increaser & Reducer Fix [#\676] (https://github.com/WagicProject/wagic/pull/676) ([kevlahnota](https://github.com/kevlahnota))
#### 5/30/16
- *Fixed Bug:* deckstats crash when "unlock cards" is used [#\668] (https://github.com/WagicProject/wagic/issues/668) ([zethfoxster](https://github.com/zethfoxster))
#### 5/26/16
- *Closed issue:* Nasty memleak crashing devices and its fix. [#\664] (https://github.com/WagicProject/wagic/issues/664) ([zethfoxster](https://github.com/zethfoxster))
#### 11/08/15
- *Merged pull-request:* produce mana for lands you/opponent could produce [#\658] (https://github.com/WagicProject/wagic/pull/658) ([kevlahnota](https://github.com/kevlahnota))
#### 11/07/15
- *Merged pull-request:* Manacost Changes, Anyzone for CDA, PayZero Cost [#\656] (https://github.com/WagicProject/wagic/pull/656) ([kevlahnota](https://github.com/kevlahnota))
#### 10/31/15
- *Merged pull-request:* Exile Zone, Altercost and Hand modifier [#\653] (https://github.com/WagicProject/wagic/pull/653) ([kevlahnota](https://github.com/kevlahnota))
#### 10/17/15
- *Merged pull-request:* Fix issue #473 #784 [#\646] (https://github.com/WagicProject/wagic/pull/646) ([kevlahnota](https://github.com/kevlahnota))
#### 10/15/15
- *Merged pull-request:* Bug Fix: Planeswalker Rule & ABlink return to play ability for Aura cards [#\644] (https://github.com/WagicProject/wagic/pull/644) ([kevlahnota](https://github.com/kevlahnota))
#### 10/14/15
- *Merged pull-request:* Fix Legend Rule [#\643] (https://github.com/WagicProject/wagic/pull/643) ([kevlahnota](https://github.com/kevlahnota))
#### 10/12/15
- *Merged pull-request:* Fix crash bug, support doubled res texture for background, avatars, menutitle [#\641] (https://github.com/WagicProject/wagic/pull/641) ([kevlahnota](https://github.com/kevlahnota))
#### 10/02/15
- *Merged pull-request:* LKI for power, toughness and basic abilities, produceextra ability [#\636] (https://github.com/WagicProject/wagic/pull/636) ([kevlahnota](https://github.com/kevlahnota))
#### 09/29/15
- *Merged pull-request:* Fix Recover Cards, Cloner, Copier, and Preliminary support for Madness [#\635] (https://github.com/WagicProject/wagic/pull/635) ([kevlahnota](https://github.com/kevlahnota))
#### 09/22/15
- *Merged pull-request:* Auraward, unattach event and statebased action for protection from quality [#\631] (https://github.com/WagicProject/wagic/pull/631) ([kevlahnota](https://github.com/kevlahnota))
#### 09/19/15
- *Merged pull-request:* PT Switch like Layer 7e and Token Indicator [#\626] (https://github.com/WagicProject/wagic/pull/626) ([kevlahnota](https://github.com/kevlahnota))
#### 09/18/15
- *Merged pull-request:* Token Cloning fix and colored PT [#\624] (https://github.com/WagicProject/wagic/pull/624) ([kevlahnota](https://github.com/kevlahnota))
#### 09/15/15
- *Merged pull-request:* CDA and X manacost on stack [\#623] (https://github.com/WagicProject/wagic/pull/623) ([kevlahnota](https://github.com/kevlahnota))
#### 08/12/14
- *Merged pull-request:* Fix for guild_keywords Devotion, added some "Chroma" cards [\#606](https://github.com/WagicProject/wagic/pull/606) ([kevlahnota](https://github.com/kevlahnota))

56
projects/mtg/Android/src/net/wagic/utils/StorageOptions.java
View File

@@ -25,10 +25,14 @@ public class StorageOptions
public static void determineStorageOptions()
{
initializeMountPoints();
readMountsFileTest();
if (findForcemount()){
readMountsFileTest();
}
readMountsFile();
readVoldFile();
removeDuplicates(mMounts);
if (findForcemount()){
removeDuplicates(mMounts);
}
compareMountsWithVold();
testAndCleanMountsList();
setProperties();
@@ -201,7 +205,7 @@ public class StorageOptions
mMounts.remove(i--);
}
if (t == 0 && Build.VERSION.SDK_INT >= 16)
if (t == 0 && Build.VERSION.SDK_INT >= 16 && findForcemount())
{//if none is found lets force it for Jellybean and above...
if (System.getenv("EXTERNAL_STORAGE") != null)
{
@@ -250,16 +254,28 @@ public class StorageOptions
ArrayList<String> mLabels = new ArrayList<String>();
int i = 1;
for (String path : mMounts)
{ // TODO: /mnt/sdcard is assumed to always mean internal storage. Use this comparison until there is a better way to do this
if ("/mnt/sdcard".equalsIgnoreCase(path) || "/storage/sdcard0".equalsIgnoreCase(path))
mLabels.add("Internal SD " + "[" + path + "]");
else if (path.contains("emulated"))
mLabels.add("Emulated SD " + " [" + path + "]");
else
mLabels.add("External SD " + " [" + path + "]");
if(findForcemount()){
for (String path : mMounts)
{//with forcemount menu
if ("/mnt/sdcard".equalsIgnoreCase(path) || "/storage/sdcard0".equalsIgnoreCase(path))
mLabels.add("Internal SD " + "[" + path + "]");
else if (path.contains("emulated"))
mLabels.add("Emulated SD " + " [" + path + "]");
else
mLabels.add("External SD " + " [" + path + "]");
}
}
else
{
for (String path : mMounts)
{ // TODO: /mnt/sdcard is assumed to always mean internal storage. Use this comparison until there is a better way to do this
if ("/mnt/sdcard".equalsIgnoreCase(path))
mLabels.add("Built-in Storage");
else
mLabels.add("External SD Card " + i++);
}
}
labels = new String[mLabels.size()];
mLabels.toArray(labels);
@@ -358,4 +374,20 @@ public class StorageOptions
return executedSuccesfully;
}
private static boolean findForcemount(){
try
{
File file = new File(System.getenv("EXTERNAL_STORAGE")+"/forcemount");
if (file.exists())
{
return true;
}
}
catch (Exception e1)
{
return false;
}
return false;
}
}

6
projects/mtg/bin/Res/ai/baka/deck104.txt
View File

@@ -1,5 +1,11 @@
#NAME:Kill by Numbers
#DESC:They just keep multiplying.
#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
#HINT:dontattackwith(Rhys the Redeemed)
#HINT:dontblockwith(Rhys the Redeemed)
#HINT:dontattackwith(Kazandu Tuskcaller)
#HINT:dontblockwith(Kazandu Tuskcaller)
Mox Emerald (LEA) *2
Mox Pearl (LEA) *2
Forest (LEA) *15

1550
projects/mtg/bin/Res/sets/BFZ/_cards.dat Normal file
View File

File diff suppressed because it is too large Load Diff

10
projects/mtg/bin/Res/sets/CSP/_cards.dat
View File

@@ -601,27 +601,27 @@ rarity=C
[card]
primitive=Snow-Covered Forest
id=121192
rarity=C
rarity=L
[/card]
[card]
primitive=Snow-Covered Island
id=121130
rarity=C
rarity=L
[/card]
[card]
primitive=Snow-Covered Mountain
id=121233
rarity=C
rarity=L
[/card]
[card]
primitive=Snow-Covered Plains
id=121267
rarity=C
rarity=L
[/card]
[card]
primitive=Snow-Covered Swamp
id=121256
rarity=C
rarity=L
[/card]
[card]
primitive=Soul Spike

110
projects/mtg/bin/Res/sets/DTK/_cards.dat
View File

@@ -444,8 +444,18 @@ rarity=R
[/card]
[card]
primitive=Forest
id=394573
rarity=L
[/card]
[card]
primitive=Forest
id=394574
rarity=L
[/card]
[card]
primitive=Forest
id=394575
rarity=C
rarity=L
[/card]
[card]
primitive=Foul Renewal
@@ -584,8 +594,18 @@ rarity=R
[/card]
[card]
primitive=Island
id=394603
rarity=L
[/card]
[card]
primitive=Island
id=394604
rarity=L
[/card]
[card]
primitive=Island
id=394605
rarity=C
rarity=L
[/card]
[card]
primitive=Keeper of the Lens
@@ -700,7 +720,17 @@ rarity=C
[card]
primitive=Mountain
id=394628
rarity=C
rarity=L
[/card]
[card]
primitive=Mountain
id=394629
rarity=L
[/card]
[card]
primitive=Mountain
id=394630
rarity=L
[/card]
[card]
primitive=Mystic Meditation
@@ -795,7 +825,17 @@ rarity=R
[card]
primitive=Plains
id=394649
rarity=C
rarity=L
[/card]
[card]
primitive=Plains
id=394650
rarity=L
[/card]
[card]
primitive=Plains
id=394651
rarity=L
[/card]
[card]
primitive=Press the Advantage
@@ -1150,7 +1190,17 @@ rarity=R
[card]
primitive=Swamp
id=394722
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=394723
rarity=L
[/card]
[card]
primitive=Swamp
id=394724
rarity=L
[/card]
[card]
primitive=Swift Warkite
@@ -1272,53 +1322,3 @@ primitive=Zurgo Bellstriker
id=394748
rarity=R
[/card]
[card]
primitive=Forest
id=394573
rarity=C
[/card]
[card]
primitive=Forest
id=394574
rarity=C
[/card]
[card]
primitive=Island
id=394603
rarity=C
[/card]
[card]
primitive=Island
id=394604
rarity=C
[/card]
[card]
primitive=Mountain
id=394629
rarity=C
[/card]
[card]
primitive=Mountain
id=394630
rarity=C
[/card]
[card]
primitive=Plains
id=394650
rarity=C
[/card]
[card]
primitive=Plains
id=394651
rarity=C
[/card]
[card]
primitive=Swamp
id=394723
rarity=C
[/card]
[card]
primitive=Swamp
id=394724
rarity=C
[/card]

60
projects/mtg/bin/Res/sets/FRF/_cards.dat
View File

@@ -274,8 +274,13 @@ rarity=R
[/card]
[card]
primitive=Forest
id=391835
rarity=L
[/card]
[card]
primitive=Forest
id=391836
rarity=C
rarity=L
[/card]
[card]
primitive=Formless Nurturing
@@ -390,7 +395,12 @@ rarity=C
[card]
primitive=Island
id=391859
rarity=C
rarity=L
[/card]
[card]
primitive=Island
id=391860
rarity=L
[/card]
[card]
primitive=Jeskai Barricade
@@ -520,7 +530,12 @@ rarity=R
[card]
primitive=Mountain
id=391885
rarity=C
rarity=L
[/card]
[card]
primitive=Mountain
id=391886
rarity=L
[/card]
[card]
primitive=Neutralizing Blast
@@ -559,8 +574,13 @@ rarity=U
[/card]
[card]
primitive=Plains
id=391894
rarity=L
[/card]
[card]
primitive=Plains
id=391895
rarity=C
rarity=L
[/card]
[card]
primitive=Pressure Point
@@ -755,7 +775,12 @@ rarity=R
[card]
primitive=Swamp
id=391934
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=391935
rarity=L
[/card]
[card]
primitive=Swiftwater Cliffs
@@ -907,28 +932,3 @@ primitive=Yasova Dragonclaw
id=391965
rarity=R
[/card]
[card]
primitive=Forest
id=391835
rarity=C
[/card]
[card]
primitive=Island
id=391860
rarity=C
[/card]
[card]
primitive=Mountain
id=391886
rarity=C
[/card]
[card]
primitive=Plains
id=391894
rarity=C
[/card]
[card]
primitive=Swamp
id=391935
rarity=C
[/card]

40
projects/mtg/bin/Res/sets/M14/_cards.dat
View File

@@ -416,22 +416,22 @@ rarity=C
[card]
primitive=Forest
id=370598
rarity=C
rarity=L
[/card]
[card]
primitive=Forest
id=370729
rarity=C
rarity=L
[/card]
[card]
primitive=Forest
id=370756
rarity=C
rarity=L
[/card]
[card]
primitive=Forest
id=370771
rarity=C
rarity=L
[/card]
[card]
primitive=Fortify
@@ -556,22 +556,22 @@ rarity=R
[card]
primitive=Island
id=370608
rarity=C
rarity=L
[/card]
[card]
primitive=Island
id=370611
rarity=C
rarity=L
[/card]
[card]
primitive=Island
id=370647
rarity=C
rarity=L
[/card]
[card]
primitive=Island
id=370773
rarity=C
rarity=L
[/card]
[card]
primitive=Jace, Memory Adept
@@ -696,22 +696,22 @@ rarity=U
[card]
primitive=Mountain
id=370583
rarity=C
rarity=L
[/card]
[card]
primitive=Mountain
id=370588
rarity=C
rarity=L
[/card]
[card]
primitive=Mountain
id=370591
rarity=C
rarity=L
[/card]
[card]
primitive=Mountain
id=370725
rarity=C
rarity=L
[/card]
[card]
primitive=Mutavault
@@ -791,22 +791,22 @@ rarity=C
[card]
primitive=Plains
id=370615
rarity=C
rarity=L
[/card]
[card]
primitive=Plains
id=370669
rarity=C
rarity=L
[/card]
[card]
primitive=Plains
id=370679
rarity=C
rarity=L
[/card]
[card]
primitive=Plains
id=370754
rarity=C
rarity=L
[/card]
[card]
primitive=Planar Cleansing
@@ -1076,22 +1076,22 @@ rarity=C
[card]
primitive=Swamp
id=370703
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=370727
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=370731
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=370785
rarity=C
rarity=L
[/card]
[card]
primitive=Syphon Sliver

990
projects/mtg/bin/Res/sets/OGW/_cards.dat Normal file
View File

@@ -0,0 +1,990 @@
[meta]
author=Wagic Team
name=Oath of the Gatewatch
year=2016
[/meta]
[card]
primitive=Abstruse Interference
id=407550
rarity=C
[/card]
[card]
primitive=Affa Protector
id=407524
rarity=C
[/card]
[card]
primitive=Akoum Flameseeker
id=407611
rarity=C
[/card]
[card]
primitive=Allied Reinforcements
id=407525
rarity=U
[/card]
[card]
primitive=Ancient Crab
id=407560
rarity=C
[/card]
[card]
primitive=Angel
id=-407535
rarity=T
[/card]
[card]
primitive=Ayli, Eternal Pilgrim
id=407661
rarity=R
[/card]
[card]
primitive=Baloth Null
id=407662
rarity=U
[/card]
[card]
primitive=Baloth Pup
id=407637
rarity=U
[/card]
[card]
primitive=Bearer of Silence
id=407577
rarity=R
[/card]
[card]
primitive=Birthing Hulk
id=407631
rarity=U
[/card]
[card]
primitive=Blinding Drone
id=407551
rarity=C
[/card]
[card]
primitive=Bonds of Mortality
id=407638
rarity=U
[/card]
[card]
primitive=Bone Saw
id=407671
rarity=C
[/card]
[card]
primitive=Boulder Salvo
id=407612
rarity=C
[/card]
[card]
primitive=Brute Strength
id=407613
rarity=C
[/card]
[card]
primitive=Call the Gatewatch
id=407526
rarity=R
[/card]
[card]
primitive=Canopy Gorger
id=407639
rarity=C
[/card]
[card]
primitive=Captain's Claws
id=407672
rarity=R
[/card]
[card]
primitive=Chandra, Flamecaller
id=407614
rarity=M
[/card]
[card]
primitive=Chitinous Cloak
id=407673
rarity=U
[/card]
[card]
primitive=Cinder Barrens
id=407678
rarity=U
[/card]
[card]
primitive=Cinder Hellion
id=407615
rarity=C
[/card]
[card]
primitive=Cliffhaven Vampire
id=407663
rarity=U
[/card]
[card]
primitive=Comparative Analysis
id=407561
rarity=C
[/card]
[card]
primitive=Consuming Sinkhole
id=407604
rarity=C
[/card]
[card]
primitive=Containment Membrane
id=407562
rarity=C
[/card]
[card]
primitive=Corpse Churn
id=407593
rarity=C
[/card]
[card]
primitive=Corrupted Crossroads
id=407679
rarity=R
[/card]
[card]
primitive=Crumbling Vestige
id=407680
rarity=C
[/card]
[card]
primitive=Crush of Tentacles
id=407563
rarity=M
[/card]
[card]
primitive=Cultivator Drone
id=407552
rarity=C
[/card]
[card]
primitive=Cyclone Sire
id=407564
rarity=U
[/card]
[card]
primitive=Dazzling Reflection
id=407527
rarity=C
[/card]
[card]
primitive=Deceiver of Form
id=407511
rarity=R
[/card]
[card]
primitive=Deepfathom Skulker
id=407553
rarity=R
[/card]
[card]
primitive=Devour in Flames
id=407616
rarity=U
[/card]
[card]
primitive=Dimensional Infiltrator
id=407554
rarity=R
[/card]
[card]
primitive=Drana's Chosen
id=407594
rarity=R
[/card]
[card]
primitive=Dread Defiler
id=407578
rarity=R
[/card]
[card]
primitive=Eldrazi Aggressor
id=407605
rarity=C
[/card]
[card]
primitive=Eldrazi Displacer
id=407523
rarity=R
[/card]
[card]
primitive=Eldrazi Mimic
id=407512
rarity=R
[/card]
[card]
primitive=Eldrazi Obligator
id=407606
rarity=R
[/card]
[card]
primitive=Eldrazi Scion
id=-407522
rarity=T
[/card]
[card]
primitive=Eldrazi Scion
id=-407587
rarity=T
[/card]
[card]
primitive=Elemental
id=-407614
rarity=T
[/card]
[card]
primitive=Elemental
id=-407653
rarity=T
[/card]
[card]
primitive=Elemental Uprising
id=407640
rarity=C
[/card]
[card]
primitive=Embodiment of Fury
id=407617
rarity=U
[/card]
[card]
primitive=Embodiment of Insight
id=407641
rarity=U
[/card]
[card]
primitive=Endbringer
id=407513
rarity=R
[/card]
[card]
primitive=Essence Depleter
id=407579
rarity=U
[/card]
[card]
primitive=Expedite
id=407618
rarity=C
[/card]
[card]
primitive=Expedition Raptor
id=407528
rarity=C
[/card]
[card]
primitive=Fall of the Titans
id=407619
rarity=R
[/card]
[card]
primitive=Flayer Drone
id=407658
rarity=U
[/card]
[card]
primitive=Flaying Tendrils
id=407580
rarity=U
[/card]
[card]
primitive=General Tazri
id=407529
rarity=M
[/card]
[card]
primitive=Gift of Tusks
id=407565
rarity=U
[/card]
[card]
primitive=Gladehart Cavalry
id=407642
rarity=R
[/card]
[card]
primitive=Goblin Dark-Dwellers
id=407620
rarity=R
[/card]
[card]
primitive=Goblin Freerunner
id=407621
rarity=C
[/card]
[card]
primitive=Grasp of Darkness
id=407595
rarity=U
[/card]
[card]
primitive=Gravity Negator
id=407555
rarity=C
[/card]
[card]
primitive=Grip of the Roil
id=407566
rarity=U
[/card]
[card]
primitive=Harvester Troll
id=407643
rarity=U
[/card]
[card]
primitive=Havoc Sower
id=407581
rarity=U
[/card]
[card]
primitive=Hedron Alignment
id=407567
rarity=R
[/card]
[card]
primitive=Hedron Crawler
id=407674
rarity=C
[/card]
[card]
primitive=Hissing Quagmire
id=407681
rarity=R
[/card]
[card]
primitive=Holdout Settlement
id=407682
rarity=C
[/card]
[card]
primitive=Immobilizer Eldrazi
id=407607
rarity=U
[/card]
[card]
primitive=Immolating Glare
id=407530
rarity=U
[/card]
[card]
primitive=Inverter of Truth
id=407582
rarity=M
[/card]
[card]
primitive=Iona's Blessing
id=407531
rarity=U
[/card]
[card]
primitive=Isolation Zone
id=407532
rarity=C
[/card]
[card]
primitive=Joraga Auxiliary
id=407664
rarity=U
[/card]
[card]
primitive=Jori En, Ruin Diver
id=407665
rarity=R
[/card]
[card]
primitive=Jwar Isle Avenger
id=407568
rarity=C
[/card]
[card]
primitive=Kalitas, Traitor of Ghet
id=407596
rarity=M
[/card]
[card]
primitive=Kazuul's Toll Collector
id=407622
rarity=U
[/card]
[card]
primitive=Knight Ally
id=-407525
rarity=T
[/card]
[card]
primitive=Kor Ally
id=-407540
rarity=T
[/card]
[card]
primitive=Kor Scythemaster
id=407533
rarity=C
[/card]
[card]
primitive=Kor Sky Climber
id=407534
rarity=C
[/card]
[card]
primitive=Kozilek's Pathfinder
id=407515
rarity=C
[/card]
[card]
primitive=Kozilek's Return
id=407608
rarity=M
[/card]
[card]
primitive=Kozilek's Shrieker
id=407583
rarity=C
[/card]
[card]
primitive=Kozilek's Translator
id=407584
rarity=C
[/card]
[card]
primitive=Kozilek, the Great Distortion
id=407514
rarity=M
[/card]
[card]
primitive=Lead by Example
id=407644
rarity=C
[/card]
[card]
primitive=Linvala, the Preserver
id=407535
rarity=M
[/card]
[card]
primitive=Loam Larva
id=407645
rarity=C
[/card]
[card]
primitive=Make a Stand
id=407536
rarity=U
[/card]
[card]
primitive=Makindi Aeronaut
id=407537
rarity=C
[/card]
[card]
primitive=Malakir Soothsayer
id=407597
rarity=U
[/card]
[card]
primitive=Matter Reshaper
id=407516
rarity=R
[/card]
[card]
primitive=Maw of Kozilek
id=407609
rarity=C
[/card]
[card]
primitive=Meandering River
id=407683
rarity=U
[/card]
[card]
primitive=Mighty Leap
id=407538
rarity=C
[/card]
[card]
primitive=Mina and Denn, Wildborn
id=407666
rarity=R
[/card]
[card]
primitive=Mindmelter
id=407659
rarity=U
[/card]
[card]
primitive=Mirrorpool
id=407684
rarity=M
[/card]
[card]
primitive=Munda's Vanguard
id=407539
rarity=R
[/card]
[card]
primitive=Natural State
id=407646
rarity=C
[/card]
[card]
primitive=Needle Spires
id=407685
rarity=R
[/card]
[card]
primitive=Negate
id=407569
rarity=C
[/card]
[card]
primitive=Netcaster Spider
id=407647
rarity=C
[/card]
[card]
primitive=Nissa's Judgment
id=407649
rarity=U
[/card]
[card]
primitive=Nissa, Voice of Zendikar
id=407648
rarity=M
[/card]
[card]
primitive=Null Caller
id=407598
rarity=U
[/card]
[card]
primitive=Oath of Chandra
id=407623
rarity=R
[/card]
[card]
primitive=Oath of Gideon
id=407540
rarity=R
[/card]
[card]
primitive=Oath of Jace
id=407570
rarity=R
[/card]
[card]
primitive=Oath of Nissa
id=407650
rarity=R
[/card]
[card]
primitive=Oblivion Strike
id=407585
rarity=C
[/card]
[card]
primitive=Octopus
id=-407563
rarity=T
[/card]
[card]
primitive=Ondu War Cleric
id=407541
rarity=C
[/card]
[card]
primitive=Overwhelming Denial
id=407571
rarity=R
[/card]
[card]
primitive=Plant
id=-407648
rarity=T
[/card]
[card]
primitive=Press into Service
id=407624
rarity=U
[/card]
[card]
primitive=Prophet of Distortion
id=407556
rarity=U
[/card]
[card]
primitive=Pulse of Murasa
id=407651
rarity=C
[/card]
[card]
primitive=Pyromancer's Assault
id=407625
rarity=U
[/card]
[card]
primitive=Reality Hemorrhage
id=407610
rarity=C
[/card]
[card]
primitive=Reality Smasher
id=407517
rarity=R
[/card]
[card]
primitive=Reaver Drone
id=407586
rarity=U
[/card]
[card]
primitive=Reckless Bushwhacker
id=407626
rarity=U
[/card]
[card]
primitive=Reflector Mage
id=407667
rarity=U
[/card]
[card]
primitive=Relentless Hunter
id=407668
rarity=U
[/card]
[card]
primitive=Relief Captain
id=407542
rarity=U
[/card]
[card]
primitive=Remorseless Punishment
id=407599
rarity=R
[/card]
[card]
primitive=Roiling Waters
id=407572
rarity=U
[/card]
[card]
primitive=Ruin in Their Wake
id=407632
rarity=U
[/card]
[card]
primitive=Ruins of Oran-Rief
id=407686
rarity=R
[/card]
[card]
primitive=Saddleback Lagac
id=407652
rarity=C
[/card]
[card]
primitive=Scion Summoner
id=407633
rarity=C
[/card]
[card]
primitive=Sea Gate Wreckage
id=407687
rarity=R
[/card]
[card]
primitive=Searing Light
id=407543
rarity=C
[/card]
[card]
primitive=Seed Guardian
id=407653
rarity=U
[/card]
[card]
primitive=Seer's Lantern
id=407675
rarity=C
[/card]
[card]
primitive=Shoulder to Shoulder
id=407544
rarity=C
[/card]
[card]
primitive=Sifter of Skulls
id=407587
rarity=R
[/card]
[card]
primitive=Sky Scourer
id=407588
rarity=C
[/card]
[card]
primitive=Slaughter Drone
id=407589
rarity=C
[/card]
[card]
primitive=Slip Through Space
id=407557
rarity=C
[/card]
[card]
primitive=Sparkmage's Gambit
id=407627
rarity=C
[/card]
[card]
primitive=Spatial Contortion
id=407518
rarity=U
[/card]
[card]
primitive=Spawnbinder Mage
id=407545
rarity=C
[/card]
[card]
primitive=Sphinx of the Final Word
id=407573
rarity=M
[/card]
[card]
primitive=Stalking Drone
id=407634
rarity=C
[/card]
[card]
primitive=Steppe Glider
id=407546
rarity=U
[/card]
[card]
primitive=Stone Haven Outfitter
id=407547
rarity=R
[/card]
[card]
primitive=Stoneforge Acolyte
id=407548
rarity=U
[/card]
[card]
primitive=Stoneforge Masterwork
id=407676
rarity=R
[/card]
[card]
primitive=Stormchaser Mage
id=407669
rarity=U
[/card]
[card]
primitive=Strider Harness
id=407677
rarity=U
[/card]
[card]
primitive=Submerged Boneyard
id=407688
rarity=U
[/card]
[card]
primitive=Sweep Away
id=407574
rarity=C
[/card]
[card]
primitive=Sylvan Advocate
id=407654
rarity=R
[/card]
[card]
primitive=Tajuru Pathwarden
id=407655
rarity=C
[/card]
[card]
primitive=Tar Snare
id=407600
rarity=C
[/card]
[card]
primitive=Tears of Valakut
id=407628
rarity=U
[/card]
[card]
primitive=Thought Harvester
id=407558
rarity=U
[/card]
[card]
primitive=Thought-Knot Seer
id=407519
rarity=R
[/card]
[card]
primitive=Timber Gorge
id=407689
rarity=U
[/card]
[card]
primitive=Tranquil Expanse
id=407690
rarity=U
[/card]
[card]
primitive=Tyrant of Valakut
id=407629
rarity=R
[/card]
[card]
primitive=Umara Entangler
id=407575
rarity=C
[/card]
[card]
primitive=Unity of Purpose
id=407576
rarity=U
[/card]
[card]
primitive=Unknown Shores
id=407691
rarity=C
[/card]
[card]
primitive=Unnatural Endurance
id=407590
rarity=C
[/card]
[card]
primitive=Untamed Hunger
id=407601
rarity=C
[/card]
[card]
primitive=Vampire Envoy
id=407602
rarity=C
[/card]
[card]
primitive=Vile Redeemer
id=407635
rarity=R
[/card]
[card]
primitive=Vines of the Recluse
id=407656
rarity=C
[/card]
[card]
primitive=Visions of Brutality
id=407591
rarity=U
[/card]
[card]
primitive=Void Grafter
id=407660
rarity=U
[/card]
[card]
primitive=Void Shatter
id=407559
rarity=U
[/card]
[card]
primitive=Walker of the Wastes
id=407520
rarity=U
[/card]
[card]
primitive=Wall of Resurgence
id=407549
rarity=U
[/card]
[card]
primitive=Wandering Fumarole
id=407692
rarity=R
[/card]
[card]
primitive=Warden of Geometries
id=407521
rarity=C
[/card]
[card]
primitive=Warping Wail
id=407522
rarity=U
[/card]
[card]
primitive=Wastes
id=407693
rarity=L
[/card]
[card]
primitive=Wastes
id=407694
rarity=L
[/card]
[card]
primitive=Wastes
id=407695
rarity=L
[/card]
[card]
primitive=Wastes
id=407696
rarity=L
[/card]
[card]
primitive=Weapons Trainer
id=407670
rarity=U
[/card]
[card]
primitive=Witness the End
id=407592
rarity=C
[/card]
[card]
primitive=World Breaker
id=407636
rarity=M
[/card]
[card]
primitive=Zada's Commando
id=407630
rarity=C
[/card]
[card]
primitive=Zendikar Resurgent
id=407657
rarity=R
[/card]
[card]
primitive=Zombie
id=-407594
rarity=T
[/card]
[card]
primitive=Zombie
id=-407598
rarity=T
[/card]
[card]
primitive=Zulaport Chainmage
id=407603
rarity=C
[/card]

161
projects/mtg/bin/Res/sets/ORI/_cards.dat
View File

@@ -435,8 +435,23 @@ rarity=U
[/card]
[card]
primitive=Forest
id=398421
rarity=L
[/card]
[card]
primitive=Forest
id=398454
rarity=L
[/card]
[card]
primitive=Forest
id=398570
rarity=C
rarity=L
[/card]
[card]
primitive=Forest
id=398617
rarity=L
[/card]
[card]
primitive=Foundry of the Consuls
@@ -595,8 +610,23 @@ rarity=U
[/card]
[card]
primitive=Island
id=398431
rarity=L
[/card]
[card]
primitive=Island
id=398477
rarity=L
[/card]
[card]
primitive=Island
id=398586
rarity=C
rarity=L
[/card]
[card]
primitive=Island
id=398664
rarity=L
[/card]
[card]
primitive=Jace, Telepath Unbound
@@ -770,8 +800,23 @@ rarity=R
[/card]
[card]
primitive=Mountain
id=398412
rarity=L
[/card]
[card]
primitive=Mountain
id=398425
rarity=L
[/card]
[card]
primitive=Mountain
id=398490
rarity=L
[/card]
[card]
primitive=Mountain
id=398510
rarity=C
rarity=L
[/card]
[card]
primitive=Murder Investigation
@@ -855,8 +900,23 @@ rarity=R
[/card]
[card]
primitive=Plains
id=398534
rarity=L
[/card]
[card]
primitive=Plains
id=398541
rarity=L
[/card]
[card]
primitive=Plains
id=398550
rarity=L
[/card]
[card]
primitive=Plains
id=398675
rarity=C
rarity=L
[/card]
[card]
primitive=Possessed Skaab
@@ -1090,8 +1150,23 @@ rarity=C
[/card]
[card]
primitive=Swamp
id=398472
rarity=L
[/card]
[card]
primitive=Swamp
id=398507
rarity=L
[/card]
[card]
primitive=Swamp
id=398555
rarity=C
rarity=L
[/card]
[card]
primitive=Swamp
id=398677
rarity=L
[/card]
[card]
primitive=Swift Reckoning
@@ -1313,79 +1388,3 @@ primitive=Zendikar's Roil
id=398518
rarity=U
[/card]
[card]
primitive=Forest
id=398421
rarity=C
[/card]
[card]
primitive=Forest
id=398454
rarity=C
[/card]
[card]
primitive=Forest
id=398617
rarity=C
[/card]
[card]
primitive=Island
id=398431
rarity=C
[/card]
[card]
primitive=Island
id=398477
rarity=C
[/card]
[card]
primitive=Island
id=398664
rarity=C
[/card]
[card]
primitive=Mountain
id=398412
rarity=C
[/card]
[card]
primitive=Mountain
id=398425
rarity=C
[/card]
[card]
primitive=Mountain
id=398490
rarity=C
[/card]
[card]
primitive=Plains
id=398534
rarity=C
[/card]
[card]
primitive=Plains
id=398541
rarity=C
[/card]
[card]
primitive=Plains
id=398550
rarity=C
[/card]
[card]
primitive=Swamp
id=398472
rarity=C
[/card]
[card]
primitive=Swamp
id=398507
rarity=C
[/card]
[card]
primitive=Swamp
id=398677
rarity=C
[/card]

1710
projects/mtg/bin/Res/sets/SOI/_cards.dat Normal file
View File

File diff suppressed because it is too large Load Diff

113
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -1224,7 +1224,7 @@ toughness=4
name=Agent of Erebos
auto=choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
auto=@movedto(enchantment|mybattlefield):choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
text=Constellation — Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard.
text=Constellation <EFBFBD> Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard.
mana={3}{B}
type=Enchantment Creature
subtype=Zombie
@@ -1701,7 +1701,7 @@ toughness=1
[card]
name=Akroan Conscriptor
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
text=Heroic — Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
mana={4}{R}
type=Creature
subtype=Human Shaman
@@ -1711,7 +1711,7 @@ toughness=2
[card]
name=Akroan Crusader
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):token(Soldier,Creature Soldier,1/1,red,haste) controller
text=Heroic — Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
mana={R}
type=Creature
subtype=Human Soldier
@@ -1754,7 +1754,7 @@ toughness=1
name=Akroan Line Breaker
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):2/0 ueot
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):intimidate ueot
text=Heroic — Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
mana={2}{R}
type=Creature
subtype=Human Warrior
@@ -8667,7 +8667,7 @@ toughness=3
[card]
name=Bellowing Saddlebrute
auto=ifnot raid then life:-4 controller
text=Raid — When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
text=Raid <EFBFBD> When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
mana={3}{B}
type=Creature
subtype=Orc Warrior
@@ -10485,7 +10485,7 @@ toughness=2
name=Bloodcrazed Hoplite
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
auto=@counteradded(1/1) from(this):counter(1/1,-1) target(creature|opponentbattlefield)
text=Heroic — Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
mana={1}{B}
type=Creature
subtype=Human Soldier
@@ -10792,7 +10792,7 @@ toughness=3
name=Bloodsoaked Champion
abilities=cantblock
autograveyard={1}{B}:moveTo(mybattlefield) restriction{raid}
text=Bloodsoaked Champion can't block. -- Raid — {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
text=Bloodsoaked Champion can't block. -- Raid <EFBFBD> {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
mana={B}
type=Creature
subtype=Human Warrior
@@ -12159,7 +12159,7 @@ auto={1}{G}{T}:name(+1/+1 counter) counter(1/1,1) target(creature)
auto={1}{G}{T}:name(2 damage to flyer) damage:2 target(creature[flying])
auto={1}{G}{T}:name(gain 3 life) life:3 controller
auto={1}{G}{T}:name(put up to 4 on bottom) bottomoflibrary target(<upto:4>*|mygraveyard)
text=Attacking creatures you control have deathtouch. -- {1}{G},{T}: Choose one — Put a +1/+1 counter on target creature; or Bow of Nylea deals 2 damage to target creature with flying; or you gain 3 life; or put up to four target cards from your graveyard on the bottom of your library in any order.
text=Attacking creatures you control have deathtouch. -- {1}{G},{T}: Choose one <EFBFBD> Put a +1/+1 counter on target creature; or Bow of Nylea deals 2 damage to target creature with flying; or you gain 3 life; or put up to four target cards from your graveyard on the bottom of your library in any order.
mana={1}{G}{G}
type=Legendary Enchantment Artifact
[/card]
@@ -18377,7 +18377,7 @@ auto=aslongas(island|mybattlefield) lord(creature|opponentbattlefield) transform
auto=aslongas(mountain|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
auto=aslongas(swamp|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
auto=aslongas(plains|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
text=Domain — Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
text=Domain <EFBFBD> Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
mana={3}{U}
type=Enchantment
[/card]
@@ -19925,7 +19925,7 @@ name=Crater's Claws
target=creature,player
auto=if type(creature[power=>4]|mybattlefield) then damage:2
auto=damage:X
text=Crater's Claws deals X damage to target creature or player. -- Ferocious — Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
text=Crater's Claws deals X damage to target creature or player. -- Ferocious <EFBFBD> Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
mana={R}{X}
type=Sorcery
[/card]
@@ -21940,7 +21940,7 @@ target=creature
auto=regenerate
auto=draw:1 controller
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then regenerate all(other creature|mybattlefield)
text=Regenerate target creature. Draw a card. (The next time the creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.) -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control.
text=Regenerate target creature. Draw a card. (The next time the creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.) -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control.
mana={2}{B}
type=Instant
[/card]
@@ -21948,7 +21948,7 @@ type=Instant
name=Dark Petition
auto=moveto(myhand) notatarget(*|mylibrary)
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then add{B}{B}{B}
text=Search your library for a card and put that card into your hand. Then shuffle your library. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
text=Search your library for a card and put that card into your hand. Then shuffle your library. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
mana={3}{B}{B}
type=Sorcery
[/card]
@@ -22548,7 +22548,7 @@ subtype=Aura
name=Dawnbringer Charioteers
abilities=flying,lifelink
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
text=Flying, lifelink -- Heroic —- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
text=Flying, lifelink -- Heroic <EFBFBD>- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
mana={2}{W}{W}
type=Creature
subtype=Human Soldier
@@ -25325,7 +25325,7 @@ auto={1}{E(*[instant;sorcery]|mygraveyard)}:name(counter noncreature unless pay
auto={1}{E(*[instant;sorcery]|mygraveyard)}:1/1 ueot
auto={1}{E(*[instant;sorcery]|mygraveyard)}:tap target(creature)
auto={1}{E(*[instant;sorcery]|mygraveyard)}:untap target(creature)
text={1}, Exile an instant or sorcery card from your graveyard: Choose one — -- • Counter target noncreature spell unless its controller pays {2}. -- • Disciple of the Ring gets +1/+1 until end of turn. -- • Tap target creature. -- • Untap target creature.
text={1}, Exile an instant or sorcery card from your graveyard: Choose one <EFBFBD> -- <EFBFBD> Counter target noncreature spell unless its controller pays {2}. -- <EFBFBD> Disciple of the Ring gets +1/+1 until end of turn. -- <EFBFBD> Tap target creature. -- <EFBFBD> Untap target creature.
mana={3}{U}{U}
type=Creature
subtype=Human Wizard
@@ -26024,7 +26024,7 @@ toughness=10
name=Doomwake Giant
auto=all(creature|opponentbattlefield) -1/-1
auto=@movedTo(enchantment|myBattlefield):all(creature|opponentbattlefield) -1/-1
text=Constellation — Whenever Doomwake Giant or another enchantment enters the battlefield under your control, creatures your opponents control get -1/-1 until end of turn.
text=Constellation <EFBFBD> Whenever Doomwake Giant or another enchantment enters the battlefield under your control, creatures your opponents control get -1/-1 until end of turn.
mana={4}{B}
type=Enchantment Creature
subtype=Giant
@@ -26998,7 +26998,7 @@ type=Sorcery
name=Dreadbringer Lampads
auto=name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
auto=@movedTo(enchantment|myBattlefield):name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
text=Constellation — Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
text=Constellation <EFBFBD> Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
mana={4}{B}
type=Enchantment Creature
subtype=Nymph
@@ -29010,7 +29010,7 @@ subtype=Shapeshifter
name=Eidolon of Blossoms
auto=draw:1
auto=@movedTo(enchantment|myBattlefield):draw:1
text=Constellation — Whenever Eidolon of Blossoms or another enchantment enters the battlefield under your control, draw a card.
text=Constellation <EFBFBD> Whenever Eidolon of Blossoms or another enchantment enters the battlefield under your control, draw a card.
mana={2}{G}{G}
type=Enchantment Creature
subtype=Spirit
@@ -32187,7 +32187,7 @@ name=Exquisite Firecraft
target=creature,player
auto=damage:4
auto=aslongas(*[instant;sorcery]|mygraveyard) nofizzle >1
text=Exquisite Firecraft deals 4 damage to target creature or player. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, Exquisite Firecraft can't be countered by spells or abilities.
text=Exquisite Firecraft deals 4 damage to target creature or player. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, Exquisite Firecraft can't be countered by spells or abilities.
mana={1}{R}{R}
type=Sorcery
[/card]
@@ -34124,7 +34124,7 @@ toughness=2
name=Fiery Impulse
target=creature
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then damage:3 else damage:2
text=Fiery Impulse deals 2 damage to target creature. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, Fiery Impulse deals 3 damage to that creature instead.
text=Fiery Impulse deals 2 damage to target creature. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, Fiery Impulse deals 3 damage to that creature instead.
mana={R}
type=Instant
[/card]
@@ -36367,7 +36367,7 @@ toughness=1
name=Forgeborn Oreads
auto=damage:1 target(creature,player)
auto=@movedTo(enchantment|myBattlefield):damage:1 target(creature,player)
text=Constellation — Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player.
text=Constellation <EFBFBD> Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player.
mana={2}{R}{R}
type=Enchantment Creature
subtype=Nymph
@@ -38091,14 +38091,13 @@ text=Red creatures get +1/+1. -- Whenever a Mountain is tapped for mana, its con
mana={4}
type=Artifact
[/card]
#producecolor looks for the color... maybe needs restriction...
[card]
name=Gauntlet of Power
auto=choice name(green) all(this) transforms((,newability[lord(creature[green]|battlefield) 1/1],newability[lord(forest[basic]|battlefield) producecolor:green])) forever
auto=choice name(blue) all(this) transforms((,newability[lord(creature[blue]|battlefield) 1/1],newability[lord(island[basic]|battlefield) producecolor:blue])) forever
auto=choice name(red) all(this) transforms((,newability[lord(creature[red]|battlefield) 1/1],newability[lord(mountain[basic]|battlefield) producecolor:red])) forever
auto=choice name(black) all(this) transforms((,newability[lord(creature[black]|battlefield) 1/1],newability[lord(swamp[basic]|battlefield) producecolor:black])) forever
auto=choice name(white) all(this) transforms((,newability[lord(creature[white]|battlefield) 1/1],newability[lord(plains[basic]|battlefield) producecolor:white])) forever
auto=choice name(green) all(this) transforms((,newability[lord(creature[green]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:green])) forever
auto=choice name(blue) all(this) transforms((,newability[lord(creature[blue]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:blue])) forever
auto=choice name(red) all(this) transforms((,newability[lord(creature[red]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:red])) forever
auto=choice name(black) all(this) transforms((,newability[lord(creature[black]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:black])) forever
auto=choice name(white) all(this) transforms((,newability[lord(creature[white]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:white])) forever
text=As Gauntlet of Power enters the battlefield, choose a color. -- Creatures of the chosen color get +1/+1. -- Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to his or her mana pool (in addition to the mana the land produces).
mana={5}
type=Artifact
@@ -39247,7 +39246,7 @@ toughness=1
[card]
name=Gideon's Phalanx
auto=if type(*[instant;sorcery]|mygraveyard)~lessthan~1 then token(Knight,Creature Knight,2/2,white,vigilance)*4 controller else token(Knight,Creature Knight,2/2,white,vigilance)*4 && all(creature|mybattlefield) indestructible ueot
text=Put four 2/2 white Knight creature tokens with vigilance onto the battlefield. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, creatures you control gain indestructible until end of turn.
text=Put four 2/2 white Knight creature tokens with vigilance onto the battlefield. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, creatures you control gain indestructible until end of turn.
mana={5}{W}{W}
type=Instant
[/card]
@@ -42699,7 +42698,7 @@ type=Sorcery
name=Grim Guardian
auto=life:-1 opponent
auto=@movedTo(enchantment|myBattlefield):life:-1 opponent
text=Constellation — Whenever Grim Guardian or another enchantment enters the battlefield under your control, each opponent loses 1 life.
text=Constellation <EFBFBD> Whenever Grim Guardian or another enchantment enters the battlefield under your control, each opponent loses 1 life.
mana={2}{B}
type=Enchantment Creature
subtype=Zombie
@@ -44599,7 +44598,7 @@ toughness=5
name=Harvestguard Alseids
auto=name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
auto=@movedto(enchantment|mybattlefield):name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
text=Constellation — Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
text=Constellation <EFBFBD> Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
mana={2}{W}
type=Enchantment Creature
subtype=Nymph
@@ -47469,7 +47468,7 @@ toughness=1
name=Humbler of Mortals
auto=all(creature|myBattlefield) trample ueot
auto=@movedTo(enchantment|myBattlefield):all(creature|myBattlefield) trample ueot
text=Constellation — Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
text=Constellation <EFBFBD> Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
mana={4}{G}{G}
type=Enchantment Creature
subtype=Elemental
@@ -48280,7 +48279,7 @@ name=Icy Blast
target=<prex>creature|battlefield
auto=tap
auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then frozen
text=Tap X target creatures. -- Ferocious — If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
text=Tap X target creatures. -- Ferocious <EFBFBD> If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
mana={X}{U}
type=Instant
[/card]
@@ -53307,7 +53306,7 @@ toughness=5
[card]
name=King Macar, the Gold-Cursed
auto=@untapped(this):may moveto(exile) target(creature) && token(-378445) controller
text=Inspired — Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
text=Inspired <EFBFBD> Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
mana={2}{B}{B}
type=Legendary Creature
subtype=Human
@@ -55294,7 +55293,7 @@ toughness=3
name=Kytheon's Tactics
auto=all(creature|mybattlefield) 2/1 ueot
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then all(creature|mybattlefield) vigilance ueot
text=Creatures you control get +2/+1 until end of turn. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, those creatures also gain vigilance until end of turn. (Attacking doesn't cause them to tap.)
text=Creatures you control get +2/+1 until end of turn. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, those creatures also gain vigilance until end of turn. (Attacking doesn't cause them to tap.)
mana={1}{W}{W}
type=Sorcery
[/card]
@@ -55455,7 +55454,7 @@ toughness=2
[card]
name=Lagonna-Band Trailblazer
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
text=Heroic —- Whenever you cast a spell that targets Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
text=Heroic <EFBFBD>- Whenever you cast a spell that targets Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
mana={W}
type=Creature
subtype=Centaur Scout
@@ -56360,7 +56359,7 @@ toughness=1
[card]
name=Leonin Iconoclast
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):destroy target(Creature[enchantment]|opponentbattlefield)
text=Heroic — Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
mana={3}{W}
type=Creature
subtype=Cat Monk
@@ -61919,7 +61918,7 @@ toughness=2
name=Mercurial Pretender
auto=may copy NotATarget(creature)
auto=transforms((,newability[{2}{U}{U}:moveto(ownerhand)])) forever
text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains “{2}{U}{U}: Return this creature to its owner’s hand.”
text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains <EFBFBD>{2}{U}{U}: Return this creature to its owner<EFBFBD>s hand.<EFBFBD>
mana={4}{U}
type=Creature
subtype=Shapeshifter
@@ -66913,7 +66912,7 @@ type=Enchantment
name=Necromantic Summons
target=creature|graveyard
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then transforms((,newability[moveto(mybattlefield)],newability[counter(1/1.2)])) forever else moveto(mybattlefield)
text=Put target creature card from a graveyard onto the battlefield under your control. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
text=Put target creature card from a graveyard onto the battlefield under your control. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
mana={4}{B}
type=Sorcery
[/card]
@@ -68220,7 +68219,7 @@ toughness=3
[card]
name=Nissa's Pilgrimage
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then name(fetch to play) notatarget(forest[basic]|mylibrary) transforms((,newability[name(move to hand) notatarget(<upto:2>forest[basic]|mylibrary) moveTo(myhand)],newability[moveTo(myBattlefield) and!(tap)!])) oneshot else name(fetch to play) notatarget(forest[basic]|mylibrary) transforms((,newability[name(move to hand) notatarget(forest[basic]|mylibrary) moveTo(myhand)],newability[moveTo(myBattlefield) and!(tap)!])) oneshot
text=Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
text=Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
mana={2}{G}
type=Sorcery
[/card]
@@ -68957,7 +68956,7 @@ toughness=7
name=Oakheart Dryads
auto=1/1 target(creature) ueot
auto=@movedTo(enchantment|myBattlefield):1/1 target(creature) ueot
text=Constellation — Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
text=Constellation <EFBFBD> Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
mana={2}{G}
type=Enchantment Creature
subtype=Nymph Dryad
@@ -69524,7 +69523,7 @@ name=Ojutai Exemplars
auto=@movedto(*[-creature]|mystack):choice name(Tap target creature) tap target(creature|battlefield)
auto=@movedto(*[-creature]|mystack):choice name(First Strike and Lifelink) transforms((,newability[first strike ueot],newability[lifelink ueot])) ueot
auto=@movedto(*[-creature]|mystack):choice name(Exile and returned tapped) moveto(exile) and!( transforms((,newability[moveto(ownerbattlefield) and!(tap)!])) forever)!
text=Whenever you cast a noncreature spell, choose one — -- • Tap target creature. -- • Ojutai Exemplars gains first strike and lifelink until end of turn. -- • Exile Ojutai Exemplars, then return it to the battlefield tapped under its owner's control.
text=Whenever you cast a noncreature spell, choose one <EFBFBD> -- <EFBFBD> Tap target creature. -- <EFBFBD> Ojutai Exemplars gains first strike and lifelink until end of turn. -- <EFBFBD> Exile Ojutai Exemplars, then return it to the battlefield tapped under its owner's control.
mana={2}{W}{W}
type=Creature
subtype=Human Monk
@@ -72944,7 +72943,7 @@ toughness=5
[card]
name=Pheres-Band Thunderhoof
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,2)
text=Heroic —- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
text=Heroic <EFBFBD>- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
mana={4}{G}
type=Creature
subtype=Centaur Warrior
@@ -78305,7 +78304,7 @@ name=Ravaging Blaze
target=creature
auto=damage:X
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then damage:x targetcontroller
text=Ravaging Blaze deals X damage to target creature. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.
text=Ravaging Blaze deals X damage to target creature. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.
mana={X}{R}{R}
type=Instant
[/card]
@@ -82348,7 +82347,7 @@ toughness=2
[card]
name=Rotfeaster Maggot
auto=moveTo(exile) target(creature|graveyard) and!( dynamicability<!mytgt toughnesslifegain srccontroller!> )!
text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card’s toughness.
text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card<EFBFBD>s toughness.
mana={4}{B}
type=Creature
subtype=Insect
@@ -84412,7 +84411,7 @@ toughness=1
[card]
name=Satyr Hoplite
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
text=Heroic —- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
text=Heroic <EFBFBD>- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
mana={R}
type=Creature
subtype=Satyr Soldier
@@ -86951,7 +86950,7 @@ name=Send to Sleep
target=<upto:2>creature|battlefield
auto=tap
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then frozen
text=Tap up to two target creatures. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.
text=Tap up to two target creatures. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.
mana={1}{U}
type=Instant
[/card]
@@ -91169,7 +91168,7 @@ toughness=1
name=Skybind
auto=(blink) target(*[-enchantment]) ueot
auto=@movedTo(enchantment|myBattlefield):(blink) target(*[-enchantment]) ueot
text=Constellation — Whenever Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step.
text=Constellation <EFBFBD> Whenever Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step.
mana={3}{W}{W}
type=Enchantment
[/card]
@@ -97628,7 +97627,7 @@ toughness=4
name=Strength from the Fallen
auto=target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
auto=@movedTo(enchantment|myBattlefield):target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
text=Constellation — Whenever Strength from the Fallen or another enchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
text=Constellation <EFBFBD> Whenever Strength from the Fallen or another enchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
mana={1}{G}
type=Enchantment
[/card]
@@ -97900,7 +97899,7 @@ toughness=3
name=Stubborn Denial
target=*[-creature]|stack
auto=if type(creature[power>=4]|mybattlefield) then fizzle else transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
text=Counter target noncreature spell unless its controller pays {1}. -- Ferocious — If you control a creature with power 4 or greater, counter that spell instead.
text=Counter target noncreature spell unless its controller pays {1}. -- Ferocious <EFBFBD> If you control a creature with power 4 or greater, counter that spell instead.
mana={U}
type=Instant
[/card]
@@ -99307,7 +99306,7 @@ other={1}{W} name(Spell Mastery)
otherrestriction=type(*[instant;sorcery]|mygraveyard)~morethan~1
target=creature[tapped]|battlefield
auto=destroy
text=Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, you may cast Swift Reckoning as though it had flash. (You may cast it any time you could cast an instant.) Destroy target tapped creature.
text=Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, you may cast Swift Reckoning as though it had flash. (You may cast it any time you could cast an instant.) Destroy target tapped creature.
mana={1}{W}
type=Sorcery
[/card]
@@ -101717,7 +101716,7 @@ toughness=2
[card]
name=Tethmos High Priest
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
text=Heroic — Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
mana={2}{W}
type=Creature
subtype=Cat Cleric
@@ -101945,7 +101944,7 @@ type=Sorcery
name=Thassa's Devourer
auto=deplete:2 target(player)
auto=@movedTo(enchantment|myBattlefield):deplete:2 target(player)
text=Constellation — Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
text=Constellation <EFBFBD> Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
mana={4}{U}
type=Enchantment Creature
subtype=Elemental
@@ -102652,7 +102651,7 @@ type=Enchantment
name=Thoughtrender Lamia
auto=ability$!name(discard) target(*|myhand) reject!$ opponent
auto=@movedTo(enchantment|myBattlefield):ability$!name(discard) target(*|myhand) reject!$ opponent
text=Constellation — Whenever Thoughtrender Lamia or another enchantment enters the battlefield under your control, each opponent discards a card.
text=Constellation <EFBFBD> Whenever Thoughtrender Lamia or another enchantment enters the battlefield under your control, each opponent discards a card.
mana={4}{B}{B}
type=Enchantment Creature
subtype=Lamia
@@ -105825,7 +105824,7 @@ toughness=1
[card]
name=Triton Cavalry
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):may moveTo(ownerhand) target(enchantment|battlefield)
text=Heroic — Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
mana={3}{U}
type=Creature
subtype=Merfolk Soldier
@@ -107114,7 +107113,7 @@ name=Underworld Coinsmith
auto=life:1
auto=@movedTo(enchantment|myBattlefield):life:1
auto={W}{B}{L}:life:-1 opponent
text=Constellation — Whenever Underworld Coinsmith or another enchantment enters the battlefield under your control, you gain 1 life. -- {W}{B}, Pay 1 life: Each opponent loses 1 life.
text=Constellation <EFBFBD> Whenever Underworld Coinsmith or another enchantment enters the battlefield under your control, you gain 1 life. -- {W}{B}, Pay 1 life: Each opponent loses 1 life.
mana={W}{B}
type=Enchantment Creature
subtype=Human Cleric
@@ -107265,7 +107264,7 @@ name=Unholy Hunger
target=creature
auto=destroy
auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then life:2 srccontroller
text=Destroy target creature. -- Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, you gain 2 life.
text=Destroy target creature. -- Spell mastery <EFBFBD> If there are two or more instant and/or sorcery cards in your graveyard, you gain 2 life.
mana={3}{B}{B}
type=Instant
[/card]
@@ -112972,7 +112971,7 @@ type=Sorcery
[card]
name=Wavecrash Triton
auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
text=Heroic — Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
text=Heroic <EFBFBD> Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
mana={2}{U}
type=Creature
subtype=Merfolk Wizard
@@ -113846,7 +113845,7 @@ type=Instant
name=Whitewater Naiads
auto=unblockable target(creature) ueot
auto=@movedTo(enchantment|myBattlefield):unblockable target(creature) ueot
text=Constellation — Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn.
text=Constellation <EFBFBD> Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn.
mana={3}{U}{U}
type=Enchantment Creature
subtype=Nymph

2
projects/mtg/include/AllAbilities.h
View File

@@ -4856,7 +4856,7 @@ public:
{
if ((isManaProduced->card == source) && isManaProduced->color == Constants::GetColorStringIndex(colorname))
{
source->controller()->getManaPool()->add(Constants::GetColorStringIndex(colorname),1);
source->controller()->getManaPool()->add(Constants::GetColorStringIndex(colorname),1,source,true);
}
}
return 1;

2
projects/mtg/include/ManaCost.h
View File

@@ -150,7 +150,7 @@ public:
ManaPool(Player * player);
ManaPool(ManaCost * _manaCost, Player * player);
int remove (int color, int value);
int add(int color, int value, MTGCardInstance * source = NULL);
int add(int color, int value, MTGCardInstance * source = NULL, bool extra = false);
int add(ManaCost * _cost, MTGCardInstance * source = NULL);
int pay (ManaCost * _cost);
};

8
projects/mtg/include/WEvent.h
View File

@@ -248,6 +248,14 @@ struct WEventCombatStepChange : public WEvent
WEventCombatStepChange(CombatStep);
};
//Event when a mana is engaged
//color : color
struct WEventEngageManaExtra : public WEvent {
int color;
MTGCardInstance* card;
ManaPool * destination;
WEventEngageManaExtra(int color, MTGCardInstance* card, ManaPool * destination);
};
//Event when a mana is engaged
//color : color

10
projects/mtg/src/GuiMana.cpp
View File

@@ -346,6 +346,16 @@ int GuiMana::receiveEventPlus(WEvent* e)
manas.push_back(NEW ManaIcon(event->color, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, x, y));
return 1;
}
else if (WEventEngageManaExtra *event = dynamic_cast<WEventEngageManaExtra*>(e))
{
if (event->destination != owner->getManaPool())
return 0;
if (event->card && event->card->view)
manas.push_back(NEW ManaIcon(event->color, event->card->view->actX, event->card->view->actY, x, y));
else
manas.push_back(NEW ManaIcon(event->color, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, x, y));
return 1;
}
else
return 0;
}

10
projects/mtg/src/ManaCost.cpp
View File

@@ -1119,14 +1119,20 @@ int ManaPool::remove(int color, int value)
return result;
}
int ManaPool::add(int color, int value, MTGCardInstance * source)
int ManaPool::add(int color, int value, MTGCardInstance * source, bool extra)
{
if (color == Constants::MTG_COLOR_ARTIFACT)
color = Constants::MTG_COLOR_WASTE;
int result = ManaCost::add(color, value);
for (int i = 0; i < value; ++i)
{
WEvent * e = NEW WEventEngageMana(color, source, this);
WEvent * e = NEW WEvent;
if(extra)
e = NEW WEventEngageManaExtra(color, source, this);
else
e = NEW WEventEngageMana(color, source, this);
player->getObserver()->receiveEvent(e);
}
return result;

29
projects/mtg/src/WEvent.cpp
View File

@@ -147,6 +147,35 @@ WEventCreatureBlockerRank::WEventCreatureBlockerRank(MTGCardInstance * card, MTG
{
}
WEventEngageManaExtra::WEventEngageManaExtra(int color, MTGCardInstance* card, ManaPool * destination) :
WEvent(), color(color), card(card), destination(destination)
{//controller snow
if(color == 1 && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaG += 1;
if(color == 2 && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaU += 1;
if(color == 3 && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaR += 1;
if(color == 4 && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaB += 1;
if(color == 5 && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaW += 1;
if((color == 0 || color == 6) && card->controller()->getManaPool() == destination && card->hasType("snow"))
card->controller()->snowManaC += 1;
//opponent snow
if(color == 1 && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaG += 1;
if(color == 2 && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaU += 1;
if(color == 3 && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaR += 1;
if(color == 4 && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaB += 1;
if(color == 5 && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaW += 1;
if((color == 0 || color == 6) && card->controller()->opponent()->getManaPool() == destination && card->hasType("snow"))
card->controller()->opponent()->snowManaC += 1;
}
WEventEngageMana::WEventEngageMana(int color, MTGCardInstance* card, ManaPool * destination) :
WEvent(), color(color), card(card), destination(destination)
{//controller snow