Commit Graph

37905 Commits

Author SHA1 Message Date
Agetian
cbce073227 - Planar Conquest: allow Chaos matches from custom user worlds. 2018-05-07 18:37:34 +03:00
Michael Kamensky
4103afc6cf Merge branch 'fix_ante_corr' into 'master'
Merging "Fix ante" by Friarsol (merge conflict resolved)

See merge request core-developers/forge!537
2018-05-07 03:59:55 +00:00
Agetian
c2ddc8cd87 Resolved merge conflict. 2018-05-07 06:57:13 +03:00
Chris H
52a5f3b0a4 Fix ante to work with RegisterdPlayer 2018-05-06 21:42:56 -04:00
Hanmac
91d80f49f4 Card: add Keyword methods that work with Keyword Enum 2018-05-06 16:54:53 +02:00
Michael Kamensky
e0b1bc7cd0 Merge branch 'asFlash' into 'master'
Code As through it has flash Effects

See merge request core-developers/forge!532
2018-05-06 08:56:15 +00:00
Hanmac
438d4f6e38 WrappedAbility: add AdditionalAbilityList methods too 2018-05-06 10:29:59 +02:00
Agetian
473fa088ce - Wrapped abilities should get additional abilities from the underlying SA (fixes MayFlashSac on something like Abattoir Ghoul crashing). 2018-05-06 11:12:09 +03:00
Agetian
e52b9d62f7 - AI should not attempt to cast MayFlashSac auras "as though they had flash" for now, it'll just always cast them in its own Upkeep and end up wasting them. 2018-05-06 11:10:42 +03:00
Hanmac
c7fb979fe2 Merge branch 'asFlash' of git.cardforge.org:core-developers/forge into asFlash 2018-05-06 09:03:34 +02:00
Hanmac
198e7adc47 MayFlashSac: rework using MayPlayNotSorcerySpeed 2018-05-06 08:55:10 +02:00
Hanmac
4cf79222f0 fix AiAttack with CHOSEN_FOG_EFFECT 2018-05-06 08:49:29 +02:00
Hanmac
94a9597963 fix player to RegisteredPlayer for AnteResult 2018-05-06 08:48:18 +02:00
Michael Kamensky
469649c0c4 Merge branch 'master' into 'master'
Clarification in AiCostDecision

See merge request core-developers/forge!534
2018-05-06 06:01:08 +00:00
Agetian
bd08c5ca9d - Clarification in AiCostDecision 2018-05-06 09:00:41 +03:00
Agetian
1296b24960 - A quick patch to make the AI compatible with MayFlashCost (may need a rewrite later when the optional costs are correctly implemented for the AI). 2018-05-06 08:00:51 +03:00
Hanmac
87b8ac38f2 Fix: fixed MayFlashSac 2018-05-05 18:47:20 +02:00
Michael Kamensky
51dca51014 Merge branch 'master' into 'master'
Fixed the AI failing to activate abilities such as Merchant's Dockhand (tapXType).

See merge request core-developers/forge!533
2018-05-05 15:42:39 +00:00
Agetian
07c448ba16 - Fixed the AI failing to activate abilities such as Merchant's Dockhand which may tap the card in the process which the AI is considering for a tapXType payment (which may lead to a misplay or a loop/hang). 2018-05-05 18:41:10 +03:00
Hanmac
0033edbeda Restriction: fix Bestow with check if it is already animated under lki 2018-05-05 16:47:48 +02:00
Hanmac
d7e701d7a5 SpellRestriction: fixed for LKI, moved Legendary Sorcery 2018-05-05 10:35:44 +02:00
Hanmac
63bd305250 Twilights call: fix Oracle 2018-05-05 00:10:34 +02:00
Hanmac
dc789addb9 Fix: add hand oracle to tawnos again 2018-05-05 00:05:05 +02:00
Hanmac
6b1c0a0eda cards: update cards with WithFlash option or using MaybeFlash keywords 2018-05-04 23:59:02 +02:00
Hanmac
a3f36bd7a4 Spell: do as though it has Flash effects 2018-05-04 23:49:30 +02:00
Hanmac
1258e24ee0 Static Ability: add Ferocious as Condition 2018-05-04 23:46:19 +02:00
Hanmac
f9832a51cf GameAction: check static, use card in preList if able 2018-05-04 23:42:43 +02:00
Hanmac
018a3d8c91 FCollection: extra get Function that checks for element in Collection 2018-05-04 23:39:31 +02:00
Michael Kamensky
ec1a4579e1 Merge branch 'deckbuildingfix' into 'master'
Fixed card-deck decks all getting a totally random card

