Commit Graph

6364 Commits

Author SHA1 Message Date
Anthony Calosa
eb0ecedecf revised token id (tnum:num parameter)
this should not conflict like earlier version.
ex:
[card]
name=Fable of Wolf and Owl
auto=@movedTo(*[green]|mystack):may token(Wolf,Creature
Wolf,2/2,green,tnum:11)
auto=@movedTo(*[blue]|mystack):may token(Bird,Creature
Bird,1/1,flying,blue,tnum:12)
text=Whenever you cast a green spell, you may put a 2/2 green Wolf
creature token onto the battlefield. -- Whenever you cast a blue spell,
you may put a 1/1 blue Bird creature token with flying onto the
battlefield.
mana={3}{GU}{GU}{GU}
type=Enchantment
[/card]
tnum uses -source id  & tnum (concatenated)
2016-08-08 13:49:24 +08:00
Anthony Calosa
de44abd529 Revert "fix token names with ",""
This reverts commit 65ef1f384c.
2016-08-08 11:29:04 +08:00
Anthony Calosa
9807ca99f9 Revert "multi tokens images on same source"
This reverts commit 8c9d2d6f1d.
2016-08-08 11:20:25 +08:00
Anthony Calosa
8c9d2d6f1d multi tokens images on same source
you can specifiy tnum:number on token parameters and it will concatenate
the default token id and the specified number. example: token(Saproling,
Creature Saproling, 1/1, green, tnum:15) if the source id is 12345, the
default token id will be -12345, concat tnum, id will be -1234515 and
the game will try to find the image 1234515t.jpg
2016-08-08 10:37:27 +08:00
Anthony Calosa
65ef1f384c fix token names with "," 2016-08-08 10:15:50 +08:00
Anthony Calosa
bf2cc36719 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-08 09:30:33 +08:00
Anthony Calosa
34ffe7eefa Merge pull request #842 from kevlahnota/master
resized avatar
2016-08-07 22:37:57 +08:00
Anthony Calosa
b756c8b9ec resize avatar 2016-08-07 22:33:40 +08:00
Anthony Calosa
19a98c9ad6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 22:26:39 +08:00
Anthony Calosa
e159025ebb Merge pull request #841 from kevlahnota/master
Fix Master Transmuter & Westvale Abbey
2016-08-07 19:46:56 +08:00
Anthony Calosa
05e81ad923 Fix Westvale Abbey and Master Transmuter 2016-08-07 19:42:56 +08:00
Anthony Calosa
8e1a0eb20f Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 15:29:23 +08:00
Anthony Calosa
a881b8fa5a Merge pull request #840 from kevlahnota/master
Minor adjustment
2016-08-07 14:08:51 +08:00
Anthony Calosa
6982030013 Minor adjustment 2016-08-07 14:08:09 +08:00
Anthony Calosa
01da4c6af5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 14:06:22 +08:00
Anthony Calosa
a42805d4cc Merge pull request #839 from kevlahnota/master
Fix Enstack Attackers
2016-08-07 13:24:54 +08:00
Anthony Calosa
01145c4581 new adjustments 2016-08-07 13:24:14 +08:00
Anthony Calosa
4d1dfb58ff Fix Enstack Attackers
If you have 40+ tokens as attackers in play, stack them on the attackers
tightly...
2016-08-07 11:49:57 +08:00
Anthony Calosa
43f44a4142 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 11:47:32 +08:00
Anthony Calosa
b314d3cafe Merge pull request #838 from kevlahnota/master
corrected typo
2016-08-07 11:21:43 +08:00
Anthony Calosa
9bbf28e44b correction 2016-08-07 11:21:07 +08:00
Anthony Calosa
d995d25f69 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 10:37:31 +08:00
Anthony Calosa
1f58b8e6a7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 10:30:42 +08:00
Anthony Calosa
eeb881cdc2 Merge pull request #837 from kevlahnota/master
AACopier andAbility support
2016-08-07 10:29:06 +08:00
Anthony Calosa
807874ce5d add andAbility support for AACopier
the granted ability must exists only if you copy a card, if you don't
copy any card, the source doesn't have any granted abillities.
2016-08-07 10:15:11 +08:00
punkeduard
213d11c8e9 Changes to primitives
name=Ojutai, Soul of Winter
name=Atarka, World Render
name=Kolaghan, the Storm's Fury
name=Savageborn Hydra
2016-08-06 21:03:23 -05:00
Anthony Calosa
dfd0761506 Corrected cards reported from forums 2016-08-07 09:59:59 +08:00
Anthony Calosa
4c30086896 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 21:28:57 +08:00
Anthony Calosa
1efdca399e Merge pull request #836 from kevlahnota/master
re enabled token quads
2016-08-06 20:29:09 +08:00
Anthony Calosa
4f27c8051a forgot these 2016-08-06 19:55:18 +08:00
Anthony Calosa
d43693fef0 when ingame, try finding the quad
for copier/cloner when copying token generated cards...
2016-08-06 19:41:34 +08:00
Anthony Calosa
88f0202b16 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 19:06:57 +08:00
Anthony Calosa
be98e0b543 Update CardGui.cpp
Disabled temporary...
2016-08-06 01:40:21 -05:00
Rolzad73
8a907bb3f3 Merge pull request #835 from WagicProject/android_tweaks
Android tweaks
2016-08-06 00:25:36 -04:00
Anthony Calosa
1b34a478a1 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 08:04:15 +08:00
Anthony Calosa
cda0bba555 Merge pull request #834 from kevlahnota/master
Copied token images
2016-08-05 22:26:57 +08:00
Anthony Calosa
dae1b10de1 Copied Token Image
If the image is not found, try finding the token counterpart by Id
2016-08-05 21:52:46 +08:00
Rolzad73
0c4e72ece2 - attempt to fix storage location list issue on Android 4.3+ 2016-08-04 14:53:52 -04:00
Rolzad73
77dfd51b28 - Android debug logging organization 2016-08-04 13:15:49 -04:00
Rolzad73
b601a549d0 - added option for Android x86 build types 2016-08-04 11:26:41 -04:00
Anthony Calosa
c4907edd76 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 21:19:32 +08:00
Anthony Calosa
dcf4148d75 Merge pull request #831 from kevlahnota/master
fix code monk token
2016-08-04 21:02:34 +08:00
Anthony Calosa
8afeef568f update ability
prowess +1/+1 is ueot
2016-08-04 20:55:36 +08:00
Rolzad73
dd5635d9cd - only minor whitespace formatting Android 2016-08-04 08:32:17 -04:00
Rolzad73
62a6ddf3ca - update android gitignore
- update android launcher icons
2016-08-04 08:02:32 -04:00
Anthony Calosa
195daa97f3 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 13:59:34 +08:00
Anthony Calosa
b1c5c87443 Merge pull request #830 from kevlahnota/master
Fix AttackCost & BlockCost, Add nonCombatDamage count
2016-08-04 12:16:48 +08:00
Anthony Calosa
1ab88940f9 add nonCombatDamage count 2016-08-04 09:56:53 +08:00
Anthony Calosa
8ba97b8a74 Fix attackcost & blockcost
thanks zeth
2016-08-04 09:50:09 +08:00
Anthony Calosa
e7f5442a64 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 09:29:45 +08:00