Commit Graph

39585 Commits

Author SHA1 Message Date
Hanmac
2d4174c6d8 Update ExtraTurn in PlayerView 2018-11-08 08:28:32 +01:00
Michael Kamensky
e7ec230b9f Merge branch 'master' into 'master'
Fixed the Once logic check in SurveilAi.

See merge request core-developers/forge!1074
2018-11-08 06:35:01 +00:00
Agetian
098569064f - Fixed the Once logic check in SurveilAi. 2018-11-08 09:34:35 +03:00
Hanmac
ebdfd94f85 ExtraTurn in PlayerView 2018-11-08 07:27:34 +01:00
Michael Kamensky
25fc7b7757 Merge branch 'master' into 'master'
Minor improvements in Surveil logic.

See merge request core-developers/forge!1072
2018-11-08 05:50:21 +00:00
Agetian
e4bf96d5e4 - Remove an accidental commit of debug test in mobile-dev. 2018-11-08 08:49:49 +03:00
Agetian
44de14d070 - Minor improvements in Surveil logic. 2018-11-08 08:47:19 +03:00
Michael Kamensky
09b3119254 Merge branch 'master' into 'master'
Fixed emblem image name for Vivien Reid.

See merge request core-developers/forge!1071
2018-11-08 04:57:05 +00:00
Agetian
ebbde37929 - Fixed emblem image name for Vivien Reid. 2018-11-08 07:56:39 +03:00
Michael Kamensky
40ff0503d0 Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_GRN5 (Possibility Storm - Guilds of Ravnica 05).

See merge request core-developers/forge!1070
2018-11-07 06:28:24 +00:00
Agetian
c6b6a0b4d2 - Added puzzle PS_GRN5. 2018-11-07 09:27:14 +03:00
Michael Kamensky
f2e2d0f37d Merge branch 'master' into 'master'
AI logic fix in prioritizing creatures worth removing.

See merge request core-developers/forge!1069
2018-11-07 06:11:54 +00:00
Agetian
a5d6ba2530 - Logic fix in prioritizing creatures worth removing. 2018-11-07 09:11:22 +03:00
Michael Kamensky
c865a6614d Merge branch 'master' into 'master'
Minor AI tweaks.

See merge request core-developers/forge!1068
2018-11-07 05:56:14 +00:00
Agetian
f439a7c084 - Added a BuffedBy spec to Forerunner of the Legion, fixed a double BuffedBy spec in Oakheart Dryads. 2018-11-07 08:55:35 +03:00
Hans Mackowiak
1281f6fba1 Merge branch '763-concurrentmodificationexception-in-getplayercommanderinfo' into 'master'
Resolve "ConcurrentModificationException in getPlayerCommanderInfo"

Closes #763

See merge request core-developers/forge!1063
2018-11-06 18:36:08 +00:00
Hans Mackowiak
f7de83539d Merge branch 'patch-2' into 'master'
CardUtil:getLKICopy with Breadcrumb

See merge request core-developers/forge!1067
2018-11-06 14:54:10 +00:00
Hans Mackowiak
8eb39e28b7 CardUtil:getLKICopy with Breadcrumb 2018-11-06 14:12:59 +00:00
Michael Kamensky
4f91b984ce Merge branch 'ai-improvements' into 'master'
Various AI improvements.

See merge request core-developers/forge!1066
2018-11-06 11:59:49 +00:00
Michael Kamensky
985599a3b2 Various AI improvements. 2018-11-06 11:59:49 +00:00
Michael Kamensky
1311415abf Merge branch 'patch-2' into 'master'
Update ControlExchangeAi

Closes #764

See merge request core-developers/forge!1065
2018-11-05 12:34:29 +00:00
Hans Mackowiak
3dc438c332 Update ControlExchangeAi.java
Closes #764
2018-11-05 10:28:38 +00:00
Michael Kamensky
3895fd5445 Merge branch 'master' into 'master'
Fixed references in Eureka.

See merge request core-developers/forge!1064
2018-11-05 09:00:37 +00:00
Agetian
f2f0e0a2e8 - Fixed references in Eureka. 2018-11-05 12:00:08 +03:00
Hanmac
e2dd52cf1c PlayerView: should fix ConcurrentModificationException 2018-11-05 08:25:31 +01:00
Michael Kamensky
926b45dfb0 Merge branch 'master' into 'master'
Added PlayMain1:TRUE to Heroic Reinforcements.

