Commit Graph

2514 Commits

Author SHA1 Message Date
austinio7116
131def83b9 removed commented out old code 2018-04-21 06:29:43 +01:00
austinio7116
84653d7aae Deactivated deck generation logs 2018-04-21 00:00:40 +01:00
austinio7116
7cb11e5191 Deck generation card quality and mana curve improvements 2018-04-20 23:59:19 +01:00
austinio7116
a60f5d1660 Fixed deck generation performance issue 2018-04-20 19:13:35 +01:00
austinio7116
e6c4f6c703 Generic mana fix for deck generation 2018-04-20 19:11:52 +01:00
austinio7116
51bf8a5286 Fixed deck generation performance issue 2018-04-20 18:23:59 +01:00
austinio7116
7df721a863 Fix for colourless brawl commanders 2018-04-20 18:04:54 +01:00
Hanmac
6911906c4f CardThemedDeckBuilder: some final fixes 2018-04-20 13:04:12 +02:00
Hanmac
47cf2040f6 PlayerControllerHuman: chooseCardName need to respect face name 2018-04-20 13:03:35 +02:00
austinio7116
d0b4fa9328 Use later reprints in card-themed generated decks 2018-04-19 17:11:35 +01:00
austinio7116
76cad4ae7e Fixed repeated cards in brawl and improved quality of randomly added cards 2018-04-19 12:58:15 +01:00
austinio7116
77da5c973b Fixed repeated cards in brawl 2018-04-18 22:54:52 +01: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
0aea9ce153 Fix imports.
Woops, commited too fast. Adding imports for MyRandom.
2018-04-17 16:28:27 -07:00
Meerkov
4925db1b66 Remove Math.Random in favor of MyRandom.
This is a continuation of the RNG updates. Math.Random is an insecure PRNG which is actually different than java.util.Random as well.
2018-04-17 16:25:43 -07:00
Meerkov
72baafe4f2 Deletes 5 year old, unused JQuery code.
It seems like the developer planned to do something with it, but never did. Removing it seems like the only reasonable action.
2018-04-17 16:14:35 -07:00
Meerkov
64b98a84f5 Fix memory leak in FServerManager. 2018-04-17 16:11:25 -07:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07: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
Hanmac
79c9c914e2 LandAbility: do extra ability class, so it can use mayPlay 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
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
austinio7116
dfa409da1b Fixed commander based deck generation error with adding random extra cards 2018-04-15 07:31:53 +01:00
Agetian
faca4089b7 - Added PS_RIX1 puzzle.
- Fixed Puzzle Mode init for setting the player's hand size which sometimes failed to work.
2018-04-10 22:11:29 +03:00
Agetian
7e58e204ed - Code style cleanup/unification in multiplayer Forge for Android. 2018-04-10 10:49:24 +03:00
austinio7116
bd321edd20 Updated card deck generation files, plus fixed bug with recent generation code change 2018-04-09 09:31:58 +01:00
austinio7116
e0b7061ac3 Fix to ensure randomly added cards in deck generation for commander/brawl are not illegal repeat copies of the commander 2018-04-08 06:10:37 +01:00
Sol
f7099b4555 Merge branch 'network-play' into 'master'
use CardView for selection of exterting attackers

See merge request core-developers/forge!345
2018-04-04 02:37:47 +00:00
Jamin W. Collins
3f8a3f3342 use CardView for selection of exterting attackers
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-04-03 20:12:15 -06:00
Michael Kamensky
4537c364ec Merge branch 'bugfixes2' into 'master'
Catch UPNP error on android to allow hosting network game

See merge request core-developers/forge!341
2018-04-03 04:45:12 +00:00
austinio7116
e6ddc61e86 Catch UPNP error on android to allow hosting network game 2018-04-02 23:31:06 +01:00
austinio7116
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
austinio7116
d11013c689 Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:23:22 +01:00
maustin
f3d11dbe5b Merge branch 'master' into BrawlFormat 2018-03-30 22:07:13 +01:00
austinio7116
c78d235b07 Moved formats into single files with new "Order", "Core" and "Name" properties. 2018-03-30 21:57:13 +01:00
Jamin W. Collins
2f5a83e171 Show external IP when hosting, if possible
Fixes: core-developers/forge#396

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-30 08:37:17 -06:00
austinio7116
057f5face3 Fixed folder format loading to ensure core sets load first (otherwise android may not load standard correctly) 2018-03-30 09:53:35 +01:00
maustin
021c133db3 Merge branch 'master' into BrawlFormat 2018-03-30 08:06:39 +01:00
austinio7116
9082a89c59 Moved formats into separate folder so that additional custom format files can be added - added Pauper and Kaladesh_Standard as examples 2018-03-30 07:49:54 +01:00
Michael Kamensky
70eec78416 Merge branch 'BrawlFormat' into 'master'
Brawl format

See merge request core-developers/forge!324
2018-03-30 06:35:07 +00:00
austinio7116
3ea9f7d218 Removed unwanted whitespace and imports 2018-03-29 21:06:41 +01:00
austinio7116
e26887036e Now using filterrules rather than printing rules to determine if a card is brawl legal - still using printing rules to determine which basic lands to use in generated decks 2018-03-29 16:28:32 +01:00
Jamin W. Collins
1d5a3b0184 ensure that SAVs are used for player decision
Fixes: core-developers/forge#390

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-29 09:26:53 -06:00
austinio7116
70bd88e2d9 Fixed failing tests due to missing StaticData. Fixed Commander-based fully random deck generation. 2018-03-29 08:47:15 +01:00
austinio7116
9e053865e1 Code cleanup 2018-03-29 07:00:37 +01:00
austinio7116
08dc5f5654 Fixed deckformat to fully support Brawl requiring standard legal cards. Deck generation for brawl working on desktop and android. 2018-03-29 06:33:02 +01:00
austinio7116
ed564b904f Random brawl deck generator working on Desktop 2018-03-28 23:41:57 +01:00
austinio7116
e2ee43fb2d Code cleanup 2018-03-27 23:04:16 +01:00
austinio7116
364bf3724f Added UI elements required for Brawl variant 2018-03-26 06:57:15 +01:00