Jamin W. Collins
81af09d86f
ensure variants are only disabled for network play
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-01 04:41:30 -07:00
Jamin W. Collins
4299491104
avoid creating an additinal map of all cards
...
While getting all cards is needed for some network play variants, they
can be retrieved with the additional memory usage. The nested lookup
isn't as elegant (IMO) but does avoid memory bloat with the additional
data structure.
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-01 04:24:50 -07:00
austinio7116
ad693eb71f
Switched off deck builder logging
2018-03-01 07:09:28 +00:00
maustin
02eb8f632f
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
...
# Conflicts:
# forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
# forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
2018-03-01 06:55:16 +00:00
austinio7116
352236c390
Moved magic number to static variable
2018-03-01 06:54:04 +00:00
austinio7116
cb5f5938f7
Fixed issue with using random n-color deck generators for commander and tiny leaders by switching to the same deck generator as the card-based deck generation for consistency and to prevent tiny leader decks being short of cards using the n-color generators.
2018-03-01 06:14:38 +00:00
austinio7116
ed4583ee7a
Fixed adding wastes in colourless decks
2018-03-01 06:14:38 +00:00
austinio7116
d4b09f39ad
Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model.
2018-03-01 06:14:38 +00:00
austinio7116
25ab2ca2dc
Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model.
2018-03-01 06:13:25 +00:00
maustin
c6714fcc4e
Merge remote-tracking branch 'origin/master'
2018-03-01 06:12:36 +00:00
Sol
0f558f0479
Merge branch 'fix-zealous-inquisitor' into 'master'
...
Fix Zealous Inquisitor spell description
See merge request core-developers/forge!264
2018-03-01 03:29:34 +00:00
Chris H
4ca87ab84e
Fix Zealous Inquisitor spell description
2018-02-28 22:28:14 -05:00
Sol
90d9c45134
Merge branch 'multiplayer' into 'master'
...
Multiplayer
Closes #157
See merge request core-developers/forge!262
2018-03-01 03:12:26 +00:00
Jamin W. Collins
193f1f8b23
network play: enable Vanguard
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 20:03:53 -07:00
Jamin W. Collins
3415d76b40
allow ALL cards to be (de)serialized
...
This is needed by network play variants like:
- Vanguard
- Planechase
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 20:03:53 -07:00
Jamin W. Collins
a5b9512fdb
network play: allow readying if Momir is selected
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 20:03:53 -07:00
Jamin Collins
8db64ffd0a
Merge branch 'fix-npe-token-scripts' into 'master'
...
Fix NPE for Tokens created by Liliana the Last Hope
See merge request core-developers/forge!263
2018-03-01 02:15:12 +00:00
Chris H
9a6f407a6d
Fix NPE for Tokens created by Liliana the Last Hope
2018-02-28 21:09:27 -05:00
Jamin W. Collins
26c0df6e05
network play: fix for Commander and Tiny Leaders variants
...
This method is called numerous times, many before the Commander data has
been populated on the PlayerView objects. This is reflected a few lines
above where similar logic is applied to the current PlayerView. This
simply applies similar logic to the player's opponents.
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 18:24:19 -07:00
Jamin W. Collins
420d31f825
replicate PlayerView(s) from incoming to existing
...
With standard network play games, we got lucky. With variants the
existing approach was not accurately reflecting state changes. This
appears to be resolved by replicating incoming PlayerView objects onto
their existing versions inside the Tracker object.
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 18:09:49 -07:00
Jamin W. Collins
72ca147b73
ensure that selected variant is applied to GameRules
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 17:59:38 -07:00
Jamin W. Collins
f1a001a834
retrieve GameType from the Lobby
...
The existing GameView does not accurately reflect the GameType when
variants are selected. The Lobby does have the correct GameType.
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 17:55:32 -07:00
Jamin W. Collins
2b704e16c7
disable all network play variants
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 17:48:45 -07:00
Jamin W. Collins
2c55a9d86c
bump commons-lang3 version for Java 9 support
...
Closes core-developers/forge#157
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-28 17:44:30 -07:00
Rob Schnautz
e4d45a1369
Update eladamris_call.txt
2018-03-01 00:41:20 +00:00
Rob Schnautz
eebeb4a213
Update imperial_recruiter.txt
2018-03-01 00:40:46 +00:00
Rob Schnautz
c70791b25c
Update ratcatcher.txt
2018-03-01 00:38:18 +00:00
austinio7116
9aa6990823
Fixed issue with using random n-color deck generators for commander and tiny leaders by switching to the same deck generator as the card-based deck generation for consistency and to prevent tiny leader decks being short of cards using the n-color generators.
2018-02-28 22:11:05 +00:00
maustin
67b04aa48b
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-02-28 18:07:46 +00:00
austinio7116
0dc62d67ef
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-02-28 18:07:37 +00:00
maustin
f3e91e22d9
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-02-28 18:06:14 +00:00
austinio7116
f8f3f640e3
Fixed adding wastes in colourless decks
2018-02-28 18:05:58 +00:00
austinio7116
63a1fe0b9e
Fixed adding wastes in colourless decks
2018-02-28 15:14:41 +00:00
maustin
d9dffe0151
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-02-28 13:53:53 +00:00
austinio7116
6f28d0721e
Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model.
2018-02-28 13:53:43 +00:00
maustin
61eef2b86f
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
...
# Conflicts:
# forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
2018-02-28 13:00:50 +00:00
austinio7116
74d0e4c4dc
Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model.
2018-02-28 13:00:10 +00:00
austinio7116
2b40b6e560
Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model.
2018-02-28 12:10:53 +00:00
maustin
86878541f3
Merge remote-tracking branch 'origin/master'
2018-02-28 06:33:59 +00:00
Sol
b0a786970f
Merge branch 'commanderDeckGenerator' into 'master'
...
Commander deck generator
See merge request core-developers/forge!249
2018-02-28 02:55:11 +00:00
maustin
92e548462d
Merge remote-tracking branch 'origin/master'
2018-02-27 22:14:54 +00:00
austinio7116
d05e1e59dc
Merge branch 'token_scripts' into 'master'
...
Allow scripts to be written for Tokens
See merge request core-developers/forge!236
2018-02-27 22:14:13 +00:00
austinio7116
9638153581
Attempting to revert accidental README change
2018-02-27 14:58:47 +00:00
maustin
0e06251424
Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator
2018-02-27 14:52:56 +00:00
austinio7116
c5c04e762f
Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review
2018-02-27 14:52:41 +00:00
austinio7116
e361f09691
Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review
2018-02-27 08:17:48 +00:00
austinio7116
1b1eb6636d
Fixed mobile bug where card-gen decks disabled but still tries to load standard card-based decks
2018-02-27 06:40:59 +00:00
austinio7116
80a2d902c0
Updated card-based deck generation matrix with latest decks
2018-02-27 00:22:35 +00:00
austinio7116
6940eec453
Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator
2018-02-26 23:58:22 +00:00
austinio7116
aaf27f2d60
Added options to disable card based deck generation and to ensure it fails gracefully if .dat data and/or decks folder is missing
2018-02-26 23:54:27 +00:00
