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

fixed bug with aslongas not triggering correctly for "<" and removing to soon for ">".

Browse Source 
please note:
generic kicker test was broken before this rev.
Issue: 483
This commit is contained in:
omegablast2002@yahoo.com
2010-10-15 15:20:45 +00:00
parent 640a9392f6
commit b8a5e7512a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+9 -1
View File
@@ -1840,6 +1840,12 @@ class AAsLongAs:public ListMaintainerAbility, public NestedAbility{
} }
int canBeInList(MTGCardInstance * card){ int canBeInList(MTGCardInstance * card){
int size = 0;
size = (int)cards.size();
if(includeSelf && maxi && card == source && size < maxi)
{
removed(card);
}
if ((includeSelf || card!=source) && tc->canTarget(card)) return 1; if ((includeSelf || card!=source) && tc->canTarget(card)) return 1;
return 0; return 0;
} }
@@ -1876,6 +1882,7 @@ class AAsLongAs:public ListMaintainerAbility, public NestedAbility{
int _added(Damageable * d){ int _added(Damageable * d){
int size =(int)cards.size(); int size =(int)cards.size();
if (maxi && size < maxi) return 0;
if (maxi && size >= maxi) return removeAbilityFromGame(); if (maxi && size >= maxi) return removeAbilityFromGame();
if (maxi) return 0; if (maxi) return 0;
if (size <= mini) return 0; if (size <= mini) return 0;
@@ -1893,8 +1900,9 @@ class AAsLongAs:public ListMaintainerAbility, public NestedAbility{
int removed(MTGCardInstance * card){ int removed(MTGCardInstance * card){
size_t size = cards.size(); size_t size = cards.size();
if (maxi && (int)size < maxi) return addAbilityToGame();
if (mini && (int)size > mini) return 0;
if (mini && (int)size <= mini) return removeAbilityFromGame(); if (mini && (int)size <= mini) return removeAbilityFromGame();
if (maxi && (int)size == maxi-1) return addAbilityToGame();
if (!mini && !maxi && size !=0) return 0; if (!mini && !maxi && size !=0) return 0;
return removeAbilityFromGame(); return removeAbilityFromGame();
} }