Commit Graph

37527 Commits

Author SHA1 Message Date
Michael Kamensky
d444e8896c Merge branch 'Fireslinger' into 'master'
Fireslinger

See merge request core-developers/forge!211
2018-02-18 07:36:27 +00:00
Michael Kamensky
935d42af74 Merge branch 'SuddenImpact' into 'master'
Force use of Sudden Impact during enemy draw step after drawing if enemy holds…

See merge request core-developers/forge!212
2018-02-18 07:34:03 +00:00
Michael Kamensky
a9e15c2d33 Merge branch 'Guavafix' into 'master'
The guava fix

See merge request core-developers/forge!217
2018-02-18 07:17:15 +00:00
Michael Kamensky
b5ae52a3b6 Merge branch 'AiNonstacking' into 'master'
AI Nonstacking Permanents

See merge request core-developers/forge!222
2018-02-18 05:54:50 +00:00
Michael Kamensky
abf405fd20 Merge branch 'deck-editor' into 'master'
add option to foil cards in a deck

See merge request core-developers/forge!219
2018-02-18 05:50:49 +00:00
Michael Kamensky
3215eb9a8a Merge branch 'CounterFromAbilityAI' into 'master'
Counter from ability ai

See merge request core-developers/forge!224
2018-02-18 05:49:09 +00:00
Michael Kamensky
f2ddd697e9 Merge branch 'AICuriosity' into 'master'
Ai curiosity

See merge request core-developers/forge!225
2018-02-18 05:47:57 +00:00
Michael Kamensky
9e6fc59505 Merge branch 'Oaths' into 'master'
Oaths

See merge request core-developers/forge!227
2018-02-18 05:45:47 +00:00
Michael Kamensky
2dc0e10c34 Merge branch 'TreasureTroveFix' into 'master'
AI Logic name in code and actual card scripts did not match. Assuming the…

See merge request core-developers/forge!228
2018-02-18 05:45:14 +00:00
Sol
2a086c8b64 Merge branch 'token-artwork' into 'master'
Token artwork

See merge request core-developers/forge!214
2018-02-18 03:08:38 +00:00
Seravy
cf9e3a5f1d "Tap to deal X damage to target player" should be a priority target even if it's a defender or 0 attack creature 2018-02-17 22:58:45 +01:00
Seravy
91616396b7 Also no need to block if Awakening is in play. Adding here to prevent future merge conflict with Fog having the same effect. 2018-02-17 21:21:06 +01:00
Seravy
300e3fd4d3 Fixed using the fog effect on "about to die" Spike Weaver 2018-02-17 21:14:59 +01:00
Jamin W. Collins
373e11bc41 add option to foil cards in a deck
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-17 12:42:56 -07:00
Seravy
4cb140512a AI and autopayments now work correctly with Reflecting Pool.
When the player has to pick colors, it'll always use the menu for consistency, instead of using the side panel for choices between 2 colors and the menu for 3+.
2018-02-17 19:53:23 +01:00
Seravy
bb27eab819 Merge branch 'Guavafix' 2018-02-17 16:53:49 +01:00
Jamin W. Collins
d99dd5f19f add commandline parsing/options to mobile-dev
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-17 08:50:41 -07:00
Jamin W. Collins
d60d350fcb token-artwork - try removing variant as a fallback
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-17 08:48:46 -07:00
Jamin W. Collins
b1e7e407a7 token artwork - try uppercase set name
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-17 08:48:46 -07:00
Jamin W. Collins
4e7d338144 improve "Copy to Clipboard" - merge reprinted cards
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-17 08:48:45 -07:00
Hanmac
4528541b3f AiController: add orderSa for token and pump effects for Hero of Bladehold 2018-02-17 16:25:41 +01:00
Hanmac
a829dc72bc CardFactoryUtil: make CantBeBlockedBy into new StaticAbility 2018-02-17 15:25:51 +01:00
Seravy
9e58ec0f80 React to removal of Spike Weaver by using the effect if it's already planning to do later
Don't leave blockers if planning to use fog effect, except the card that will do so. (might need to tap to use it, or might get killed if attacking)
2018-02-17 14:04:31 +01:00
Seravy
606f52e493 Improved feature 2018-02-17 13:18:24 +01:00
Seravy
769f6ea976 Reserve mana for fog effects if in danger 2018-02-17 12:38:52 +01:00
Seravy
b6395aa463 The guava fix 2018-02-17 12:06:57 +01:00
Hanmac
3f1d6238ff CardFactoryUtil: add Battle cry as trigger 2018-02-17 12:01:53 +01:00
Seravy
89eed17839 Reserve mana for fog effects 2018-02-17 12:01:39 +01:00
Hanmac
e990c3648e cards: update card scripts for new CantBlockByStatic 2018-02-17 10:29:07 +01:00
Seravy
67f9be5d4d endswith->equals 2018-02-17 01:19:37 +01:00
Seravy
8650a147aa AI Logic name in code and actual card scripts did not match. Assuming the scripts (6 cards) are correct as no card uses the other name. 2018-02-17 00:46:32 +01:00
Hanmac
8490f8d90b Card: fixed CARDNAME & EFFECTSOURCE on the static abilties 2018-02-16 20:55:17 +01:00
Hanmac
8f1c7bf40a EffectEffect: add AtEOT, remembering host card 2018-02-16 20:44:48 +01:00
Hanmac
ec87b64d0c Blazing Torch: CantBlockBy example 2018-02-16 16:51:37 +01:00
Hanmac
27eee4c8fa Card: show CantBlockBy on affected creature 2018-02-16 16:50:43 +01:00
Hanmac
af32152bcc CantBlockBy: now done as static ability 2018-02-16 16:49:25 +01:00
Hanmac
e72edb95b5 Manifest: fixed check with worms of the earth 2018-02-16 14:02:34 +01:00
Hanmac
efed143a11 ReplaceMoved: fixed zonetype check 2018-02-16 14:01:07 +01:00
Seravy
99f64d7565 Add fear to evasion abilities 2018-02-16 12:34:35 +01:00
Seravy
32ef472b0c AI prefers evasion or "tap to deal damage to player" creatures to enchant with these. 2018-02-16 12:22:50 +01:00
Sol
7ade1b9a52 Merge branch 'multiplayer' into 'master'
Multiplayer

See merge request core-developers/forge!207
2018-02-16 01:07:35 +00:00
Sol
cc664d1280 Merge branch 'DefaultFiltersOption' into 'master'
Default filters option

See merge request core-developers/forge!175
2018-02-16 01:00:20 +00:00
Jamin W. Collins
84874601a9 Continue but log NullPointerException in getMana
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-15 17:08:01 -07:00
Jamin W. Collins
b47d528bf0 ensure that remote client has trackers defined
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-15 17:07:14 -07:00
Seravy
59612c45ea Resolving conflicts 2018-02-15 10:03:54 +01:00
Seravy
e8be6f674e Add quest mode option to make Foil and Personal Rating filters default on all editor screens. 2018-02-15 10:01:59 +01:00
Seravy
33554dd9cc changed order 2018-02-15 09:48:26 +01:00
Seravy
4dd73930e3 p->P 2018-02-15 09:40:28 +01:00
Seravy
af14c33e39 Fixed problems with previous commit 2018-02-14 22:26:54 +01:00
Seravy
7e9312a93c Added :
-Never play if would suicide, unless we are losing the game next turn anyway AND it results in a double KO
-If AI has the cards that work better on small hand, do play Price of Progress even if it doesn't deal good damage to the enemy. (important synergy within Tempest block with major tournament tier cards)
2018-02-14 21:39:49 +01:00