Commit Graph

12579 Commits

Author SHA1 Message Date
Tim Mocny
5b61712d70 Mystery Booster support! 2020-03-06 15:30:25 +00:00
Hans Mackowiak
33f04148d3 Update joust: add missing AILogic$ Fight 2020-03-05 14:32:17 +00:00
Hans Mackowiak
612045f8c0 Update Theros Beyond Death: add missing CollectorNumber 2020-03-05 14:32:11 +00:00
Michael Kamensky
0bd6b16247 Merge branch 'edition-fixes' into 'master'
Edition fixes

See merge request core-developers/forge!2583
2020-03-05 03:35:42 +00:00
Jamin W. Collins
235162fb84 fixing the collector numbers for Magic 2015
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 20:06:09 -07:00
Jamin W. Collins
fc4a491111 fixing collector numbers for Magic 2014
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 20:04:36 -07:00
Jamin W. Collins
0cd9b1435b fixing collector numbers for Khans of Tarkir
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 20:02:16 -07:00
Sol
61184ade4c Merge branch 'collector_number' into 'master'
change collector number to be a String

See merge request core-developers/forge!2578
2020-03-05 02:55:36 +00:00
Jamin W. Collins
f2e29c9c93 fixing collector numbers for Fate Reforged
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:54:54 -07:00
Sol
e676073548 Merge branch 'network-play-fixes' into 'master'
Network play fixes

See merge request core-developers/forge!2582
2020-03-05 02:51:16 +00:00
Jamin W. Collins
6b315b2571 adding missing card for Conspiracy Take the Crown
Kaya, Ghost Assassin is a foil-only booster card

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:46:40 -07:00
Jamin W. Collins
6e028a1c45 correct the rarities for Beatdown
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:40:27 -07:00
Jamin W. Collins
f07e2bc2ec correct the rarities for Battlebond
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:40:04 -07:00
Jamin W. Collins
3bc4124fe8 correct the rarities for Battle Royale
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:37:55 -07:00
Jamin W. Collins
bb5af6298e correct the collect numbers for Aether Revolt
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:32:28 -07:00
Jamin W. Collins
3c6c0f534d correct the tokens delimeter for Weatherlight
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:29:44 -07:00
Jamin W. Collins
2a993eb0e0 fixing openZones method signature for network-play
Changes introduced in ef0a1a84 altered the method signature for
openZones, but did not fully update the signature for network-play
calls.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-04 19:06:07 -07:00
austinio7116
6e94378cc1 Added filter to ensure banlist is respected 2020-03-04 06:05:07 +00:00
Jamin W. Collins
ff31718839 correct how collectorNumber is located
The existing logic will always return the first match for a given card
name, even if there are multiple different printings of the same card
name within a set. This change aligns the collectorNumber with the
alternate art index.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-03 21:27:05 -07:00
Michael Kamensky
2ab5a286c5 Merge branch '030320' into 'master'
March 3 fixes

See merge request core-developers/forge!2580
2020-03-04 04:07:14 +00:00
Northmoc
e07208e81b dissenters_deliverance.txt correct filename 2020-03-03 14:15:54 -05:00
Tim Mocny
04e94f68f5 Glyph of Delusion 2020-03-03 16:24:41 +00:00
Jamin W. Collins
e325f42ca8 change collector number to be a String
This change moves the internal storage of collector number from Integer
to String.

The parsed pattern for valid collector numbers is any number of digits
followed by an optional single non-digit character. This follows the
format used by Scryfall for the alternate art WAR planeswalkers and
cards from older formats sucha as FEM.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-03 08:59:09 -07:00
Tim Mocny
dfe7ea0ecc Fixes - 2 Mar 2020 2020-03-03 04:07:39 +00:00
Jamin W. Collins
c9010d4224 fix message when no cards in opponent's hand
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-01 14:04:08 -07:00
Michael Kamensky
cb1b8024b4 Merge branch '1303-control-change-and-cda-not-reset' into 'master'
Resolve "Control Change and CDA not reset?"

Closes #1303

See merge request core-developers/forge!2573
2020-03-01 17:15:39 +00:00
Hans Mackowiak
075a0e99af Merieke Ri Berit: use Effect for Destroy Trigger 2020-03-01 17:37:06 +01:00
Tim Mocny
1fee06c843 SLD - Thalia 2020-03-01 15:42:59 +00:00
Hans Mackowiak
93f0ade107 MustBlockEffect: use Choose Card for Crashing Boars 2020-03-01 10:30:45 +00:00
Michael Kamensky
40bb3d2750 Merge branch 'newBranch' into 'master'
Update Sprite Icons (Default Theme)

See merge request core-developers/forge!2564
2020-03-01 04:16:22 +00:00
Tim Mocny
e1138ff7b5 WAR with Japanese Planeswalkers added (option 2) 2020-03-01 04:15:17 +00:00
Tim Mocny
15e3c4f5e5 Forum fixes Leap Day 2020-03-01 04:14:47 +00:00
Hans Mackowiak
34d0d143c5 GameAction: fix Trigger for Stack 2020-03-01 04:14:44 +00:00
Michael Kamensky
d37cb22698 Merge branch 'master' into 'master'
Added puzzle PS_THB5 + AI logic improvement for Kenrith, the Returned King

See merge request core-developers/forge!2568
2020-03-01 04:13:57 +00:00
Anthony Calosa
b5787407b6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-01 11:10:55 +08:00
Anthony Calosa
4d1d79098d Better Icon Render 2020-03-01 10:47:48 +08:00
Jamin Collins
726b8bfbe5 correct sprite load progress bar to 100% max
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-01 02:44:30 +00:00
Anthony Calosa
0306ab97f1 Fix Crash on Desktop, Menu Arrangement, Added some Icons 2020-03-01 07:42:20 +08:00
Agetian
4880d70129 - Simple modification for AI PumpAll on Kenrith 2020-02-29 19:33:35 +03:00
Agetian
f49d5e2352 - Better AI targeting for Kenrith, the Returned King's {4}{B} ability. 2020-02-29 19:25:24 +03:00
Agetian
f8b9a31bf2 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-02-29 17:06:04 +03:00
Tim Mocny
f2c523c267 Editions support for Grand Prix Promos, Unsanctioned 2020-02-29 14:02:09 +00:00
Tim Mocny
a9f13ee503 Mask of Immolation typos fix 2020-02-29 14:01:26 +00:00
Agetian
e0b7ea4960 - Added puzzle PS_THB5. 2020-02-29 16:49:53 +03:00
Jamin W. Collins
226716c816 updating Pioneer ban list
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-02-28 19:18:59 -07:00
Jamin W. Collins
3c6f82294b updating the Modern banned list
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-02-28 19:05:27 -07:00
Anthony Calosa
600d672b4a Update Sprite Icons on Mobile Forge
(Default theme)
2020-02-29 05:05:51 +08:00
Anthony Calosa
48cb11566f Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-28 23:16:14 +08:00
Anthony Calosa
c3be51c117 Fix Missing Translation on Planar Conquest 2020-02-28 23:15:29 +08:00
Tim Mocny
258f0a2072 Band Together / Combo Attack 2020-02-28 15:12:42 +00:00