Commit Graph

37131 Commits

Author SHA1 Message Date
swordshine
077eb106e3 Merge branch 'master' into 'master'
Updates the project for Java 8.

See merge request core-developers/forge!416
2018-04-17 02:48:14 +00:00
swordshine
3070dddf96 - Updated the oracle text of Blackblade Reforged 2018-04-17 10:45:30 +08:00
swordshine
708668df3f Merge branch 'migrate_upcoming' into 'master'
Migrate upcoming DOM files

See merge request core-developers/forge!417
2018-04-17 02:42:44 +00:00
Chris H
ea1770b1a7 Migrate upcoming DOM files 2018-04-16 21:32:59 -04:00
Meerkov
1cfb937490 Updates the project for Java 8.
Maps.newHashMap() was replaced with null in numerous locations. A null check is performed in the locations that read this value. This prevents unnecessary allocation of memory and fixes compiler errors.

"final" keyword added to RepeatEachEffect, which used local variables in non-local scope.
2018-04-16 18:26:15 -07:00
Agetian
ae05e58a13 - Somewhat more explicit method name. 2018-04-16 22:18:33 +03:00
Agetian
2c9b23fc6d - Better ranking system for damaging planeswalkers directly (accounts for loyalty and closeness to ultimate for now). 2018-04-16 21:31:49 +03:00
Agetian
1fb559aedb - Experimental: DigAi prefers to give lands to the opponent instead of functional cards e.g. for Karn, Scion of Urza. 2018-04-16 07:36:44 +03:00
Michael Kamensky
29292956b6 Merge branch 'assorted-fixes' into 'master'
A better implementation of reckless attack prevention in AiAttackController.

See merge request core-developers/forge!412
2018-04-16 04:32:14 +00:00
Agetian
ffaf0eb8d5 - A better implementation of reckless attack prevention in AiAttackController. 2018-04-16 07:30:40 +03:00
swordshine
3344453253 Merge branch 'ai-careful-attack-effect' into 'master'
Cautiously configured AI should not chump attack recklessly with creatures that have AttackEffect/CombatEffect trying purely to trigger their effect.

See merge request core-developers/forge!411
2018-04-16 00:51:55 +00:00
swordshine
b60d0e057d Merge branch 'ai-haste-detection' into 'master'
Improve the AI Haste detection from Command zone and opponent's Battlefield

See merge request core-developers/forge!410
2018-04-16 00:51:09 +00:00
swordshine
9d0ffaddc5 Merge branch 'assorted-fixes' into 'master'
Improve the AI timing for Indestructible pump abilities.

Closes #507

See merge request core-developers/forge!409
2018-04-16 00:49:51 +00:00
Agetian
1bb5f10fad - Better place for the defPower count. 2018-04-15 21:32:33 +03:00
Agetian
c0d65afde4 - Fixing an inadvertent comment change. 2018-04-15 21:12:58 +03:00
Agetian
e37ac89b88 - A somewhat better logic correction for attacking into dangerous blocks. 2018-04-15 21:11:05 +03:00
Agetian
cbd1ecec12 - AI should not attack recklessly with Kari Zev, Skyship Raider into certain death trying only to trigger its attack effect.
- AI SVar "DontChumpAttackForEffect" can probably be added to other cards with weak or temporary attack effects that are not worth wasting a card for.
2018-04-15 20:05:05 +03:00
Agetian
536dfb5f2d - Attempting to improve Haste detection for the AI such that the AI properly casts creatures in main 1 when there's an Avatar or Emblem or something else giving Haste from the command zone, or if the opponent has something on the battlefield that gives Haste to AI's creatures as well (e.g. Mass Hysteria). 2018-04-15 18:29:48 +03:00
Agetian
6a288419bc - Attempting to improve the AI timing for Indestructible pump abilities. 2018-04-15 16:29:11 +03:00
austinio7116
3a427188dd Merge branch 'assorted-fixes' into 'master'
Fixed a bug that caused the deck not to reset properly after playing Momir/MoJhoSto.

Closes #510

See merge request core-developers/forge!407
2018-04-15 10:53:15 +00:00
Agetian
0ca1166f0c - No need to provide the name for autogen decks. 2018-04-15 13:27:53 +03:00
Agetian
ec2e04f401 - Fixed a bug that caused the deck not to reset properly after playing Momir/MoJhoSto. 2018-04-15 13:19:15 +03:00
Michael Kamensky
d220b49324 Merge branch 'master' into 'master'
- Updating CHANGES.txt.

