Commit Graph

37425 Commits

Author SHA1 Message Date
Agetian
6a288419bc - Attempting to improve the AI timing for Indestructible pump abilities. 2018-04-15 16:29:11 +03:00
austinio7116
721ce4196b Support for listing an exhaustive list all formats a deck is valid in if required 2018-04-15 12:19:00 +01:00
austinio7116
3a427188dd Merge branch 'assorted-fixes' into 'master'
Fixed a bug that caused the deck not to reset properly after playing Momir/MoJhoSto.

Closes #510

See merge request core-developers/forge!407
2018-04-15 10:53:15 +00:00
Agetian
0ca1166f0c - No need to provide the name for autogen decks. 2018-04-15 13:27:53 +03:00
Agetian
ec2e04f401 - Fixed a bug that caused the deck not to reset properly after playing Momir/MoJhoSto. 2018-04-15 13:19:15 +03:00
Michael Kamensky
d220b49324 Merge branch 'master' into 'master'
- Updating CHANGES.txt.

See merge request core-developers/forge!406
2018-04-15 08:32:40 +00:00
Agetian
ec467a81db - Updating CHANGES.txt. 2018-04-15 11:31:41 +03:00
maustin
0265bcc038 Merge branch 'master' into historicformats 2018-04-15 09:10:12 +01:00
swordshine
85458cfe5a Merge branch 'ai-dealdamage-to-planeswalker' into 'master'
Simple direct damage to planeswalkers AI

See merge request core-developers/forge!381
2018-04-15 07:43:54 +00:00
Michael Kamensky
802d084070 Merge branch 'bugfixes' into 'master'
Fixed commander based deck generation error with adding random extra cards

See merge request core-developers/forge!405
2018-04-15 07:12:26 +00:00
austinio7116
dfa409da1b Fixed commander based deck generation error with adding random extra cards 2018-04-15 07:31:53 +01:00
austinio7116
c05a3c64ee Improved performance of checking deck format legality 2018-04-15 06:39:56 +01:00
austinio7116
17fc231db6 Fix to ensure invalid format files do not crash game on startup 2018-04-15 00:24:39 +01:00
schnautzr
9c6eb6e071 Formats up to but not including Mirage. 2018-04-14 16:08:04 -05:00
schnautzr
9034e0787d early 96 formats 2018-04-14 14:51:21 -05:00
austinio7116
a36b2ed13e Added some default date handling for gameformats 2018-04-14 20:48:57 +01:00
austinio7116
71647e5bc9 Implemented parser and comparator for using effectivedate in historic gameformats 2018-04-14 20:44:08 +01:00
maustin
7a8c82c226 Merge remote-tracking branch 'origin/historicformats' into historicformats 2018-04-14 20:39:16 +01:00
maustin
00ef5bc0e6 Merge branch 'dominariadraft' into historicformats
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
2018-04-14 20:31:56 +01:00
maustin
b5686b44c4 Dates for formats 2018-04-14 20:29:28 +01:00
schnautzr
431f329933 Sort formats 2018-04-14 13:46:23 -05:00
schnautzr
0e79da4944 Merge branch 'historicformats' of https://git.cardforge.org/core-developers/forge into historicformats 2018-04-14 13:31:25 -05:00
schnautzr
915f9f00f5 Iterating through the formats again and making some adjustments. Verifying lists. Finished with pre-Fourth-Edition formats. Some additional organization of files. 2018-04-14 13:30:05 -05:00
Michael Kamensky
a524ed4439 Merge branch 'dominariadraft' into 'master'
Added some missing raritites from the dominaria editions file - rat colony and voltaic servant

