Commit Graph

3382 Commits

Author SHA1 Message Date
Agetian
844c083ee4 - Attempting to fix issues with Suspend not working in different ways (not being able to cast a spell with suspend, not being able to resuspend a card returned from graveyard). 2018-04-23 20:35:44 +03:00
Chris H
ade17c5eaf Fix Memory leak within a match 2018-04-22 15:18:22 -04:00
Michael Kamensky
78525a830b Merge branch 'assorted-fixes' into 'master'
Added NPE prevention for situations where AI evaluation for targeting cards with Shroud in MoJhoSto crashes the game.

See merge request core-developers/forge!455
2018-04-21 20:16:58 +00:00
Agetian
819301c7d8 - FIXME: Added NPE prevention for situations where targeting cards with Shroud would be tested, but the SA activator would be null at this point (seems to happen for the AI in MoJhoSto matches; probably needs a more thorough long-term solution). 2018-04-21 19:58:03 +03:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 2018-04-21 01:18:32 +00:00
Hanmac
c47da9acdd PlayEffect: don't cast to CardCollection 2018-04-20 13:01:29 +02:00
austinio7116
a43907fe14 Reversed date ordering when checking deck formats so that when only one of each subtype is shown the earliest valid format is used 2018-04-20 06:46:26 +01:00
Michael Kamensky
5844de9b3c Merge branch 'assorted-fixes' into 'master'
Fixed the AI hanging the game in AF ChooseSource in corner cases

See merge request core-developers/forge!440
2018-04-20 04:33:41 +00:00
Agetian
a1a7390d80 - Fixed the AI hanging the game when trying to choose a source in absence of a creature in combat on the opponent's battlefield. 2018-04-20 07:13:25 +03:00
austinio7116
2cfd036466 Standard formats checked and effective dates added from RIX back to Avacyn Restored
Corrected effective date parsing to match format files and reversed date order so latest formats appear first
2018-04-19 20:54:11 +01:00
maustin
53a03b94d4 Merge branch 'master' into historicformats
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
2018-04-18 23:00:56 +01:00
Michael Kamensky
3bb69e356c Merge branch 'healinggrace' into 'master'
ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect

Closes #268

See merge request core-developers/forge!427
2018-04-18 18:20:17 +00:00
Michael Kamensky
e5d436c295 Merge branch 'master' into 'master'
Memory Leaks, Unused code, compiler warnings, etc.

See merge request core-developers/forge!423
2018-04-18 15:40:37 +00:00
Hanmac
211157c0d0 ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect 2018-04-18 17:24:59 +02:00
Michael Kamensky
e186356591 Merge branch 'torgaar' into 'master'
Add Torgaar (DOM)

See merge request core-developers/forge!424
2018-04-18 04:23:00 +00:00
Chris H
f3afaf9c51 Add Torgaar (DOM) 2018-04-17 23:08:53 -04:00
Meerkov
6efd631fd8 Declares a serialVersionUID.
Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings.

Also adds in "default:" branch to a few switches which were warning due to missing cases.
2018-04-17 16:48:18 -07:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07:00
Meerkov
338ba5afdc Fixes some compile errors in Eclipse due to empty folders. 2018-04-17 15:50:53 -07:00
maustin
f2ae137947 Merge branch 'master' into historicformats
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
2018-04-17 21:29:03 +01:00
Michael Kamensky
f51b80739a Merge branch 'master' into 'master'
Re-merge request for RNG Changes etc

See merge request core-developers/forge!422
2018-04-17 15:35:05 +00:00
Michael Kamensky
d1eea7e7ba Merge branch 'mayPlayLand' into 'master'
May play land

See merge request core-developers/forge!415
2018-04-17 14:54:04 +00:00
Hanmac
3b9ea37907 Player: add playLandNoCheck to be used by LandAbility 2018-04-17 09:04:50 +02:00
Michael Kamensky
1a5710c564 Merge branch 'ai-better-pw-damage' into 'master'
Better ranking system for damaging planeswalkers directly

See merge request core-developers/forge!414
2018-04-17 07:01:47 +00:00
Hanmac
79c9c914e2 LandAbility: do extra ability class, so it can use mayPlay 2018-04-17 08:07:11 +02:00
Hanmac
190db26ebd MayPlay: fixed Bestow and MorphDown Effects 2018-04-17 08:07:11 +02:00
Meerkov
5c9a27c930 Update lots of code to use MyRandom directly.
Some parts of the code were using the normal random, instead of going through the MyRandom class. This makes it much harder to change the RNG method later. For example, you may want to change the RNG to always be seeded with the same number, for running AI experiments. This change makes that easier.
2018-04-16 21:26:12 -07:00
Meerkov
645d70e6ce Fixes inefficient shuffle algorithm.
Note that shuffling 13 times in a row is not necessary. Collections.shuffle will produce every possible shuffle with equal probability already.
2018-04-16 20:40:20 -07:00
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
Agetian
ae05e58a13 - Somewhat more explicit method name. 2018-04-16 22:18:33 +03:00
Agetian
2c9b23fc6d - Better ranking system for damaging planeswalkers directly (accounts for loyalty and closeness to ultimate for now). 2018-04-16 21:31:49 +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
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
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
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
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
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
Hanmac
32737ed9a3 MayPlay: fixed mayPlay with multiple static abilities 2018-04-14 09:24:26 +02:00
Hanmac
aae587c618 SpellAbility: if it has MultikickerCost it is kicked too 2018-04-13 23:41:45 +02:00
Agetian
f2af85597e - Fixed a typo in the PLANESWALKERS card predicate preset. 2018-04-13 21:24:33 +03:00
maustin
2f6aa43d40 Merge branch 'master' into historicformats 2018-04-13 08:11:05 +01:00
austinio7116
15c9281988 Updated gameformat to only list one format of each historical subtype for each deck 2018-04-13 07:54:07 +01:00
austinio7116
5df48873eb Update of game formats from latest cleanup - plus moved to individual folders and extended subtypes 2018-04-12 09:05:27 +01:00