Commit Graph

5679 Commits

Author SHA1 Message Date
swordshine
0f4c1960d9 More fixes 2019-09-21 22:27:21 +08:00
swordshine
bcccf726b5 Fix Kaalia of the Vast 2019-09-21 22:10:57 +08:00
swordshine
facb93945e Add Deathless Knight 2019-09-21 19:17:28 +08:00
Ryan1729
1c11465041 Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_3 2019-09-20 21:06:00 -06:00
swordshine
94e81531db Merge branch 'master' into 'master'
More ELD cards

See merge request core-developers/forge!2148
2019-09-21 01:33:27 +00:00
swordshine
dd7b419806 Merge branch 'push_down_toStringMap_part_2' into 'master'
Push down to string map part 2

See merge request core-developers/forge!2134
2019-09-21 01:33:20 +00:00
Hanmac
9b3fa50dee Adventure: If an object becomes a copy of an object that has an Adventure, the copy also has an Adventure. 2019-09-20 18:03:06 +02:00
Hanmac
b7b1c3a437 As Foretold: fix the cmc check 2019-09-20 16:20:35 +02:00
Hanmac
1e7ed84522 CardProperty: add AdventureCard for Creature with adventure 2019-09-20 15:54:47 +02:00
Hans Mackowiak
7a504bf3c8 Update CardFactoryUtil.java 2019-09-20 15:54:47 +02:00
Hans Mackowiak
94805103da Spell: add extra check for Adventure cards 2019-09-20 15:54:47 +02:00
Hanmac
378d0e26ab Adventure: add - separator 2019-09-20 15:54:47 +02:00
Hanmac
0c354e8a70 Adventure: add Logic to cast as Spell 2019-09-20 15:54:47 +02:00
swordshine
cb18c22649 Add Hushbringer 2019-09-20 21:29:36 +08:00
Ryan1729
4c43f70ea6 Merge branch 'push_down_toStringMap_part_2' into push_down_toStringMap_part_3 2019-09-19 21:13:03 -06:00
Ryan1729
626df0df1c Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_2 2019-09-19 20:49:44 -06:00
swordshine
80c6c23289 Update ability text if it's not translated 2019-09-19 20:57:49 +08:00
Hans Mackowiak
a90b6033b0 TriggerHandler: fix Dieharmonicon with new TriggerKeys 2019-09-19 10:54:34 +00:00
Ryan1729
7ca72974b6 push toStringMap into performTest, eliminating the need for the toStringMap call. 2019-09-18 22:00:28 -06:00
Ryan1729
bafbe73bd6 convert missed keys to enum 2019-09-18 21:12:13 -06:00
swordshine
a2da91eb3a Merge branch 'patch' into 'master'
More ELD cards

See merge request core-developers/forge!2135
2019-09-18 10:51:40 +00:00
swordshine
4fe155959e Merge branch 'push_down_toStringMap_part_1' into 'master'
Push down toStringMap part 1

See merge request core-developers/forge!2127
2019-09-18 10:48:34 +00:00
swordshine
87fffa0ddd Add Dance of the Manse 2019-09-18 12:29:05 +08:00
swordshine
cf9a72fc42 Add Once Upon a Time 2019-09-18 10:24:04 +08:00
Ryan1729
30d37c11b0 remove import 2019-09-17 19:40:45 -06:00
swordshine
2d9d53a19d Update Hollow One 2019-09-17 21:08:28 +08:00
swordshine
d56568b499 Add Cauldron's Gift 2019-09-17 15:22:19 +08:00
Ryan1729
350756435f add incorrectly not staged changes 2019-09-16 23:16:24 -06:00
Ryan1729
ad067b7444 push toStringMap down into Trigger eliminating the need for the conversion.
Also add helper method `setTriggeringObjectsFrom` and change `getRunParams` into similar but not identical `getFromRunParams`
2019-09-16 23:07:53 -06:00
swordshine
e98cb0043d Add Robber of the Rich 2019-09-16 22:08:07 +08:00
swordshine
e0f2802eda Add Sundering Stroke 2019-09-16 18:49:46 +08:00
swordshine
12b05147e7 Update two Adamant cards 2019-09-16 18:27:10 +08:00
swordshine
0e5884d757 Add Henge Walker 2019-09-16 16:35:06 +08:00
swordshine
3d2d192286 Merge branch 'update_run_trigger_callers_part_4' into 'master'
Update run trigger callers part 4

See merge request core-developers/forge!2126
2019-09-16 08:10:43 +00:00
swordshine
243726d307 Refactor "For each color among permanents you control, add one mana of that color" 2019-09-15 21:37:24 +08:00
swordshine
bfaf054e88 Add Wildborn Preserver 2019-09-15 20:10:27 +08:00
swordshine
83c6473a7c Add Vantress Gargoyle 2019-09-15 19:23:55 +08:00
Ryan1729
8a160c88d0 No unused imports. Even in the tests. 2019-09-14 21:16:55 -06:00
Ryan1729
b69682064d fix empty EnumMap IllegalArgumentException bug and add a test for it 2019-09-14 21:11:25 -06:00
swordshine
ce4fe0239f Merge branch 'patch' into 'master'
More ELD cards

See merge request core-developers/forge!2124
2019-09-15 02:24:46 +00:00
swordshine
5b176b93d0 Merge branch 'master' into 'master'
Various Improvement (Android)

See merge request core-developers/forge!2110
2019-09-15 02:24:26 +00:00
Ryan1729
dae5a51acc add fromString test and make it pass. 2019-09-14 20:12:52 -06:00
Ryan1729
42d0695804 push down toStringMap further, which required using AbilityKey inside TriggerWaiting and several other places. 2019-09-14 19:44:27 -06:00
Ryan1729
2d548b93ec push toStingMap down a layer 2019-09-14 16:51:55 -06:00
Ryan1729
65ab715b91 eliminate all but the last call to runTriggerOld 2019-09-14 15:52:02 -06:00
Ryan1729
eabcf47b27 more mechanical, samey transformations 2019-09-14 15:14:40 -06:00
Hans Mackowiak
47d3a74387 Resolve "multiple StaticAbility Pump on same creature does conflict" 2019-09-14 16:33:56 +00:00
swordshine
efac184ffb add more forgescribed cards 2019-09-14 23:29:40 +08:00
Ryan1729
827e035286 delete unused imports 2019-09-14 01:10:38 -06:00
Ryan1729
aaf1919905 more mechanical transformations 2019-09-14 01:05:16 -06:00