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

Improved Android downloader, fixed snow mana cost, merged opponentlifetotal and oplifetotal keywords

Browse Source
This commit is contained in:
valfieri
2020-10-06 19:00:39 +02:00
parent e4f5d7784a
commit ad26450151
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
View File

@@ -1563,7 +1563,7 @@ public class ImgDownloader {
else if(id.equals("491748"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/6/0/609d3ecf-f88d-4268-a8d3-4bf2bcf5df60.jpg?1601065770";
else if(id.equals("491757"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/6/0/609d3ecf-f88d-4268-a8d3-4bf2bcf5df60.jpg?1601065770";
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/6/e63f8b20-f45b-4293-9aac-cdc021939be6.jpg?1601065790";
else if(id.equals("491758"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/e/6/e63f8b20-f45b-4293-9aac-cdc021939be6.jpg?1601065790";
else if(id.equals("491770"))

12
projects/mtg/bin/Res/sets/primitives/borderline.txt
View File

@@ -1661,6 +1661,7 @@ toughness=2
[card]
name=Arcum's Astrolabe
other={i}
restriction=type(*|myHand)~morethan~9999
auto=draw:1 controller
auto={1}{T}:Add{W}
auto={1}{T}:Add{U}
@@ -1668,7 +1669,7 @@ auto={1}{T}:Add{B}
auto={1}{T}:Add{R}
auto={1}{T}:Add{G}
text=(Snow can be paid with one mana from a snow permanent.) -- When Arcum's Astrolabe enters the battlefield, draw a card. -- {1}, {T}: Add one mana of any color.
mana={9999}
mana={1}
type=Snow Artifact
[/card]
[card]
@@ -19154,8 +19155,9 @@ toughness=4
[card]
name=Icehide Golem
other={i}
restriction=type(*|myHand)~morethan~9999
text=(Snow can be paid with one mana from a snow permanent.)
mana={9999}
mana={1}
type=Snow Artifact Creature
subtype=Golem
power=2
@@ -39160,9 +39162,9 @@ type=Sorcery
[/card]
[card]
name=Subtle Strike
auto=choice name(Target creature gets -1/-1 until...) target(creature) -1/-1
auto=choice name(Put a +1/+1 counter on target...) counter(1/1,1) target(creature)
auto=choice name(Put a +1/+1 counter and -1/-1...) counter(1/1,1) target(creature) && target(creature) -1/-1
auto=choice name(Target creature gets -1/-1) target(creature) -1/-1 ueot
auto=choice name(Put a +1/+1 counter) counter(1/1,1) target(creature)
auto=choice name(Choose both) target(creature) -1/-1 ueot && ability$!name(Put a +1/+1 counter) name(Put a +1/+1 counter) counter(1/1,1) target(creature)!$ controller
text=Choose one or both — -- • Target creature gets -1/-1 until end of turn. -- • Put a +1/+1 counter on target creature.
mana={1}{B}
type=Instant

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

@@ -52768,7 +52768,7 @@ toughness=5
name=Havoc Festival
abilities=nolifegain,nolifegainopponent
auto=@each my upkeep:life:-halfdownlifetotal controller
auto=@each opponent upkeep:life:-halfdownoplifetotal opponent
auto=@each opponent upkeep:life:-halfdownopponentlifetotal opponent
text=Players can't gain life. -- At the beginning of each player's upkeep, that player loses half his or her life, rounded up.
mana={4}{B}{R}
type=Enchantment
@@ -123492,7 +123492,7 @@ toughness=1
[card]
name=Tree of Perdition
abilities=defender
auto={t}:count(oplifetotal) && transforms((,newability[lifeset:t opponent})) forever && all(this) transforms((,settoughness=countedamount)) forever
auto={t}:count(opponentlifetotal) && transforms((,newability[lifeset:t opponent})) forever && all(this) transforms((,settoughness=countedamount)) forever
text=Defender -- {T}: Exchange target opponent's life total with Tree of Perdition's toughness.
mana={3}{B}
type=Creature

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

@@ -655,10 +655,6 @@ private:
if(card->playerTarget)
intValue = card->playerTarget->curses.size();
}
else if (s == "oplifetotal")
{
intValue = target->controller()->opponent()->life;
}
else if (s == "lifetotal")
{
intValue = target->controller()->life;
@@ -1023,7 +1019,7 @@ private:
intValue += card->controller()->game->inPlay->cards[j]->getCurrentPower();
}
}
else if (s == "toughnesstotalinplay")//Count Total toughness of Creatures you control... Formidable
else if (s == "toughnesstotalinplay")//Count Total toughness of Creatures you control...
{
intValue = 0;
for (int j = card->controller()->game->inPlay->nb_cards - 1; j >= 0; --j)