Sol
a489e0845b
Merge branch 'BonusForWinsOption' into 'master'
...
Bonus for wins option
See merge request core-developers/forge!173
2018-02-11 15:16:10 +00:00
Michael Kamensky
acf7a23965
Merge branch 'HornedKavuFix' into 'master'
...
Fixes Horned Kavu being played incorrectly (returning another Horned Kavu or itself)
See merge request core-developers/forge!201
2018-02-11 14:26:20 +00:00
Hanmac
a96a2fd825
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-02-11 14:53:58 +01:00
Hanmac
d455653f11
Debuff: with keyword changes, directly remove of keywords is not needed anymore, let changed keywords handle that
2018-02-11 14:53:27 +01:00
Seravy
8579ae99a0
Fixes Horned Kavu being played incorrectly (returning another Horned Kavu or itself)
2018-02-11 14:42:41 +01:00
Hanmac
da5cb3d905
check lands: use shorter code for etb replacement
2018-02-11 12:11:04 +01:00
Michael Kamensky
81315e3db4
Merge branch 'assorted-fixes' into 'master'
...
- Simplify a target num check in AiController.
See merge request core-developers/forge!200
2018-02-11 10:28:08 +00:00
Agetian
8a880a3f89
- Simplify a target num check in AiController.
2018-02-11 13:27:11 +03:00
Michael Kamensky
d5da9a80f6
Merge branch 'assorted-fixes' into 'master'
...
- Fixed the AI targeting restrictions check, added an AI logic for The Scarab God.
See merge request core-developers/forge!199
2018-02-11 05:09:39 +00:00
Agetian
670966be57
- Fixed the AI targeting restrictions check in AiController to account for the AILogics that can pre-target cards.
...
- Added an AI logic for The Scarab God (can be generalized later).
2018-02-11 07:46:38 +03:00
Michael Kamensky
5879690fc0
Merge branch 'upcoming_rix2' into 'master'
...
Refresh of Frontier Cube to include RIX
See merge request core-developers/forge!194
2018-02-11 03:54:52 +00:00
Seravy
ff054d44b7
Adding to cards where needed part 3 - Done up to base set 10th ED, expansions Apocalypse
2018-02-11 02:14:58 +01:00
Seravy
e909cfc744
Adding to cards where needed part 2
2018-02-11 01:49:43 +01:00
Seravy
b51ca84a8f
Adding to cards where needed (and removing from cards where it isn't safe to rely on one copy, like Moat)
2018-02-11 00:28:22 +01:00
Seravy
3a9af0480d
Improves "NonStackingEffect" Svar behavior for the AI.
...
The AI will now not play a second copy of these cards if and only if, there is no copy of the card owned by that AI in play, except copies that are enchanted by Auras owned by other players.
Later, a better logic that actually determines whether the enchanting aura removes the relevant ability from the card or not should be added - Warp Artifact will not stop a disk from activating, but Arrest will (if it's a creature).
Note : Only add NonStackingEffect to permanents the AI shouldn't play more than one of at a time if and only if, removal of enchantment is not pontentially leathal to the AI.
For example, do not add to Ensnaring Bridge or Moat, as loss of those allows the enemy to swing with possibly accumulated large armies for likely too much damage.
Those cards will need a different logic, that avoids playing a second copy if and only if the threat the card protects from is already too dangerous.
2018-02-10 23:21:03 +01:00
Michael Kamensky
ebd0a8096c
Merge branch 'error-msg-fixes' into 'master'
...
Disambiguate class name in error StorageReader errors
See merge request core-developers/forge!196
2018-02-10 18:54:01 +00:00
Michael Kamensky
a1f2f8d944
Merge branch 'svn-to-git' into 'master'
...
make development version reference GIT not SVN
See merge request core-developers/forge!198
2018-02-10 18:53:39 +00:00
Jamin W. Collins
0a4dc6961d
make development version reference GIT not SVN
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-10 11:13:41 -07:00
Hanmac
2e196fc41b
CardTaits: make cardtraits inside LKI has the same id's as the in the original object\nReplaceMoved now works with Blood Moon and Blood Sun
2018-02-10 18:50:22 +01:00
Jamin W. Collins
844a7b5d76
Disambiguate class name in error StorageReader errors
...
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com >
2018-02-10 10:28:39 -07:00
Michael Kamensky
ce343ffcdb
Merge branch 'mobile-release' into 'master'
...
- Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes]
See merge request core-developers/forge!195
2018-02-10 16:17:12 +00:00
Agetian
25972aaa29
- Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes]
2018-02-10 19:11:33 +03:00
Seravy
0fe8c1f121
AI will activate ~DestroyAll~ abilities during combat if it would lose the game, or it would take too much damage (Nevinnyrral's Disk, Pernicious Deed)
2018-02-10 13:30:22 +01:00
austinio7116
cb37cf0889
Refresh of Frontier Cube to include RIX
2018-02-10 09:36:49 +00:00
Michael Kamensky
b5721a7e36
Merge branch 'OkkFix' into 'master'
...
Had wrong card name in Oracle text
See merge request core-developers/forge!192
2018-02-10 03:35:54 +00:00
Michael Kamensky
93b40ad867
Merge branch 'descriptions' into 'master'
...
Descriptions
See merge request core-developers/forge!193
2018-02-10 03:35:40 +00:00
Rob Schnautz
a3e5e40385
description, premium Spearbreaker Behemoth
2018-02-10 01:17:19 +00:00
Rob Schnautz
e13ed6f46e
description, premium Paleoloth
2018-02-10 01:15:18 +00:00
Rob Schnautz
65dffbbe3a
description
2018-02-10 01:12:15 +00:00
Rob Schnautz
16dafc9c57
description
...
(cherry picked from commit 909ee41e066207a9c3e4d943fd190e229765be66)
2018-02-10 01:06:35 +00:00
Rob Schnautz
bcd2f95e4d
description
...
(cherry picked from commit f274dbe74e3fcda7e97c40df996b8b1533c04673)
2018-02-10 01:06:16 +00:00
Rob Schnautz
51ae7fee7e
description
2018-02-10 00:55:19 +00:00
Rob Schnautz
2eb276f995
description, premium Treasury Thrull
2018-02-10 00:51:03 +00:00
Rob Schnautz
6a98f9947a
description
2018-02-10 00:48:28 +00:00
Rob Schnautz
66cbd1a30e
description
2018-02-10 00:45:17 +00:00
Rob Schnautz
c8d1b56d9e
description, premium Phyrexian Hydra
2018-02-10 00:44:44 +00:00
Rob Schnautz
457ce2958e
description, premium Doomwake Giant
2018-02-10 00:44:01 +00:00
Rob Schnautz
b7b6d5672e
description, premium Conundrum Sphinx
2018-02-10 00:15:14 +00:00
Rob Schnautz
7dac6197e3
premium Djinn of Wishes
2018-02-10 00:12:03 +00:00
Rob Schnautz
ea40b439ee
description, premium Resolute Archangel
2018-02-10 00:05:32 +00:00
Rob Schnautz
7061f7f26a
premium Flameblast Dragon
2018-02-10 00:00:30 +00:00
Rob Schnautz
de1342a5d7
description, premium Jace's Mindseeker
2018-02-09 23:57:44 +00:00
Rob Schnautz
2f976dbeb3
description, premium Hellkite Charger
2018-02-09 23:51:56 +00:00
Seravy
e37e242bae
Had wrong card name in Oracle text
2018-02-10 00:13:48 +01:00
Michael Kamensky
78c676e858
Merge branch 'assorted-fixes' into 'master'
...
- Updating CHANGES.txt.
See merge request core-developers/forge!191
2018-02-09 18:31:48 +00:00
Agetian
9e74ef9e37
- Updating CHANGES.txt.
2018-02-09 21:30:37 +03:00
Michael Kamensky
1740be22ae
Merge branch 'InvasionWorld' into 'master'
...
Invasion world
See merge request core-developers/forge!189
2018-02-09 18:23:10 +00:00
Hanmac
35c499a074
Crafty Cutpurse: make it use a Control Layer for the Token Create Effect
2018-02-09 17:07:48 +01:00
Seravy
048093522a
Revert "Fixes compile/run bugs in IntelliJ"
...
This reverts commit 36917c0d18
2018-02-09 10:34:39 +00:00
Seravy
66c696bfec
rotam ->rotation amount.
2018-02-09 11:26:04 +01:00
