Commit Graph

2661 Commits

Author SHA1 Message Date
Hans Mackowiak
311eaa70e3 Use EnumSet in Conditions/Restrictions 2020-01-21 06:37:53 +00:00
Agetian
ac041a79f6 - Improve ProtectAi for cards that sacrifice themselves as a part of cost payment. 2020-01-19 10:18:01 +03:00
Blacksmith
b8101d0387 [maven-release-plugin] prepare for next development iteration 2020-01-19 00:54:23 +00:00
Blacksmith
55d02d5adb [maven-release-plugin] prepare release forge-1.6.32 2020-01-19 00:54:18 +00:00
swordshine
c3a95a07a1 Add Heliod's Punishment 2020-01-15 18:39:46 +08:00
swordshine
fd347c10d0 Merge branch 'savant' into 'master'
Arcane Savant and friends

See merge request core-developers/forge!2396
2020-01-14 01:12:09 +00:00
Agetian
45f2193e2a - NPE guard. 2020-01-11 16:44:44 +03:00
Agetian
b329786659 - Improve CopyPermanentAi for Bramble Sovereign. 2020-01-11 16:43:20 +03:00
Adam Pantel
f401c3900c Arcane Savant and friends 2020-01-10 18:29:44 -05:00
Blacksmith
1b130ab157 [maven-release-plugin] prepare for next development iteration 2020-01-08 02:20:36 +00:00
Blacksmith
74005529f5 [maven-release-plugin] prepare release forge-1.6.31 2020-01-08 02:20:31 +00:00
swordshine
3d59f1832c Allure of the Unknown should reveal first 2020-01-05 14:09:33 +08:00
Michael Kamensky
084a7ae73e Added a simple logic for ChooseColor based on devotion (Nyx Lotus) 2020-01-03 13:09:27 +00:00
Hans Mackowiak
b2fcc6e743 Refactor Escape and AlternativeCost 2020-01-03 04:40:09 +00:00
Myrd
a4bd13d050 Fix dumping state with cards with non-matching owner/controllers. 2019-12-20 17:56:37 +00:00
Myrd
267c8c6b0d Avoid combat simulation if the current player has no creatures in play. 2019-12-20 16:57:14 +00:00
Alexei Svitkine
4384b1621b Switch card types lists to sets to avoid costly look ups and
optimize getParamOrDefault() to do a single look up, instead of
two. These were showing up in profiles when using simulation AI.
2019-12-20 11:15:38 -05:00
Myrd
5cb8502566 Revert "Merge branch 'master' into 'master'"
This reverts merge request !2334
2019-12-20 15:48:04 +00:00
Alexei Svitkine
3d59118b94 Use Sets instead of Lists for card types to avoid slow lookups. 2019-12-19 20:49:29 -05:00
Anthony Calosa
d943891e4f additional check (prevent npe on mojhosto) 2019-11-15 10:11:57 +08:00
Blacksmith
c2db78baf7 [maven-release-plugin] prepare for next development iteration 2019-11-11 02:45:55 +00:00
Blacksmith
9a30d78f54 [maven-release-plugin] prepare release forge-1.6.30 2019-11-11 02:45:50 +00:00
Anthony Calosa
ec98d128f1 prevent npe mojhosto 2019-11-09 06:16:58 +08:00
Agetian
1af940b034 - Simpler adventure card detection. 2019-11-07 08:08:03 +03:00
Agetian
8cb1789e60 - Added puzzle PS_ELD4.
- Added OnAdventure functionality to game states.
- Fixed a NPE when dev-adding a card to exile.
2019-11-07 08:06:31 +03:00
Anthony Calosa
85eb740264 aifixes NPE 2019-11-01 12:40:40 +08:00
Hans Mackowiak
06b9dffa55 Player keyword rework 2019-10-15 11:12:20 +00:00
Hans Mackowiak
773df25b53 replace .getZone().is with .isInZone, no null check needed 2019-10-14 18:46:43 +00:00
Anthony Calosa
32621257df update 2019-10-13 17:09:56 +08:00
Anthony Calosa
ff7a8f994c prevent waiting for opponent during assert,
send the exception via sentry
2019-10-13 14:48:49 +08:00
Hans Mackowiak
44bcc72662 AiController: only do verifyTransitivity when sort failed 2019-10-13 06:36:55 +00:00
Agetian
7fa461e839 - Comment out the transitivity test due to lag reasons. 2019-10-13 07:36:40 +03:00
Hans Mackowiak
fb159a6261 verifyTransitivity on saComparator 2019-10-11 19:03:15 +00:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master'
Start replacement run keys refactor

See merge request core-developers/forge!2175
2019-10-06 06:22:54 +00:00
Ryan1729
5f3a0b3f0b change replacingObjects type 2019-10-05 23:44:22 -06:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Hans Mackowiak
f32a8d7bb8 Card: CardTraits are now not added to Card/State anymore but uses timestamp 2019-10-05 19:59:28 +00:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00:00
Hans Mackowiak
398796999f Resolve "Questing Beast and Damage Prevention" 2019-09-29 00:03:10 +00:00
Ryan1729
df4b0b03b9 remove runOld and getReplacementListOld 2019-09-27 17:13:44 -06:00
Ryan1729
786448e14e Merge branch 'start_replacement_run_keys_refactor' of git.cardforge.org:Ryan1729/forge into start_replacement_run_keys_refactor 2019-09-25 19:50:47 -06:00
Ryan1729
c9b66d9743 add mapFromAffected convenience function 2019-09-25 19:50:00 -06:00
Hans Mackowiak
15e5d68520 Update ManifestAi: unused import 2019-09-25 08:03:32 +00:00
Ryan1729
5298b8666d refactor getReplacementList to use AbiltyKey as much as currently possible 2019-09-25 00:04:28 -06:00
Anthony Calosa
44eee1c5c4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-24 12:05:57 +08:00
Ryan Wiedemann
308c75e60e Merge branch 'master' into 'push_down_toStringMap_part_3'
# Conflicts:
#   forge-ai/src/main/java/forge/ai/AiController.java
#   forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
#   forge-game/src/main/java/forge/game/card/CardFactory.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDrawCards.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSurveil.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
2019-09-23 14:18:52 +00:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
Anthony Calosa
1f58279525 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-23 14:49:29 +08:00
Ryan1729
80506954f1 more replacing getMapParams().containsKey with hasParam 2019-09-22 12:13:40 -06:00