See merge request core-developers/forge!1062
2018-11-05 06:18:53 +00:00
Agetian
ab3a35bf41 - Added PlayMain1:TRUE to Heroic Reinforcements. 2018-11-05 09:18:06 +03:00
Michael Kamensky
2108043084 Merge branch 'master' into 'master'
Fixed a reference in Whirlpool Rider.

See merge request core-developers/forge!1061
2018-11-05 06:08:37 +00:00
Agetian
65440351c4 - Fixed a reference in Whirlpool Rider.
- Added Reckless profile definition to Percedal of Sadlygrove 2.
2018-11-05 09:07:52 +03:00
Michael Kamensky
e5c384b6a3 Merge branch 'master' into 'master'
Added a couple missing cards to the deck Percedal of Sadlygrove 2.

See merge request core-developers/forge!1060
2018-11-05 05:05:23 +00:00
Agetian
2c63f8d26a - Added a couple missing cards to the deck Percedal of Sadlygrove 2. 2018-11-05 08:04:06 +03:00
Michael Kamensky
92a8e64f36 Merge branch 'master' into 'master'
Tweaked several quest deck descriptions.

See merge request core-developers/forge!1059
2018-11-05 04:56:05 +00:00
Agetian
904dcec92c - Tweaked several quest deck descriptions. 2018-11-05 07:55:39 +03:00
Michael Kamensky
c1e47a8356 Merge branch 'm19-grn-questdecks' into 'master'
Added several M19-GRN quest opponent decks, fixed the AI for several cards in Standard.

See merge request core-developers/forge!1058
2018-11-04 18:34:15 +00:00
Michael Kamensky
be86f5be9b Added several M19-GRN quest opponent decks, fixed the AI for several cards in Standard. 2018-11-04 18:34:15 +00:00
Michael Kamensky
d2e7b73ee0 Merge branch 'ai-static-pt' into 'master'
Make the AI account for static abilities granted from the evaluated card in ApplyStaticContPT

See merge request core-developers/forge!1056
2018-11-04 09:12:59 +00:00
Michael Kamensky
d870a1b0f1 Make the AI account for static abilities granted from the evaluated card in ApplyStaticContPT 2018-11-04 09:12:59 +00:00
Michael Kamensky
36fd068f93 Merge branch 'aiSentry' into 'master'
add Sentry Breadcrumb

See merge request core-developers/forge!1057
2018-11-03 17:34:05 +00:00
Hanmac
877b0abd66 add Sentry Breadcrumb 2018-11-03 18:02:18 +01:00
Michael Kamensky
3c8f3ab1f8 Merge branch 'add-mobile-art-download' into 'master'
Add option to download missing card art on the fly

See merge request core-developers/forge!1049
2018-11-03 16:23:35 +00:00
Michael Kamensky
946625295e Merge branch 'ai-fight-with-fire' into 'master'
Attempt to fix the AI never playing Fight with Fire, kicked or unkicked.

See merge request core-developers/forge!1055
2018-11-03 14:08:06 +00:00
Agetian
0f72f0db8a - Attempt to fix the AI never playing Fight with Fire, kicked or unkicked. 2018-11-03 11:01:15 +03:00
Michael Kamensky
faa49ccf70 Merge branch 'ai-vivien-improvements' into 'master'
Improve Vivien of the Arkbow +2 AI in absence of creatures

