Commit Graph

39874 Commits

Author SHA1 Message Date
Agetian
463cc7675a - Updating CHANGES.txt. 2018-12-06 20:53:54 +03:00
Agetian
788dfbcb38 - Fix deck descriptions. 2018-12-06 20:48:26 +03:00
Agetian
83c345231b Merge branch 'TempestWorld' of git.cardforge.org:Seravy/forge into tempest-world 2018-12-06 20:46:23 +03:00
Michael Kamensky
c34f6366e0 Merge branch 'master' into 'master'
Ultimate Masters booster definition

See merge request core-developers/forge!1184
2018-12-06 17:14:29 +00:00
Agetian
6b7088e04c - Added AI spec to Skilled Animator. 2018-12-06 20:11:40 +03:00
Agetian
c8fc73e471 - Adding booster definition to Ultimate Masters, enabling it for drafting. 2018-12-06 20:11:18 +03:00
Agetian
cfb63b7483 Merge remote-tracking branch 'origin/venerated-loxodon-fix' into venerated-loxodon-fix
# Conflicts:
#	forge-game/src/main/java/forge/game/cost/CostAdjustment.java
2018-12-06 17:29:31 +03:00
Agetian
74c7dd0305 - Tweaked the comment. 2018-12-06 17:28:13 +03:00
Agetian
9cbada32aa - 2018-12-06 10:23:12 +03:00
Agetian
e23790fd90 - Attempting to fix Venerated Loxodon not giving counters to creatures that helped convoke it. 2018-12-06 10:23:12 +03:00
Michael Kamensky
b5fc7880ac Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_GRN9 (Possibility Storm - Guilds of Ravnica 09).

See merge request core-developers/forge!1183
2018-12-06 07:21:31 +00:00
Agetian
fb5a20a5be - Added puzzle PS_GRN9. 2018-12-06 10:20:51 +03:00
Michael Kamensky
ae10de4f1e Merge branch 'master' into 'master'
Added an Aether filter to Planar Conquest which allows to search for cards playable in colorless decks.

See merge request core-developers/forge!1182
2018-12-06 06:58:03 +00:00
Agetian
d867af4b45 - Added an Aether filter to Planar Conquest which allows to search for cards playable in colorless decks (useful for colorless commanders). 2018-12-06 09:57:13 +03:00
Michael Kamensky
e2c968182b Merge branch 'master' into 'master'
AI shouldn't move counters if the creature currently trades, otherwise it'll lose material unfavorably

See merge request core-developers/forge!1181
2018-12-06 05:40:59 +00:00
Agetian
879084bec2 - Replace sa.getHostCard() with source 2018-12-06 08:39:45 +03:00
Agetian
281b56fba3 - AI shouldn't move the counters if it can trade with the opposing creature, otherwise it'll lose material. 2018-12-06 08:37:10 +03:00
Michael Kamensky
d9da6cdcb5 Merge branch 'master' into 'master'
Support detecting blocking threatened creatures in AILogic$ MoveCounter.

See merge request core-developers/forge!1180
2018-12-06 05:03:38 +00:00
Agetian
7f7a033f12 - Support detecting blocking threatened creatures in AILogic$ MoveCounter. 2018-12-06 08:03:00 +03:00
Michael Kamensky
a93819ae31 Merge branch 'master' into 'master'
Unbreak the MoveCounter logic.

See merge request core-developers/forge!1179
2018-12-06 04:45:17 +00:00
Agetian
e8ebfebaca - Unbreak the MoveCounter logic. 2018-12-06 07:44:01 +03:00
Michael Kamensky
8d367542ff Merge branch 'ai-spike-logicname' into 'master'
Better name for the MoveCounter logic for Spikes.

See merge request core-developers/forge!1178
2018-12-06 04:36:02 +00:00
Agetian
05672bb174 - Better name for the MoveCounter logic for Spikes. 2018-12-06 07:17:31 +03:00
Michael Kamensky
a9fb10ca7d Merge branch 'ai-spike2' into 'master'
AI Spike support, part 3.

See merge request core-developers/forge!1177
2018-12-05 19:33:52 +00:00
Agetian
27527e09f7 - Don't move counters away from spikes with extra counter effects too zealously. 2018-12-05 22:33:12 +03:00
Michael Kamensky
b64171962a Merge branch 'ai-spike2' into 'master'
Spike AI support, part 2

