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

removed this

Browse Source
This commit is contained in:
Anthony Calosa
2017-03-01 14:15:57 +08:00
parent cdb056e8ba
commit 3bf1cca118
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29284,6 +29284,7 @@ type=Land
[/card]
[card]
name=Diaochan, Artful Beauty
alias=10544
auto={T}:destroy target(creature) && ability$!destroy target(creature)!$ opponent mycombatbeginsonly
text={T}: Destroy target creature of your choice, then destroy target creature of an opponent's choice. Activate this ability only during your turn, before attackers are declared.
mana={3}{R}

8
projects/mtg/src/GameObserver.cpp
View File

@@ -684,6 +684,8 @@ void GameObserver::gameStateBasedEffects()
int onum = w+1;
card->zpos = abs(onum - zone->nb_cards)+1;
}
if(card && zone->owner)//last controller
card->lastController = zone->owner;
}
@@ -712,8 +714,6 @@ void GameObserver::gameStateBasedEffects()
for (int j = zone->nb_cards - 1; j >= 0; j--)
{
MTGCardInstance * card = zone->cards[j];
//lastcontroller zone update
card->lastController = players[i];
card->entersBattlefield = 0;
card->LKIpower = card->power;
card->LKItoughness = card->toughness;
@@ -1049,10 +1049,12 @@ void GameObserver::gameStateBasedEffects()
int skipLevel = (currentPlayer->playMode == Player::MODE_TEST_SUITE || mLoading) ? Constants::ASKIP_NONE
: options[Options::ASPHASES].number;
bool noattackers = currentPlayer->noPossibleAttackers();
bool hasdiaochan = currentPlayer->game->inPlay->hasAlias(10544);//diaochan activated ability combat begins
if (skipLevel == Constants::ASKIP_SAFE || skipLevel == Constants::ASKIP_FULL)
{
if ((opponent()->isAI() && !(isInterrupting)) && ((mCurrentGamePhase == MTG_PHASE_UNTAP)
|| (mCurrentGamePhase == MTG_PHASE_DRAW) || (mCurrentGamePhase == MTG_PHASE_COMBATBEGIN)
|| (mCurrentGamePhase == MTG_PHASE_DRAW)
|| ((mCurrentGamePhase == MTG_PHASE_COMBATBEGIN) && (!hasdiaochan))
|| ((mCurrentGamePhase == MTG_PHASE_COMBATATTACKERS) && (noattackers))
|| (mCurrentGamePhase == MTG_PHASE_COMBATEND) || (mCurrentGamePhase == MTG_PHASE_ENDOFTURN)
|| ((mCurrentGamePhase == MTG_PHASE_CLEANUP) && (currentPlayer->game->hand->nb_cards < 8))))

4
projects/mtg/src/MTGGameZones.cpp
View File

@@ -1142,8 +1142,8 @@ MTGGameZone * MTGGameZone::intToZone(GameObserver *g, int zoneId, MTGCardInstanc
else
p2 = target->controller();
if(p2 != p && p2 != p->opponent())//should match at least one
p2 = p;
//if(p2 != p && p2 != p->opponent())//should match at least one
//p2 = p;
MTGGameZone * result = intToZone(zoneId, p, p2);
if (result) return result;

4
projects/mtg/src/MTGRules.cpp
View File

@@ -1864,11 +1864,11 @@ int MTGAttackRule::receiveEvent(WEvent *e)
card->tap();
if (card->isAttacker() && card->has(Constants::CANTATTACK) && (card->isAttacking && ((Damageable*)card->isAttacking)->type_as_damageable == Damageable::DAMAGEABLE_PLAYER))
card->toggleAttacker();//if a card has cantattack, then you cant
if (card->isAttacker() && card->has(Constants::CANTATTACKPW) && (card->isAttacking && ((Damageable*)card->isAttacking)->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE))
/*if (card->isAttacker() && card->has(Constants::CANTATTACKPW) && (card->isAttacking && ((Damageable*)card->isAttacking)->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE))
{
if(((MTGCardInstance *)card->isAttacking)->hasType("planeswalker"))
card->toggleAttacker();
}
}*/
}
return 1;
}