Commit Graph

5734 Commits

Author SHA1 Message Date
Anthony Calosa
52dfe654b5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-02 21:25:58 +08:00
Anthony Calosa
5437bbaf2e Merge pull request #672 from kevlahnota/master
Cascade
2016-06-02 21:11:53 +08:00
Anthony Calosa
f4c17aaf45 Cascade 2016-06-02 20:39:21 +08:00
Anthony Calosa
20e365ea9c Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-02 20:36:00 +08:00
Anthony Calosa
b407701d94 Merge pull request #671 from kevlahnota/master
Cant life change
2016-06-02 12:51:29 +08:00
Anthony Calosa
ed6755496f parenthesis
try to fix psp build
2016-06-02 12:13:23 +08:00
Anthony Calosa
4530115506 whitespace 2016-06-02 09:13:39 +08:00
Anthony Calosa
aabb905313 Cant life change 2016-06-02 09:10:30 +08:00
Anthony Calosa
aaf2d271bc Merge pull request #1 from WagicProject/master
added abilities= keyword "devoid"
2016-06-02 08:50:37 +08:00
zethfoxster
1369a08863 added abilities= keyword "devoid"
abilities=haste,flying,devoid
would make a flying haste colorless creature.
2016-06-01 18:47:19 -04:00
Anthony Calosa
ac9dfd570a minor skip phase
if there is no possible attacker then skip phase
2016-06-01 18:04:15 +08:00
Anthony Calosa
5cd5f4b38e Fix crash for Deck Menu
Old save with stats should work 👍
2016-06-01 18:03:04 +08:00
Anthony Calosa
57c7796424 Add "Snow" Cards 2016-06-01 12:53:33 +08:00
Anthony Calosa
dd6c1c3d01 Merge branch 'master' of https://github.com/WagicProject/wagic 2016-06-01 10:00:04 +08:00
Anthony Calosa
712fc26d56 Update test
colorless mana changes
2016-06-01 09:55:50 +08:00
Anthony Calosa
fd89d51f84 tidying up 2016-06-01 09:32:28 +08:00
Anthony Calosa
9e50187740 re add the comparison 2016-06-01 09:26:58 +08:00
Anthony Calosa
a36b47e500 try to fix psp compilation
travis error:
../projects/mtg/src/ManaCost.cpp:263:23: error: unused variable
‘counterCheck’ [-Werror=unused-variable]
2016-06-01 09:14:47 +08:00
Anthony Calosa
a454c3e564 Snow
Mana produced by snow permanent
2016-06-01 08:31:19 +08:00
zethfoxster
26b30cb20d ok sorry about the confusion, so the issue was with {1}{c} and how its handled. we only need to replace the adding of colorless in the manapool, the old colorless is still very very valid and should be left in place as is.
{1} can be paid with anything
{c} is a mana supertype, it pays for diamond and colorless. 
however all card such as "sol ring" now add diamond instead of old colorless.

reverted waste to {c}, but moved it under counters to avoid crashes. parse for a counter if its not a counter than parse {c} otherwise we would end up with case where it was parsing {c} instead of building counters or vice versa.
2016-05-31 18:41:36 -04:00
zethfoxster
7639e18c39 whoops heres the other half. tested with following arbor elf test card
[card]
name=Arbor Elf
auto={0}:add{1}
auto={0}:add{r}
auto={0}:name(waste) add{waste}
auto={waste}:life:1
auto={3}:damage:1
auto={1}{waste}:moveto(mybattlefield) target(<2>*|mylibrary)
text={T}: Untap target Forest.
mana={0}
type=Creature
subtype=Elf Druid
power=12
toughness=12
[/card]
2016-05-30 17:46:51 -04:00
zethfoxster
80d0ee4dc3 defining "colorless" waste land mana. 2016-05-30 17:45:21 -04:00
zethfoxster
8a6b4a49f5 deckstats crash when "unlock cards" is used #668 2016-05-30 01:04:55 -04:00
Anthony Calosa
00adb20dc7 super rare loop in ai combos and fix #667
thanks zeth
2016-05-30 01:17:53 +08:00
Anthony Calosa
22d4cbbd1e add "colorless" manacost
The symbol {C} will be used going forward to represent one colorless
mana. The numerical and variable mana symbols ({1}, {2}, and so on,
including {X}) will still be used, but only to represent costs that can
be paid with any type of mana.

