Commit Graph

807 Commits

Author SHA1 Message Date
Agetian
cf2113c4f2 - Some code maintenance in BoosterGenerator [4]. 2017-07-18 15:38:02 +00:00
Agetian
27a2fc9e4a - Some code maintenance in BoosterGenerator [3]. 2017-07-18 15:05:50 +00:00
Agetian
6cc3e41b10 - Some code maintenance in BoosterGenerator [2]. 2017-07-18 15:05:08 +00:00
Agetian
3c816306bc - Some code maintenance in BoosterGenerator. 2017-07-18 15:04:14 +00:00
Agetian
2abc34a93e - Condition simplification. 2017-07-18 10:12:50 +00:00
Agetian
e7359573f2 - A more appropriate fix for BoosterGenerator and newer sets (takes into accounts sets like SOI/EMN). 2017-07-18 10:09:19 +00:00
Agetian
4498602d8b - Fixed the foil rarity patch breaking Booster Draft mode. 2017-07-18 09:45:58 +00:00
Agetian
e7d777e221 - Reformatting a comment. 2017-07-17 05:40:42 +00:00
Agetian
48cd4ab029 - Integrating the foil rarity patch by Seravy. 2017-07-17 05:07:47 +00:00
Agetian
ea4f8b67f2 - Unfortunately, have to revert r34731 - breaks mobile Forge (at least when running on desktop, e.g. for debugging purposes, but quite possibly on Android itself as well) and does not allow to cast anything from hand at all, making the single click on a card function as a selection (but not allowing to actually cast the spell). 2017-07-13 20:08:47 +00:00
Myrd
1d3f91fb9c Switch game thread executor to be a single-thread
executor instead, of a thread pool. This is needed
because when things need to execute on the game
thread, it's not thread safe so only one such thing
should be executing at a time.

This should fix ConcurrentModificationException
from CardAreaPanel.selectCard() on mobile.

This is a reland of r34680 with a fix for being able
to run tasks on the game thread while waiting for input
from the user. Specifically, tested paying costs and
using the dev panel, but should work with anything that
schedules tasks via GameAction.invoke().
2017-07-13 05:03:34 +00:00
Agetian
6fdea6572c - Only add existing booster templates to the template map to avoid situations where the game would try to generate a non-existing booster pack and crash (e.g. unlocking a Starter 2000 set in quest mode).
- Only show the "You receive the following bonus cards" window if there are bonus cards available from the booster template.
2017-07-13 04:12:53 +00:00
Agetian
b69b6f1097 - Reverting r34697 for now, it breaks Developer Mode (functionality like Add Card To Hand, Add Card To Play, Setup Game State, etc.) and thus hinders proper debugging of the game in specific situations.
- Please feel free to revert this commit to continue working on the single thread executor project and then recommit once it no longer breaks dev mode.
2017-07-11 06:41:21 +00:00
Myrd
5c29e8db6b Switch game thread executor to be a single-thread
executor instead, of a thread pool. This is needed
because when things need to execute on the game
thread, it's not thread safe so only one such thing
should be executing at a time.

This should fix ConcurrentModificationException
from CardAreaPanel.selectCard() on mobile.

This is a reland of r34680 with a fix for InputMayMana
which previously relied on there being multiple game
threads.
2017-07-11 02:33:27 +00:00
Sol
89883e278b - Revert Single Thread change. Paying costs didn't work with this change 2017-07-10 03:24:02 +00:00
Myrd
cb5c5c419a Switch game thread executor to be a single-thread
executor instead, of a thread pool. This is needed
because when things need to execute on the game
thread, it's not thread safe so only one such thing
should be executing at a time.