See merge request core-developers/forge!1054
2018-11-03 06:55:29 +00:00
Agetian
976418b89c - Improve Vivien of the Arkbow +2 AI in absence of creatures. 2018-11-03 08:24:03 +03:00
Jeremy Pelkala
0cf9a3cf40 Merge remote-tracking branch 'origin/master' 2018-11-02 20:39:40 -04:00
Jeremy Pelkala
6abd3c45b4 Added Commander quest mode and world
-CardPool
 Added getFilteredPool() to easily get a Predicate applied copy of a CardPool.

 -GameRules
 Minor formatting change.

 -worlds.txt
 Added Random Commander to the list.

 -DeckConstructionRules
 New enum for defining the subformat a quest is using.

 -QuestAssets
 getLife() now has a switch for modifying the life for sub-formats.

 -QuestData
 New data save version. Includes a DeckConstructionRules enum.

 -QuestDataIO
 updateSaveFile will update old saves to have a default DeckConstructionRules complying with the new QuestData save version.

 -QuestController
 Updated to include support for DeckConstructionRules and specialized duel managers

 -QuestEvent
 Now have boolean to define if this is a "random" match for the duel list. Currently only QuestEventCommanderDuelManager makes use of this feature for Commander quests.

 -QuestEventCommanderDuel
 New QuestEventDuel used in the QuestEventCommanderDuelManager which contains a DeckProxy for use in generating random commander decks.

 -QuestEventCommanderDuelManager
 New duel manager to generate duels by difficulty for a Commander quest. Currently uses random generation to generate the decks of each opponent.

 -QuestSpellShop
 Sell Extras button now has a switch for taking into account special deck construction rules such as Commander only allowing singletons.

 -QuestUtil
 Starting a game now checks for various sub-format specific changes including a switch case for which variety of registered player to use.

 -QuestUtilCards
 Starting cardpool size is now modified by a switch case for sub-formats such as Commander.

 -QuestWinLoseController
 QuestEvents marked as random matches will now award a "Random Opponent Bonus" equal to the credit base. Currently only QuestEventCommanderDuelManager creates QuestEvents marked as such.

 -QuestWorld
 Added support for the Commander quest format and world.

 -CEditorQuest
 Many changes to add support for Commander in a style that, hopefully, also paths the way for future format support.

 -CSubmenuQuestData
 Support for Commander quests.

 -VSubmenuQuestData
 Support for Commander quests.
2018-11-02 20:38:22 -04:00
imakunee
f4ba5258ea Revert "-CardPool"
This reverts commit 37d9dc753f
2018-11-03 00:36:26 +00:00
Jeremy Pelkala
37d9dc753f -CardPool
Added getFilteredPool() to easily get a Predicate applied copy of a CardPool.

 -GameRules
 Minor formatting change.

 -worlds.txt
 Added Random Commander to the list.

 -DeckConstructionRules
 New enum for defining the subformat a quest is using.

 -QuestAssets
 getLife() now has a switch for modifying the life for sub-formats.

 -QuestData
 New data save version. Includes a DeckConstructionRules enum.

 -QuestDataIO
 updateSaveFile will update old saves to have a default DeckConstructionRules complying with the new QuestData save version.

 -QuestController
 Updated to include support for DeckConstructionRules and specialized duel managers

 -QuestEvent
 Now have boolean to define if this is a "random" match for the duel list. Currently only QuestEventCommanderDuelManager makes use of this feature for Commander quests.

 -QuestEventCommanderDuel
 New QuestEventDuel used in the QuestEventCommanderDuelManager which contains a DeckProxy for use in generating random commander decks.

 -QuestEventCommanderDuelManager
 New duel manager to generate duels by difficulty for a Commander quest. Currently uses random generation to generate the decks of each opponent.

 -QuestSpellShop
 Sell Extras button now has a switch for taking into account special deck construction rules such as Commander only allowing singletons.

 -QuestUtil
 Starting a game now checks for various sub-format specific changes including a switch case for which variety of registered player to use.

 -QuestUtilCards
 Starting cardpool size is now modified by a switch case for sub-formats such as Commander.

 -QuestWinLoseController
 QuestEvents marked as random matches will now award a "Random Opponent Bonus" equal to the credit base. Currently only QuestEventCommanderDuelManager creates QuestEvents marked as such.

 -QuestWorld
 Added support for the Commander quest format and world.

 -CEditorQuest
 Many changes to add support for Commander in a style that, hopefully, also paths the way for future format support.

 -CSubmenuQuestData
 Support for Commander quests.

 -VSubmenuQuestData
 Support for Commander quests.
2018-11-02 20:00:43 -04:00
Pedro Ferreira
7765ff8b33 Add option to download missing card art on the fly 2018-11-03 00:05:24 +01:00
Michael Kamensky
a564e6af53 Merge branch 'ai-mana-ritual-reentry' into 'master'
Add AI logic params to several cards to avoid stack overflow on ManaRitual cards

Closes #762

See merge request core-developers/forge!1052
2018-11-01 16:59:28 +00:00