Commit Graph

9192 Commits

Author SHA1 Message Date
Meerkov
1cfb937490 Updates the project for Java 8.
Maps.newHashMap() was replaced with null in numerous locations. A null check is performed in the locations that read this value. This prevents unnecessary allocation of memory and fixes compiler errors.

"final" keyword added to RepeatEachEffect, which used local variables in non-local scope.
2018-04-16 18:26:15 -07:00
maustin
defaebd064 Merge branch 'master' into historicformats 2018-04-16 06:48:08 +01:00
Agetian
e37ac89b88 - A somewhat better logic correction for attacking into dangerous blocks. 2018-04-15 21:11:05 +03:00
Agetian
cbd1ecec12 - AI should not attack recklessly with Kari Zev, Skyship Raider into certain death trying only to trigger its attack effect.
- AI SVar "DontChumpAttackForEffect" can probably be added to other cards with weak or temporary attack effects that are not worth wasting a card for.
2018-04-15 20:05:05 +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
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
austinio7116
dfa409da1b Fixed commander based deck generation error with adding random extra cards 2018-04-15 07:31:53 +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
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
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
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
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
Luke Way
268ccc2cd5 Helm of the Host ability triggers at beginning of combat 2018-04-14 11:30:52 -04: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
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
Misha Colbourne
64796da026 Update spore_swarm.txt 2018-04-13 18:53:33 +00:00
OgreBattlecruiser
325e404de1 DOM: A few fixes 2018-04-13 19:47:30 +01:00
maustin
73c9b94446 Merge branch 'master' into historicformats 2018-04-13 19:12:53 +01:00
austinio7116
ad87aa3eca Corrected call the cavalry's token image set code 2018-04-13 19:05:59 +01:00
austinio7116
3cc1246bf4 Added dominaria draft and rankings 2018-04-13 10:44:07 +01:00
maustin
2f6aa43d40 Merge branch 'master' into historicformats 2018-04-13 08:11:05 +01:00
Hanmac
2b8f650a6c add Blackblade reforged 2018-04-13 08:25:14 +02:00
swordshine
ec5e8302d7 - Updated more cards 2018-04-13 12:29:56 +08:00
swordshine
421eb35e2c - Updated some scripts 2018-04-13 11:44:52 +08:00
swordshine
efc4cbc07f - Fixed two card's names 2018-04-13 11:07:40 +08:00
swordshine
8380c23bca - Updated Fiery Intervention 2018-04-13 10:59:34 +08:00
swordshine
7c0c3ee25b - Updated Fungal Plots' card name 2018-04-13 10:40:56 +08:00
swordshine
b92a6ab04b - Updated Relic Runner 2018-04-13 10:39:11 +08:00
swordshine
1b19c85611 - Updated some scripts 2018-04-13 10:38:04 +08:00
swordshine
e1f262bd26 - Fixed Fiery Intervention's oracle text 2018-04-13 10:08:51 +08:00
swordshine
547d36793a Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!386
2018-04-13 02:02:43 +00:00
swordshine
31e711bd6a Merge branch 'planeswalker-decks' into 'master'
Planeswalker decks

See merge request core-developers/forge!387
2018-04-13 02:00:25 +00:00
swordshine
f2483766cf Merge branch 'dominaria' into 'master'
Dominaria editions file

See merge request core-developers/forge!330
2018-04-13 01:03:03 +00:00
Rob Schnautz
3ea41572bc Add new file 2018-04-13 00:35:45 +00:00
Rob Schnautz
1a29e845b1 Add new file 2018-04-13 00:35:14 +00:00