This should fix ConcurrentModificationException
from CardAreaPanel.selectCard() on mobile.
2017-07-10 01:56:50 +00:00
Blacksmith
ffb1cddff4 [maven-release-plugin] prepare for next development iteration 2017-07-08 18:41:58 +00:00
Blacksmith
95bd589291 [maven-release-plugin] prepare release forge-1.6.0 2017-07-08 18:41:48 +00:00
Hanmac
4d452c40ec CardRules: need to reset MeldWith 2017-07-05 18:31:25 +00:00
Krazy
cd7a00ab05 Increment version numbers 2017-06-26 03:57:43 +00:00
Blacksmith
b9a6fc507a [maven-release-plugin] prepare for next development iteration 2017-06-26 03:21:20 +00:00
Blacksmith
9fe8948f0b [maven-release-plugin] prepare release forge-1.5.65 2017-06-26 03:21:11 +00:00
Krazy
2e7c39877e Add Java update notification when Forge is started 2017-06-24 06:59:07 +00:00
Krazy
287b48ce40 Hopefully actually fix java version checking 2017-06-23 18:40:19 +00:00
Agetian
e96d28e811 - Ligature AE -> Ae update. 2017-06-22 16:11:44 +00:00
Krazy
4e75421ac9 Fix broken regex pattern. Thanks, Oracle, for the accurate JavaDocs! 2017-06-21 18:48:02 +00:00
Krazy
5f201dc5a3 Fix parsing of Java version strings 2017-06-21 18:13:45 +00:00
Hanmac
a39ac85b15 FCollection: can't inherit from Set anymore because the interfaces might colide 2017-06-10 13:24:52 +00:00
Blacksmith
e8c232b5cb [maven-release-plugin] prepare for next development iteration 2017-06-08 18:39:38 +00:00
Blacksmith
aa52a767f2 [maven-release-plugin] prepare release forge-1.5.64 2017-06-08 18:39:29 +00:00
Blacksmith
9b3523c943 [maven-release-plugin] prepare for next development iteration 2017-06-07 22:40:35 +00:00
Blacksmith
b11255579c [maven-release-plugin] prepare release forge-1.5.63 2017-06-07 22:40:20 +00:00
Krazy
7633eab1cc Some housekeeping 2017-06-07 19:38:18 +00:00
Hanmac
54b9f104e0 CostAdjustment: now can reduce Hydrid Mana 2017-05-26 15:50:18 +00:00
Agetian
4993609791 - Some minor cleanup in DeckGeneratorBase. 2017-05-23 06:40:35 +00:00
Agetian
d26a31d581 - Some improvements and fixes in DeckGeneratorBase. Enables the ability to generate colorless decks (e.g. in Planar Conquest mode on Random events) and add basic lands to them. 2017-05-23 06:35:42 +00:00
austinio7116
e3027dc234 Added the preferences option to re-enable the old style 800x600 deck viewer window 2017-05-19 08:24:45 +00:00
austinio7116
5cf3f91472 Removed leftover debug system.out 2017-05-12 09:04:19 +00:00
austinio7116
4aa9408000 Improved handling of color selection for deckbuilding and land selection in card-based random decks - including fixing a few bugs with dual land detection regexs 2017-05-11 23:58:47 +00:00
austinio7116
cdfb3b5766 Added card-based random deck generation for constructed and gauntlet play - see forum post for full details: https://www.slightlymagic.net/forum/viewtopic.php?f=52&t=20552&p=213010#p213010
Enabled custom quest worlds to be added to the user's preferences folder to avoid overwriting on upgrade
Improved fringe case handling of dual lands in AI limited deckbuilding
2017-05-11 21:13:16 +00:00
Blacksmith
23c1f08d7e [maven-release-plugin] prepare for next development iteration 2017-05-06 16:34:15 +00:00
Blacksmith
e271742b11 [maven-release-plugin] prepare release forge-1.5.62 2017-05-06 16:34:06 +00:00
Agetian
3a55906afa - NPE prevention in DeckGeneratorBase 2017-05-04 17:33:56 +00:00
austinio7116
50d7538690 Removed experimental test and cleaned up comments 2017-05-04 05:35:18 +00:00
Agetian
4e707a54f6 - Avoid putting RemAIDeck 2-color / 3-color mana producing lands into randomly generated AI decks. 2017-05-03 18:12:18 +00:00
austinio7116
e08982849a Fixed "deck size too small" bug for coloured random generated decks 2017-05-03 14:25:26 +00:00
austinio7116
7a355a84a1 Add 2 new random deck types - standard and modern legal random color decks. Also improved dual/tri land selection with oracle parsing. Generated decks now choose basic lands that match a card from the deck. 2017-05-03 10:49:53 +00:00
Krazy
f1bfe69960 [maven-release-plugin] prepare for next development iteration 2017-04-22 06:10:37 +00:00
Krazy
8ef8197c92 [maven-release-plugin] prepare release forge-1.5.61 2017-04-22 06:10:22 +00:00
Hanmac
ea91d23bc2 add MayPlayIgnoreType in addition to MayPlayIgnoreColor, fixed the ignore Color part, it should not work with {C} 2017-04-16 19:30:45 +00:00