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

Merge branch 'WagicProject:master' into master

Browse Source
This commit is contained in:
Eduardo MG
2023-05-15 16:51:10 -06:00
committed by GitHub
parent e92191f38d 0a0c541f07
commit 84c2c49581
7 changed files with 1048 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/rules/Commander.txt
+3
View File
@@ -88,6 +88,9 @@ auto=@movedto(other *|battlefield) restriction{type(*[isflipped]|nonbattlezone)~
#reset Creature damage at the cleanup phase
auto=@each cleanup:all(*|myBattlefield) resetDamage
#Stun counter
auto=@untapped(*[counter{0/0.1.Stun}]|mybattlefield):name(Stunned creature can't untap) name(Stunned creature can't untap) all(trigger[to]) transforms((,newability[tap(noevent)],newability[counter(0/0.-1.Stun)])) oneshot
#Commander put back rule
auto=@movedTo(*[iscommander]|mygraveyard):may name(Put back to command zone) ability$!name(Put back to command zone) name(Put back to command zone) target(*[iscommander;fresh]|mygraveyard) moveto(mycommandzone)!$ controller
auto=@movedTo(*[iscommander]|myexile):may name(Put back to command zone) ability$!name(Put back to command zone) name(Put back to command zone) target(*[iscommander;fresh]|myexile) moveto(mycommandzone)!$ controller
projects/mtg/bin/Res/rules/mtg.txt
+4 -1
View File
@@ -85,4 +85,7 @@ auto=@movedto(other *|stack) restriction{type(*[isflipped]|nonbattlezone)~moreth
auto=@movedto(other *|battlefield) restriction{type(*[isflipped]|nonbattlezone)~morethan~0}:ability$!all(*[isflipped]|nonbattlezone) doubleside()!$ controller
#reset Creature damage at the cleanup phase
auto=@each cleanup:all(*|myBattlefield) resetDamage
auto=@each cleanup:all(*|myBattlefield) resetDamage
#Stun counter
auto=@untapped(*[counter{0/0.1.Stun}]|mybattlefield):name(Stunned creature can't untap) name(Stunned creature can't untap) all(trigger[to]) transforms((,newability[tap(noevent)],newability[counter(0/0.-1.Stun)])) oneshot
projects/mtg/bin/Res/sets/primitives/borderline.txt
+944 -130
View File
File diff suppressed because it is too large Load Diff
projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+51
View File
@@ -534,6 +534,57 @@ type=Legendary Planeswalker
subtype=Chandra
[/card]
[card]
name=Chandra, Hope's Beacon
auto=counter(0/0,5,loyalty)
auto=@movedTo(*[instant;sorcery]|mystack) turnlimited:name(Copy spell) name(Copy spell) all(trigger[to]) transforms((,newability[name(Copy spell) activate castcard(copied noevent)])) oneshot
auto={C(0/0,+2,Loyalty)}:name(+2: Add 2 mana) thisforeach(variable{2}) ability$!name(Choose one) choice name(Add white) add{W} _ choice name(Add blue) add{U} _ choice name(Add red) add{R} _ choice name(Add green) add{G} _ choice name(Add black) add{B}!$ controller
auto={C(0/0,+1,Loyalty)}:name(+1: Exile top 5 cards) all(*[zpos<=5]|mylibrary) moveto(myexile) and!( if cantargetcard(*[instant;sorcery]|*) then transforms((,newability[canplayfromexile])) ueot )!
auto={C(0/0,-1,Loyalty)}:name(-1: Damage one target) ability$!name(Damage target) name(Damage target(player,creature,planeswalker) damage:1!$ controller
auto={C(0/0,-1,Loyalty)}:name(-1: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:1!$ controller
auto={C(0/0,-2,Loyalty)}:name(-2: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:2!$ controller
auto={C(0/0,-2,Loyalty)}:name(-2: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:2!$ controller
auto={C(0/0,-3,Loyalty)}:name(-3: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:3!$ controller
auto={C(0/0,-3,Loyalty)}:name(-3: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:3!$ controller
auto={C(0/0,-4,Loyalty)}:name(-4: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:4!$ controller
auto={C(0/0,-4,Loyalty)}:name(-4: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:4!$ controller
auto={C(0/0,-5,Loyalty)}:name(-5: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:5!$ controller
auto={C(0/0,-5,Loyalty)}:name(-5: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:5!$ controller
auto={C(0/0,-6,Loyalty)}:name(-6: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:6!$ controller
auto={C(0/0,-6,Loyalty)}:name(-6: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:6!$ controller
auto={C(0/0,-7,Loyalty)}:name(-7: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:7!$ controller
auto={C(0/0,-7,Loyalty)}:name(-7: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:7!$ controller
auto={C(0/0,-8,Loyalty)}:name(-8: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:8!$ controller
auto={C(0/0,-8,Loyalty)}:name(-8: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:8!$ controller
auto={C(0/0,-9,Loyalty)}:name(-9: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:9!$ controller
auto={C(0/0,-9,Loyalty)}:name(-9: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:9!$ controller
auto={C(0/0,-10,Loyalty)}:name(-10: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:10!$ controller
auto={C(0/0,-10,Loyalty)}:name(-10: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:10!$ controller
auto={C(0/0,-11,Loyalty)}:name(-11: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:11!$ controller
auto={C(0/0,-11,Loyalty)}:name(-11: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:11!$ controller
auto={C(0/0,-12,Loyalty)}:name(-12: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:12!$ controller
auto={C(0/0,-12,Loyalty)}:name(-12: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:12!$ controller
auto={C(0/0,-13,Loyalty)}:name(-13: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:13!$ controller
auto={C(0/0,-13,Loyalty)}:name(-13: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:13!$ controller
auto={C(0/0,-14,Loyalty)}:name(-14: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:14!$ controller
auto={C(0/0,-14,Loyalty)}:name(-14: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:14!$ controller
auto={C(0/0,-15,Loyalty)}:name(-15: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:15!$ controller
auto={C(0/0,-15,Loyalty)}:name(-15: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:15!$ controller
auto={C(0/0,-16,Loyalty)}:name(-16: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:16!$ controller
auto={C(0/0,-16,Loyalty)}:name(-16: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:16!$ controller
auto={C(0/0,-17,Loyalty)}:name(-17: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:17!$ controller
auto={C(0/0,-17,Loyalty)}:name(-17: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:17!$ controller
auto={C(0/0,-18,Loyalty)}:name(-18: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:18!$ controller
auto={C(0/0,-18,Loyalty)}:name(-18: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:18!$ controller
auto={C(0/0,-19,Loyalty)}:name(-19: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:19!$ controller
auto={C(0/0,-19,Loyalty)}:name(-29: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:19!$ controller
auto={C(0/0,-20,Loyalty)}:name(-20: Damage one target) ability$!name(Damage target) name(Damage target) target(player,creature,planeswalker) damage:20!$ controller
auto={C(0/0,-20,Loyalty)}:name(-20: Damage two target) ability$!name(Damage targets) name(Damage targets) target(<2>player,creature,planeswalker) damage:20!$ controller
text=Whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy. This ability triggers only once each turn. -- [+2]: Add two mana in any combination of colors. -- [+1]: Exile the top five cards of your library. Until the end of your next turn, you may cast an instant or sorcery spell from among those exiled cards. -- [−X]: Chandra, Hope's Beacon deals X damage to each of up to two targets.
mana={4}{R}{R}
type=Legendary Planeswalker
subtype=Chandra
[/card]
[card]
name=Chandra Nalaar
auto=counter(0/0,6,loyalty)
auto={C(0/0,1,Loyalty)}:name(+1: Deals 1 damage to player or planeswalker) damage:1 target(player,planeswalker)
projects/mtg/src/AllAbilities.cpp
+2 -2
View File
@@ -1545,7 +1545,7 @@ AADamager::AADamager(GameObserver* observer, int _id, MTGCardInstance * _source,
if (_target)
{
WParsedInt damage(d, NULL, (MTGCardInstance *)source);
if(_target == game->opponent() && (game->opponent()->inPlay()->hasType("planeswalker") || game->opponent()->inPlay()->hasType("battle")) && !redirected)
if(_target == game->opponent() && game->opponent()->inPlay()->hasType("planeswalker") && !redirected)
{
vector<MTGAbility*>selection;
MTGCardInstance * check = NULL;
@@ -1557,7 +1557,7 @@ AADamager::AADamager(GameObserver* observer, int _id, MTGCardInstance * _source,
for(int i = 0; i < checkWalkers;++i)
{
check = ((Player*)_target)->game->battlefield->cards[i];
if(check->hasType(Subtypes::TYPE_PLANESWALKER) || check->hasType(Subtypes::TYPE_BATTLE))
if(check->hasType(Subtypes::TYPE_PLANESWALKER))
{
this->redirected = true;
MTGAbility * setWalker = this->clone();
projects/mtg/src/CardDescriptor.cpp
+24 -4
View File
@@ -181,8 +181,18 @@ MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card)
return NULL;
if (powerComparisonMode && !valueInRange(powerComparisonMode, card->getPower(), power))
return NULL;
if (toughnessComparisonMode && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
return NULL;
if (toughnessComparisonMode){ // Toughness has different meaning for creatures, planeswalkers and battles
if(card->isCreature() && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
return NULL;
else if(card->counters && (card->hasType(Subtypes::TYPE_PLANESWALKER) || card->hasType(Subtypes::TYPE_BATTLE))){
for(size_t i = 0; i < card->counters->counters.size(); ++i){
if((card->counters->counters[i]->name == "loyalty" && card->hasType(Subtypes::TYPE_PLANESWALKER)) || (card->counters->counters[i]->name == "defense" && card->hasType(Subtypes::TYPE_BATTLE))){
if(!valueInRange(toughnessComparisonMode, card->counters->counters[i]->nb, toughness))
return NULL;
}
}
}
}
if (manacostComparisonMode && !valueInRange(manacostComparisonMode, card->myconvertedcost, convertedManacost))
return NULL;
if (zposComparisonMode && !valueInRange(zposComparisonMode, card->zpos, zposition))
@@ -229,8 +239,18 @@ MTGCardInstance * CardDescriptor::match_and(MTGCardInstance * card)
match = NULL;
if (powerComparisonMode && !valueInRange(powerComparisonMode, card->getPower(), power))
match = NULL;
if (toughnessComparisonMode && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
match = NULL;
if (toughnessComparisonMode){ // Toughness has different meaning for creatures, planeswalkers and battles
if(card->isCreature() && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
return NULL;
else if(card->counters && (card->hasType(Subtypes::TYPE_PLANESWALKER) || card->hasType(Subtypes::TYPE_BATTLE))){
for(size_t i = 0; i < card->counters->counters.size(); ++i){
if((card->counters->counters[i]->name == "loyalty" && card->hasType(Subtypes::TYPE_PLANESWALKER)) || (card->counters->counters[i]->name == "defense" && card->hasType(Subtypes::TYPE_BATTLE))){
if(!valueInRange(toughnessComparisonMode, card->counters->counters[i]->nb, toughness))
return NULL;
}
}
}
}
if (manacostComparisonMode && !valueInRange(manacostComparisonMode, card->myconvertedcost, convertedManacost))
match = NULL;
if (zposComparisonMode && !valueInRange(zposComparisonMode, card->zpos, zposition))
projects/mtg/src/TargetChooser.cpp
+20
View File
@@ -283,6 +283,26 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
zones[nbzones++] = MTGGameZone::MY_HAND;
zones[nbzones++] = MTGGameZone::MY_LIBRARY;
}
else if (zoneName.compare("mygravelibrary") == 0)
{
zones[nbzones++] = MTGGameZone::MY_GRAVEYARD;
zones[nbzones++] = MTGGameZone::MY_LIBRARY;
}
else if (zoneName.compare("opponentgravelibrary") == 0)
{
zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
zones[nbzones++] = MTGGameZone::OPPONENT_LIBRARY;
}
else if (zoneName.compare("mygraveexile") == 0)
{
zones[nbzones++] = MTGGameZone::MY_EXILE;
zones[nbzones++] = MTGGameZone::MY_GRAVEYARD;
}
else if (zoneName.compare("opponentgraveexile") == 0)
{
zones[nbzones++] = MTGGameZone::OPPONENT_EXILE;
zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
}
else if (zoneName.compare("opponentcastingzone") == 0)
{
zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;