Commit Graph

39546 Commits

Author SHA1 Message Date
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
Michael Kamensky
aa1a403644 Merge branch 'affinityKeyword' into 'master'
Affinity keyword

See merge request core-developers/forge!1051
2018-11-01 16:02:11 +00:00
Agetian
6ac61e441e - Add AILogic$ ManaRitual and AINoRecursiveCheck$ True to some Mana Ritual cards to avoid stack overflow when the AI is running recursive tests on them. 2018-11-01 18:58:12 +03:00
Hanmac
d365167c38 updated References for ReduceCost 2018-11-01 16:15:44 +01:00
Hanmac
753983c050 Affinity for cards 2018-11-01 15:48:37 +01:00
Hanmac
70e2714cf3 Affinity as Keyword 2018-11-01 15:26:48 +01:00
Michael Kamensky
e9c0280b99 Merge branch 'fix-emmara' into 'master'
Fixed a double Taps trigger on Convoke/Improvise.

Closes #758

See merge request core-developers/forge!1050
2018-10-31 09:10:10 +00:00
Michael Kamensky
85aaf5c548 Fixed a double Taps trigger on Convoke/Improvise. 2018-10-31 09:10:10 +00:00
Michael Kamensky
b694e76d06 Merge branch 'ai-fix-pause-for-reflection' into 'master'
Fixed a stack overflow when the AI is considering Pause for Reflection.

Closes #760

See merge request core-developers/forge!1047
2018-10-30 17:36:11 +00:00
Michael Kamensky
8423c319a9 Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_GRN4 (Possiibility Storm - Guilds of Ravnica 04).

See merge request core-developers/forge!1048
2018-10-30 17:35:23 +00:00
Agetian
3561c66b7d - Added puzzle PS_GRN4. 2018-10-30 20:34:23 +03:00
Agetian
0ab87d46b4 - Improved the implementation: clear the memory set for reentry-susceptible cards when starting to consider a new SA.
- Some more improvements in AiCardMemory.
2018-10-30 15:04:58 +03:00
Agetian
1ab9f2cae5 - Fixed a stack overflow when the AI is considering Pause for Reflection.
- Improved the implementation of AiCardMemory a little, making it a little safer to use as well in routines which may also be used to simulate human behavior.
2018-10-30 13:06:33 +03:00
Michael Kamensky
df22cc7be4 Merge branch 'update-and-merge-1' into 'master'
Update and merge Jamin Collins's file settings for mobile forge (deck location MR).

See merge request core-developers/forge!1046
2018-10-29 06:38:07 +00:00
Agetian
ec25f31718 - Update file settings description. 2018-10-29 09:36:54 +03:00
Agetian
0c6883caf0 Merge branch 'android-improvements' of git.cardforge.org:jamincollins/forge into update-and-merge-1 2018-10-29 09:34:04 +03:00
Michael Kamensky
bbe84b8092 Merge branch 'fix-stonehewer-avtr' into 'master'
Fix Stonehewer Avatar not working correctly.

Closes #753

See merge request core-developers/forge!1045
2018-10-27 08:11:13 +00:00
Michael Kamensky
ee895f23cf Merge branch 'omnispell-adept-ai' into 'master'
Improve Omnispell Adept AI

Closes #751

See merge request core-developers/forge!1043
2018-10-26 20:00:01 +00:00
Michael Kamensky
cfd4aafc35 Improve Omnispell Adept AI 2018-10-26 20:00:00 +00:00
Agetian
3e91c95dcf - When making token copies of permanents, set the copied permanent so that its CMC can be calculated. 2018-10-26 22:58:16 +03:00
Hans Mackowiak
04f69bb554 Merge branch 'ai-hints-npe-fix' into 'master'
Prevent NPEs caused by the AI when testing for the new style AI hints

See merge request core-developers/forge!1044
2018-10-26 14:34:22 +00:00
Agetian
f4db360265 - Prevent NPEs caused by the AI when testing for the new style AI hints from within AI methods on Card objects, which is dangerous because Card.getRules() is not guaranteed to be non-null, and may indeed be null for objects such as tokens (especially noticeable in Momir Basic and MoJhoSto).
- Currently relegated 99% of AI calls to those getAIHints tests to a wrapper method which checks for a non-null getRules.
- The card predicate has to test for non-null directly to avoid adding an unnecessary dependency on the AI module (the alternative would be to add the wrapper methods to the Card object, but that'll clutter it even more and the AI hints belong to the AI side of things, not the card itself).
2018-10-26 17:16:12 +03:00
Michael Kamensky
a001cb78c0 Merge branch 'revertDefaultSort' into 'master'
Revert Default sort in Deckbuilder to code before Merge Request !1035

See merge request core-developers/forge!1042
2018-10-25 04:44:38 +00:00
tjtillmancoag
af7c5f7506 Revert Default sort in Deckbuilder to code before !1035 Merge Request 2018-10-24 19:24:28 -07:00
swordshine
e7cf359659 Merge branch 'patch-4' into 'master'
Update direct_current.txt

Closes #749

See merge request core-developers/forge!1041
2018-10-24 08:37:47 +00:00
Hans Mackowiak
ec5a7903b0 Update direct_current.txt 2018-10-24 08:36:35 +00:00
Jamin W. Collins
662f6f79ea allow decks to be stored elsewhere
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-23 17:41:00 -06:00
Michael Kamensky
f7b88a6f8f Merge branch 'puzzle-engine' into 'master'
Adding puzzle PS_GRN3 (Possibility Storm - Guilds of Ravnica 03)

See merge request core-developers/forge!1039
2018-10-23 05:12:29 +00:00
Agetian
4d8b6eb785 Merge remote-tracking branch 'origin/puzzle-engine' into puzzle-engine 2018-10-23 08:11:30 +03:00
Agetian
6055f9ddc4 - Added puzzle PS_GRN3. 2018-10-23 08:11:13 +03:00
Agetian
7b10e3a9fc Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-23 08:04:21 +03:00
Michael Kamensky
2cce3ab252 Merge branch 'sorting' into 'master'
Update item manager groupings

See merge request core-developers/forge!1035
2018-10-23 05:03:50 +00:00
Michael Kamensky
67bcb9e75a Merge branch 'patch-14' into 'master'
Update trench_gorger.txt

See merge request core-developers/forge!1038
2018-10-23 04:57:36 +00:00
Michael Kamensky
7b3b3068e6 Merge branch 'patch-13' into 'master'
Fix non-bug typo

See merge request core-developers/forge!1037
2018-10-23 04:57:21 +00:00
Meerkov
2b4435de2e Update trench_gorger.txt 2018-10-23 01:19:18 +00:00
Meerkov
2d7d15193e Update ranging_raptors.txt 2018-10-23 01:18:10 +00:00
swordshine
0712f7a074 Merge branch 'skalla_wolf_patch' into 'master'
Add missing trigger to Skalla Wolf

See merge request core-developers/forge!1036
2018-10-22 04:28:03 +00:00
Rob Schnautz
7e62fd42fb Add missing trigger to Skalla Wolf 2018-10-22 00:53:47 +00:00