See merge request core-developers/forge!406
2018-04-15 08:32:40 +00:00
Agetian
ec467a81db - Updating CHANGES.txt. 2018-04-15 11:31:41 +03:00
swordshine
85458cfe5a Merge branch 'ai-dealdamage-to-planeswalker' into 'master'
Simple direct damage to planeswalkers AI

See merge request core-developers/forge!381
2018-04-15 07:43:54 +00:00
Michael Kamensky
802d084070 Merge branch 'bugfixes' into 'master'
Fixed commander based deck generation error with adding random extra cards

See merge request core-developers/forge!405
2018-04-15 07:12:26 +00:00
austinio7116
dfa409da1b Fixed commander based deck generation error with adding random extra cards 2018-04-15 07:31:53 +01:00
Michael Kamensky
a524ed4439 Merge branch 'dominariadraft' into 'master'
Added some missing raritites from the dominaria editions file - rat colony and voltaic servant

See merge request core-developers/forge!404
2018-04-14 18:15:44 +00:00
austinio7116
fbfc4c43f4 Added some missing raritites from the dominaria editions file - rat colony and voltaic servant 2018-04-14 19:13:39 +01:00
Michael Kamensky
1c4670e42f Merge branch 'dom-card-fixes' into 'master'
Helm of the Host ability triggers at beginning of combat

See merge request core-developers/forge!403
2018-04-14 15:57:03 +00:00
Luke Way
268ccc2cd5 Helm of the Host ability triggers at beginning of combat 2018-04-14 11:30:52 -04:00
Michael Kamensky
2e342b32f2 Merge branch 'muldrotha' into 'master'
MayPlay: fixed mayPlay with multiple static abilities

See merge request core-developers/forge!402
2018-04-14 14:57:48 +00:00
Hanmac
32737ed9a3 MayPlay: fixed mayPlay with multiple static abilities 2018-04-14 09:24:26 +02:00
austinio7116
a280772be0 Merge branch 'assorted-fixes' into 'master'
- Dominaria Planeswalker deck fix + minor update.

See merge request core-developers/forge!401
2018-04-14 05:31:17 +00:00
Agetian
f75ed58a97 - Fixed Teferi planeswalker deck.
- Somewhat more informative descriptions for Dominaria planeswalker decks.
2018-04-14 08:24:00 +03:00
Hans Mackowiak
f1084158e1 Merge branch 'KickedManaRestrict' into 'master'
AbilityManaPart: add valid check for the SA itself

Closes #445 and #456

See merge request core-developers/forge!384
2018-04-14 05:12:46 +00:00
Hanmac
aae587c618 SpellAbility: if it has MultikickerCost it is kicked too 2018-04-13 23:41:45 +02:00
Michael Kamensky
ac72402af4 Merge branch 'bugfixes' into 'master'
Removed promo card and planeswalker deck cards from booster drafts

See merge request core-developers/forge!400
2018-04-13 19:23:00 +00:00
austinio7116
f8d0281931 corrected typo 2018-04-13 20:08:59 +01:00
austinio7116
06e192f595 Removed promo card and planeswalker deck cards from booster drafts 2018-04-13 20:04:25 +01:00
Michael Kamensky
75eb551e22 Merge branch 'patch' into 'master'
DOM: A few fixes

See merge request core-developers/forge!399
2018-04-13 18:54:42 +00:00
Misha Colbourne
64796da026 Update spore_swarm.txt 2018-04-13 18:53:33 +00:00
Misha Colbourne
d00914a11c Update org.eclipse.core.resources.prefs 2018-04-13 18:50:41 +00:00
OgreBattlecruiser
325e404de1 DOM: A few fixes 2018-04-13 19:47:30 +01:00
Agetian
e28b683b89 - Correct some code style issues. 2018-04-13 21:43:31 +03:00
Agetian
82bd0325cf - Only process actual planeswalkers when choosing PW to damage. 2018-04-13 21:41:10 +03:00
Agetian
a88c8fba76 Merge remote-tracking branch 'origin/ai-dealdamage-to-planeswalker' into ai-dealdamage-to-planeswalker
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
2018-04-13 21:31:00 +03:00
Michael Kamensky
f561f4d67b Merge branch 'bugfixes' into 'master'
Corrected call the cavalry's token image set code

See merge request core-developers/forge!398
2018-04-13 18:29:53 +00:00
Agetian
9a02c5394d - Only process planeswalkers in dealDamageChooseTgtPW. 2018-04-13 21:25:29 +03:00
Agetian
ec09738321 - Added a TODO entry. 2018-04-13 21:24:33 +03:00