diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index 6da59fb83..5b9e41abe 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -269,6 +269,32 @@ subtype=Spider toughness=3 [/card] [card] +text=Flying (This creature can't be blocked except by creatures with flying or reach.) Cloud Elemental can block only creatures with flying. +abilities=cloud,flying +id=129804 +name=Cloud Elemental +rarity=C +color=Blue +type=Creature +mana={2}{U} +power=2 +subtype=Elemental +toughness=3 +[/card] +[card] +text=Flying (This creature can't be blocked except by creatures with flying or reach.) Cloud Sprite can block only creatures with flying. +abilities=cloud,flying +id=132069 +name=Cloud Sprite +rarity=C +color=Blue +type=Creature +mana={U} +power=1 +subtype=Faerie +toughness=1 +[/card] +[card] text=Sacrifice Composite Golem: Add {W}{U}{B}{R}{G} to your mana pool. auto={s}:Add {W}{U}{B}{R}{G} id=135275 diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat index e8fcdd925..e1f7fca5b 100644 --- a/projects/mtg/bin/Res/sets/10E/todo.dat +++ b/projects/mtg/bin/Res/sets/10E/todo.dat @@ -321,30 +321,6 @@ subtype=Shapeshifter toughness=0 [/card] [card] -text=Flying (This creature can't be blocked except by creatures with flying or reach.) Cloud Elemental can block only creatures with flying. -id=129804 -name=Cloud Elemental -rarity=C -color=Blue -type=Creature -mana={2}{U} -power=2 -subtype=Elemental -toughness=3 -[/card] -[card] -text=Flying (This creature can't be blocked except by creatures with flying or reach.) Cloud Sprite can block only creatures with flying. -id=132069 -name=Cloud Sprite -rarity=C -color=Blue -type=Creature -mana={U} -power=1 -subtype=Faerie -toughness=1 -[/card] -[card] text=Each creature gets +1/+1 for each other creature in play that shares a creature type with it. (For example, if a Goblin Warrior, a Goblin Scout, and a Zombie Goblin are in play, each gets +2/+2.) id=129502 name=Coat of Arms diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat index 6e6a7de26..f822920bb 100644 --- a/projects/mtg/bin/Res/sets/POR/_cards.dat +++ b/projects/mtg/bin/Res/sets/POR/_cards.dat @@ -222,6 +222,42 @@ power=2 toughness=1 [/card] [card] +text=Flying Cloud Dragon can block only creatures with flying. +abilities=cloud,flying +id=4252 +name=Cloud Dragon +rarity=R +type=Creature +mana={5}{U} +power=5 +subtype=Illusion Dragon +toughness=4 +[/card] +[card] +text=Flying Cloud Pirates can block only creatures with flying. +abilities=cloud,flying +id=4253 +name=Cloud Pirates +rarity=C +type=Creature +mana={U} +power=1 +subtype=Human Pirate +toughness=1 +[/card] +[card] +text=Flying Cloud Spirit can block only creatures with flying. +abilities=cloud,flying +id=4254 +name=Cloud Spirit +rarity=U +type=Creature +mana={2}{U} +power=3 +subtype=Spirit +toughness=1 +[/card] +[card] text=Play Defiant Stand only during the declare attackers step and only if you are the defending player. Target creature gets +1/+3 until the end of the turn. If that creature is tapped, untap it. target=creature auto=untap diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat index fb938ebb6..147419966 100644 --- a/projects/mtg/bin/Res/sets/POR/todo.dat +++ b/projects/mtg/bin/Res/sets/POR/todo.dat @@ -98,39 +98,7 @@ power=4 subtype=Rhino toughness=4 [/card] -[card] -text=Flying Cloud Dragon can block only creatures with flying. -id=4252 -name=Cloud Dragon -rarity=R -type=Creature -mana={5}{U} -power=5 -subtype=Illusion Dragon -toughness=4 -[/card] -[card] -text=Flying Cloud Pirates can block only creatures with flying. -id=4253 -name=Cloud Pirates -rarity=C -type=Creature -mana={U} -power=1 -subtype=Human Pirate -toughness=1 -[/card] -[card] -text=Flying Cloud Spirit can block only creatures with flying. -id=4254 -name=Cloud Spirit -rarity=U -type=Creature -mana={2}{U} -power=3 -subtype=Spirit -toughness=1 -[/card] + [card] text=Play Command of Unsummoning only during the declare attackers step and only if you are the defending player. Return one or two target attacking creatures to their owner's hand. id=4255 diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h index a5855fe90..1c867adfb 100644 --- a/projects/mtg/include/MTGDefinitions.h +++ b/projects/mtg/include/MTGDefinitions.h @@ -96,8 +96,9 @@ class Constants PLAINSHOME = 35, FLANKING = 36, RAMPAGE1 = 37, + CLOUD = 38, - NB_BASIC_ABILITIES = 38, + NB_BASIC_ABILITIES = 39, RARITY_M = 'M', diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index e00b823ec..3a47b1a2a 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -246,6 +246,8 @@ int MTGCardInstance::canBlock(MTGCardInstance * opponent){ if (opponent->basicAbilities[Constants::UNBLOCKABLE]) return 0; if (opponent->basicAbilities[Constants::FEAR] && !(hasColor(Constants::MTG_COLOR_ARTIFACT) || hasColor(Constants::MTG_COLOR_BLACK))) return 0; if (opponent->basicAbilities[Constants::FLYING] && !( basicAbilities[Constants::FLYING] || basicAbilities[Constants::REACH])) return 0; + //Can block only creatures with flying if has cloud + if (basicAbilities[Constants::CLOUD] && !( opponent->basicAbilities[Constants::FLYING])) return 0; // If opponent has shadow and a creature does not have either shadow or reachshadow it cannot be blocked if (opponent->basicAbilities[Constants::SHADOW] && !( basicAbilities[Constants::SHADOW] || basicAbilities[Constants::REACHSHADOW])) return 0; // If opponent does not have shadow and a creature has shadow it cannot be blocked diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp index 7ebce6e4d..183a5d0f8 100644 --- a/projects/mtg/src/MTGDefinitions.cpp +++ b/projects/mtg/src/MTGDefinitions.cpp @@ -46,6 +46,7 @@ const char* Constants::MTGBasicAbilities[] = { "plainshome", "flanking", "rampage", +"cloud", }; const char* Constants::MTGPhaseNames[] =