example card: To cast Spatial Contortion, you pay two mana: one generic
(that's the {1}) and one colorless (that's the {C}). The generic mana
cost can be paid with any type of mana—that means any color or
colorless. But the {C} is different. That can be paid only with
colorless mana.
2016-05-30 01:16:19 +08:00
xawotihs
c3fc579907 Pulled down update for SDL2 2016-05-29 18:01:51 +02:00
Anthony Calosa
1d81c12150 count valid targets any creature 2016-05-29 20:04:51 +08:00
Anthony Calosa
0fed1ba1ab count valid targets
count creature/s that are valid target/s
2016-05-29 19:38:00 +08:00
Anthony Calosa
c472a0215d Bug Fix
Fix send to library as a cost and add support for moving a card to
graveyard as a cost(cards like Void Attendant from Battle for Zendikar)
2016-05-29 17:56:33 +08:00
Anthony Calosa
506adf63c9 fix type
Ajani Steadfast forcefield for play and planeswalker only..
2016-05-29 14:41:31 +08:00
Anthony Calosa
d4715ddc81 ajani steadfast
ajani steadfast emblem
2016-05-29 14:31:29 +08:00
Anthony Calosa
d7fd36ddeb Indicator
Green border indicator for pay zero, can play from exile or can play
from graveyard cards...
2016-05-29 14:29:34 +08:00
Anthony Calosa
e45290e834 Ral Zarek
Fix Loyalty Counter
2016-05-29 12:14:56 +08:00
Xawotihs
e0cf5aa602 Reversed android and Qt apt stuff 2016-05-28 20:18:41 +02:00
Xawotihs
555cf9016f Moved -qq options 2016-05-28 19:47:33 +02:00
Xawotihs
d6ab2e15bf Removed comment 2016-05-28 19:15:21 +02:00
Xawotihs
95cec88742 Replaced Qt ppa 2016-05-28 19:13:45 +02:00
Anthony Calosa
18430dca25 Fix summoning sickness
Cards like control magic (using alias=1194) always resets the summoning sickness, commenting this solves the problem...
2016-05-28 13:47:03 +08:00
Anthony Calosa
8a374f53bc Update appveyor.yml
try to fix appveyor
2016-05-27 10:59:31 +08:00
Anthony Calosa
7a34543004 Nasty memleak crashing devices and its fix. #664
thanks zethfox
2016-05-26 09:42:17 +08:00
Xawotihs
cc06370bcd Update CMakeLists.txt 2015-11-24 00:14:48 +01:00
Xawotihs
ed15ec2469 Fixed issue in SDL2 replacement. 2015-11-23 10:15:47 +01:00
Xawotihs
3f7d5ff041 Decreased -j option for Android 2015-11-22 22:37:55 +01:00
Xawotihs
d5bcf40cbb Replaced SDL2 flavor when compiling for Android 2015-11-22 21:30:58 +01:00
ubuntu
49c196814f Couple of fixed around Android build with cmake. 2015-11-22 02:22:44 +01:00
Xawotihs
c4282ce936 Update android.toolchain.cmake 2015-11-21 14:02:06 +01:00
Xawotihs
cd1c09127f Removed dependencies on Boost on Android 2015-11-20 12:59:26 +01:00
xawotihs
9afebe0851 Removed sdl_main_android.cpp 2015-11-19 22:38:06 +01:00
Xawotihs
9a7382ea06 Added ANDROID_NDK variable for cmake toolchain 2015-11-18 23:57:55 +01:00
Xawotihs
7a7e723009 Fixed android cmake usage 2015-11-18 23:36:39 +01:00