See merge request core-developers/forge!531
2018-05-04 03:48:40 +00:00
Sol
bfde06f0d6 Merge branch 'seravy-ai-fixes' into 'master'
Reformatted/revised AI updates from Seravy: Fog AI, Protection from chosen color AI

See merge request core-developers/forge!503
2018-05-04 00:35:07 +00:00
austinio7116
b8c207ac2a Small improvements to genetic algorithms, merged Agetian's fixes for planar conquest 2018-05-03 20:40:59 +01:00
Michael Kamensky
9b2e54c001 Merge branch 'assorted-fixes' into 'master'
Fixed the AI activating Jace, Cunning Castaway +1 too late.

See merge request core-developers/forge!530
2018-05-03 15:58:53 +00:00
Agetian
62585848bd - Fixed the AI activating Jace, Cunning Castaway +1 too late. 2018-05-03 18:55:42 +03:00
Michael Kamensky
d47acc16a9 Merge branch 'dom-puzzles' into 'master'
Possibility Storm - Dominaria Season (minor update).

See merge request core-developers/forge!529
2018-05-03 04:51:17 +00:00
Agetian
a34e97af52 - Added puzzle PS_AERT (Aether Revolt Throwback Puzzle).
- Pruned the puzzle files PS_DOM0 and PS_DOM1 (removed unused empty definitions).
2018-05-03 07:50:26 +03:00
Michael Kamensky
319b587c1b Merge branch 'deckgendata' into 'master'
Updated Modern and Standard deck generation models with more Dominaria data

See merge request core-developers/forge!528
2018-05-03 04:00:24 +00:00
swordshine
07f0f06767 Merge branch 'dom-puzzles' into 'master'
Possibility Storm - Dominaria season

See merge request core-developers/forge!527
2018-05-03 02:37:53 +00:00
austinio7116
ac3513ac8a Updated Modern and Standard deck generation models with more Dominaria data 2018-05-02 23:03:08 +01:00
Agetian
5760520ca2 - Added puzzle PS_DOM0 (Gaea's Protector card preview puzzle).
- Some tweaks to PS_DOM1.
2018-05-02 23:17:31 +03:00
Agetian
236f456097 - Added puzzle PS_DOM1 (Possibility Storm - Dominaria #01). 2018-05-02 22:05:44 +03:00
Michael Kamensky
2965e0fc28 Merge branch 'master' into 'master'
Deck description update.

See merge request core-developers/forge!526
2018-05-02 14:34:08 +00:00
Agetian
0ccdbde2f7 - Deck description update. 2018-05-02 17:33:10 +03:00
Michael Kamensky
b2659d6c38 Merge branch 'master' into 'master'
Updating the deck Starswirl the Bearded 2.

See merge request core-developers/forge!525
2018-05-02 14:20:18 +00:00
Agetian
52b300650c - Updating the deck Starswirl the Bearded 2. 2018-05-02 17:19:20 +03:00
Michael Kamensky
0b05bde1e3 Merge branch 'master' into 'master'
Fixed Ranging Raptors trigger not being optional.

See merge request core-developers/forge!524
2018-05-02 13:18:13 +00:00
Agetian
b72b528cb3 - Fixed Ranging Raptors trigger not being optional. 2018-05-02 16:17:39 +03:00
Michael Kamensky
ab98c1df7d Merge branch 'dom-ai-hints' into 'master'
Dominaria: adding AI deckbuilding and gameplay hints, making Mox Amber AI playable.

See merge request core-developers/forge!509
2018-05-02 12:23:43 +00:00
Agetian
bc63cdd52a - Code simplification. 2018-05-02 15:07:04 +03:00
Michael Kamensky
ada5aef26f Merge branch 'patch-3' into 'master'
Update olivias_bloodsworn.txt

See merge request core-developers/forge!521
2018-05-02 08:16:15 +00:00
Michael Kamensky
df1050668f Merge branch 'patch-4' into 'master'
Update forerunner_of_slaughter.txt

See merge request core-developers/forge!522
2018-05-02 08:15:39 +00:00