Hanmac
7b8e92ace2
CardFactoryUtil: use AdditionalAbilityList with better check for Fabricate
2018-03-06 22:06:24 +01:00
Hanmac
e25247d0e5
SpellAbility: add IsTargeting property, fixed additional abilities for clone
2018-03-06 22:03:00 +01:00
Hanmac
93dc3338c1
SpellAbility: isValid check for root
2018-03-06 22:01:51 +01:00
austinio7116
fcd392eec1
Added Masters 25 to draft blockdata for drafting and corrected Konming Sleeping Dragon quotes and rarity of Akroma
2018-03-06 19:50:36 +00:00
maustin
81b002ad63
Merge branch 'master' into deckgenimprovements
2018-03-06 19:47:06 +00:00
maustin
70feec2f5a
Merge remote-tracking branch 'origin/master'
2018-03-06 19:46:33 +00:00
Agetian
4ddb73e8d2
- When copying deck to clipboard, do not attempt to check the validity of zone sizes to avoid situations when exceptional, but legal deck compositions (such as two partner Commanders) are not allowed / not fully copied.
2018-03-06 22:13:04 +03:00
austinio7116
ca099e077b
Ensuring that non-AI cards are excluded from the list of card-based decks that can be selected for an AI player
2018-03-05 12:43:05 +00:00
austinio7116
30048e7a82
Moved repeated AI slot check logic into single boolean
2018-03-05 08:26:06 +00:00
Michael Kamensky
2ee05f46e7
Merge branch 'masters-25' into 'master'
...
Masters 25 booster box
See merge request core-developers/forge!272
2018-03-05 04:07:18 +00:00
Seravy
3ea30a4461
Basic lands from drafts, except foils, do not get added to the player's inventory, to avoid generating an infinite lands through "add basic land". This both removes potential abuse by selling them, and eliminates the annoyance of having these lands wasting space in your inventory.
2018-03-04 23:53:27 +01:00
Seravy
83bae5ad74
Sold basic lands that could have been added through "Add basic land" will not be removed from decks.
2018-03-04 23:36:48 +01:00
Rob Schnautz
4027e14266
Masters 25
2018-03-04 20:47:02 +00:00
maustin
a84da053a6
Updated card-based deck generation data
2018-03-04 13:58:53 +00:00
austinio7116
1b0955b959
Removed commented out code and moved comment to correct location
2018-03-04 06:35:39 +00:00
Michael Kamensky
bbcea47bfd
Merge branch 'foil' into 'master'
...
move foil option to be available in all sections
See merge request core-developers/forge!269
2018-03-04 05:04:22 +00:00
Michael Kamensky
88f656f937
Merge branch 'master' into 'master'
...
- Preparing Forge for Android v1.6.7.001 [incremental].
See merge request core-developers/forge!270
2018-03-04 05:04:10 +00:00
Agetian
148e569182
- Preparing Forge for Android v1.6.7.001 [incremental].
2018-03-04 08:01:25 +03:00
Jamin W. Collins
d8405e2fc8
move foil option to be available in all sections
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-03 12:08:41 -07:00
Sol
594ce263b6
Merge branch 'multiplayer' into 'master'
...
Multiplayer
Closes #161 and #151
See merge request core-developers/forge!268
2018-03-03 14:27:12 +00:00
austinio7116
73a623cc1b
Fixed card-based deck generation where extra colours were kept despite no cards of that colour being included.
2018-03-03 10:53:57 +00:00
austinio7116
e0882ab6b5
Switched off logging in deckbuilder
2018-03-03 10:23:31 +00:00
maustin
c93d9d909d
Merge branch 'master' into deckgenimprovements
2018-03-03 07:19:44 +00:00
maustin
8e5775dd2c
Merge remote-tracking branch 'origin/master'
2018-03-03 07:16:41 +00:00
Michael Kamensky
dd38c0d581
Merge branch 'oracle-updates' into 'master'
...
Oracle updates
See merge request core-developers/forge!266
2018-03-03 04:28:57 +00:00
Jamin W. Collins
f01df7bdd2
display broadcast messages on server too
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-02 18:58:34 -07:00
Jamin W. Collins
ed16e6f4e9
option to fully reset the OnlineLobby
...
Closes core-developers/forge#161
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-02 18:58:34 -07:00
Jamin W. Collins
e9217f3261
fix server startup indentation for readability
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-02 18:58:34 -07:00
Jamin W. Collins
d2e4c53c20
Improve TargetSelection#chooseCardFromList
...
Closes core-developers/forge#151
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-03-02 18:58:34 -07:00
Jamin Collins
c402ae645e
Merge branch 'masters25' into 'master'
...
Adding Masters25 cards and perliminary rankings
See merge request core-developers/forge!267
2018-03-03 00:25:54 +00:00
Chris H
9c69a33734
Adding Masters25 cards and perliminary rankings
2018-03-02 19:12:13 -05:00
Rob Schnautz
47eb18142d
Update summoners_pact.txt
2018-03-02 22:25:11 +00:00
Rob Schnautz
0ca97727ad
Update ash_barrens.txt
2018-03-02 22:24:14 +00:00
maustin
cd0cf2106a
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-03-02 20:09:24 +00:00
austinio7116
edc921bf98
Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings.
2018-03-02 20:09:06 +00:00
austinio7116
b67c060211
Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings.
2018-03-02 19:49:42 +00:00
maustin
cb5791276a
Fixed AI commander and tiny leader decks not being passed correct forAI boolean so including non AI playable cards. Also allowed more lands in generated decks if required.
2018-03-02 19:28:05 +00:00
Michael Kamensky
d20317dd62
Merge branch 'patch-1' into 'master'
...
Oracle updates
See merge request core-developers/forge!261
2018-03-01 17:00:13 +00:00
austinio7116
9cfc42156d
Remove dual lands from mono coloured generated decks
2018-03-01 16:07:09 +00:00
austinio7116
52d8e3d54f
Fixed issue where generic mana cost creatures with colour identities were getting into decks that could not activate their abilities
2018-03-01 15:37:24 +00:00
maustin
186b56c335
Merge branch 'master' into deckgenimprovements
2018-03-01 12:41:28 +00:00
maustin
006bbf8fa0
Merge remote-tracking branch 'origin/master'
2018-03-01 12:41:11 +00:00
austinio7116
ec6ccb69dd
Merge branch 'multiplayer' into 'master'
...
Multiplayer
See merge request core-developers/forge!265
2018-03-01 12:08:43 +00:00
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