See merge request core-developers/forge!1176
2018-12-05 19:13:03 +00:00
Agetian
41f505e636 - Don't move counters to a threatened creature. 2018-12-05 22:12:28 +03:00
Michael Kamensky
b67ad955a7 Merge branch 'ai-spikes' into 'master'
Extended AI support for Spikes (Tempest)

See merge request core-developers/forge!1175
2018-12-05 18:57:52 +00:00
Agetian
3719812889 - Refactor the method for the logic. 2018-12-05 21:57:17 +03:00
Agetian
498237a65e - Comment fix 2018-12-05 21:55:27 +03:00
Agetian
8e7a9d46cd - Account for tapped diff in evaluation. 2018-12-05 21:53:49 +03:00
Agetian
f588038ac9 - Predict lethal combat. 2018-12-05 21:39:43 +03:00
Agetian
17a922ae5a - Basic logic for fake counter move on Spikes from Tempest. 2018-12-05 21:30:21 +03:00
Agetian
1905ff30dd - 2018-12-05 20:28:50 +03:00
Agetian
c2a1508ed6 - Attempting to fix Venerated Loxodon not giving counters to creatures that helped convoke it. 2018-12-05 18:20:56 +03:00
Michael Kamensky
6c0465a1d0 Merge branch 'ai-blockfix' into 'master'
Fixed the AI trying to gang-block and kill an attacker which can't be killed due to damage prevention

See merge request core-developers/forge!1173
2018-12-05 13:45:09 +00:00
Agetian
d4ee65f937 - Fixed the AI trying to gang-block and kill an attacker which can't be killed because combat damage to it would be prevented.
- Added a couple AI hints to Ajani's Welcome.
2018-12-05 16:44:20 +03:00
Hans Mackowiak
0f7df1f4e1 Merge branch 'patch-2' into 'master'
Update CardFactoryUtil

Closes #775

See merge request core-developers/forge!1172
2018-12-05 10:53:57 +00:00
Hans Mackowiak
fb77b652a7 Update CardFactoryUtil
Closes #775
2018-12-05 10:53:38 +00:00
Hans Mackowiak
bd71858e22 Merge branch 'attachAIReanimate' into 'master'
AttachAI Reanimate Logic

See merge request core-developers/forge!1169
2018-12-04 20:28:23 +00:00
Hans Mackowiak
732a81ac88 AttachAI Reanimate Logic 2018-12-04 20:28:23 +00:00
Michael Kamensky
f2565f479c Merge branch 'master' into 'master'
Tweak the card count and some other stuff in new Planar Conquest event decks.

See merge request core-developers/forge!1171
2018-12-04 20:01:52 +00:00
Agetian
3925001cb1 - Tweak the card count and some other stuff in new Planar Conquest event decks. 2018-12-04 23:00:13 +03:00
Hans Mackowiak
ee5b25a752 Merge branch 'patch-2' into 'master'
Update fire_omen_crane

Closes #773

See merge request core-developers/forge!1170
2018-12-04 17:01:10 +00:00
Hans Mackowiak
9fc3348d4a Update fire_omen_crane
Closes #773
2018-12-04 17:00:59 +00:00
Michael Kamensky
f3ff793029 Merge branch 'ai-buyback' into 'master'
Various AI updates and fixes + rewritten enhanced Buyback logic

See merge request core-developers/forge!1168
2018-12-04 13:22:26 +00:00
Agetian
1d7188b8f5 - Minor logic tweak (Buyback) + AI property
- hasXInAnyCostPart doesn't need a SA parameter now that it's in Cost.
- Fixed a minor mistype on mobile Forge.
2018-12-04 16:17:03 +03:00
Agetian
a2ca811136 - Minor logic tweak (Buyback)
- hasXInAnyCostPart doesn't need a SA parameter now that it's in Cost.
- Fixed a minor mistype on mobile Forge.
2018-12-04 16:11:08 +03:00
Agetian
4d1b7a9aec - Logic improvement (Buyback) 2018-12-04 14:51:30 +03:00
Agetian
ae5090a69a - More careful use of Buyback spells without Buyback. 2018-12-04 14:33:46 +03:00