See merge request core-developers/forge!404
2018-04-14 18:15:44 +00:00
austinio7116
fbfc4c43f4 Added some missing raritites from the dominaria editions file - rat colony and voltaic servant 2018-04-14 19:13:39 +01:00
Rob Schnautz
9be7b35bd7 Add new directory 2018-04-14 17:51:48 +00:00
austinio7116
b20733d492 Changed logic for restricting legendary cards in format to exclude planeswalkers 2018-04-14 18:48:33 +01:00
austinio7116
f69a8af83f Added new RestrictedLegendary option to formats to enable blanket restriction on legendary cards 2018-04-14 18:41:37 +01:00
maustin
1145a3a513 Merge branch 'master' into historicformats 2018-04-14 17:42:09 +01:00
Michael Kamensky
1c4670e42f Merge branch 'dom-card-fixes' into 'master'
Helm of the Host ability triggers at beginning of combat

See merge request core-developers/forge!403
2018-04-14 15:57:03 +00:00
Luke Way
268ccc2cd5 Helm of the Host ability triggers at beginning of combat 2018-04-14 11:30:52 -04:00
Michael Kamensky
2e342b32f2 Merge branch 'muldrotha' into 'master'
MayPlay: fixed mayPlay with multiple static abilities

See merge request core-developers/forge!402
2018-04-14 14:57:48 +00:00
Hanmac
32737ed9a3 MayPlay: fixed mayPlay with multiple static abilities 2018-04-14 09:24:26 +02:00
austinio7116
a280772be0 Merge branch 'assorted-fixes' into 'master'
- Dominaria Planeswalker deck fix + minor update.

See merge request core-developers/forge!401
2018-04-14 05:31:17 +00:00
Agetian
f75ed58a97 - Fixed Teferi planeswalker deck.
- Somewhat more informative descriptions for Dominaria planeswalker decks.
2018-04-14 08:24:00 +03:00
Hans Mackowiak
f1084158e1 Merge branch 'KickedManaRestrict' into 'master'
AbilityManaPart: add valid check for the SA itself

Closes #445 and #456

See merge request core-developers/forge!384
2018-04-14 05:12:46 +00:00
Hanmac
aae587c618 SpellAbility: if it has MultikickerCost it is kicked too 2018-04-13 23:41:45 +02:00
Michael Kamensky
ac72402af4 Merge branch 'bugfixes' into 'master'
Removed promo card and planeswalker deck cards from booster drafts

See merge request core-developers/forge!400
2018-04-13 19:23:00 +00:00
austinio7116
f8d0281931 corrected typo 2018-04-13 20:08:59 +01:00
austinio7116
06e192f595 Removed promo card and planeswalker deck cards from booster drafts 2018-04-13 20:04:25 +01:00
Michael Kamensky
75eb551e22 Merge branch 'patch' into 'master'
DOM: A few fixes

See merge request core-developers/forge!399
2018-04-13 18:54:42 +00:00
Misha Colbourne
64796da026 Update spore_swarm.txt 2018-04-13 18:53:33 +00:00
Misha Colbourne
d00914a11c Update org.eclipse.core.resources.prefs 2018-04-13 18:50:41 +00:00
OgreBattlecruiser
325e404de1 DOM: A few fixes 2018-04-13 19:47:30 +01:00
Agetian
e28b683b89 - Correct some code style issues. 2018-04-13 21:43:31 +03:00
Agetian
82bd0325cf - Only process actual planeswalkers when choosing PW to damage. 2018-04-13 21:41:10 +03:00
Agetian
a88c8fba76 Merge remote-tracking branch 'origin/ai-dealdamage-to-planeswalker' into ai-dealdamage-to-planeswalker
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
2018-04-13 21:31:00 +03:00
Michael Kamensky
f561f4d67b Merge branch 'bugfixes' into 'master'
Corrected call the cavalry's token image set code

See merge request core-developers/forge!398
2018-04-13 18:29:53 +00:00
Agetian
9a02c5394d - Only process planeswalkers in dealDamageChooseTgtPW. 2018-04-13 21:25:29 +03:00
Agetian
ec09738321 - Added a TODO entry. 2018-04-13 21:24:33 +03:00