swordshine
e5cee55c6a
Merge branch 'historic' into 'master'
...
update Historic legal sets
See merge request core-developers/forge!3027
2020-07-23 01:13:23 +00:00
Northmoc
93c74ed8b0
update Historic legal sets
2020-07-22 20:04:21 -04:00
Michael Kamensky
b8130c7dc1
Merge branch 'cardfactoryCleanup' into 'master'
...
Cardfactory cleanup
See merge request core-developers/forge!3024
2020-07-22 14:32:26 +00:00
Hans Mackowiak
f830c3a6b8
Cardfactory cleanup
2020-07-22 14:32:25 +00:00
Michael Kamensky
cc074f6b9f
Merge branch 'jmpmigrate' into 'master'
...
migrate JMP
See merge request core-developers/forge!3026
2020-07-22 14:16:31 +00:00
Northmoc
2166bfa9fb
migrate JMP
2020-07-22 10:07:22 -04:00
Michael Kamensky
006e3303b7
Merge branch 'master' into 'master'
...
Attempting to fix the {C} payment while not breaking the "pay with any color" mechanic + Fix Vraska achievement.
Closes #1510 and #1518
See merge request core-developers/forge!3025
2020-07-22 11:01:33 +00:00
Agetian
579f96498e
- Allow emblems to serve as registrable alt win conditions for the purpose of achievements. Fixed Vraska, Golgari Queen alt win achievement.
2020-07-22 13:47:20 +03:00
Agetian
39ca80652d
- Yet another attempt at the fix.
2020-07-22 13:32:18 +03:00
Agetian
093c4f8c11
Revert "- Attempt to both fix the {C} mana payment *and* not break the "may pay with mana of any color" at once", doesn't work.
2020-07-22 13:13:55 +03:00
Agetian
aae476f787
- Attempt to both fix the {C} mana payment *and* not break the "may pay with mana of any color" at once
2020-07-22 13:11:10 +03:00
Michael Kamensky
a162b250e0
Merge branch 'brawl' into 'master'
...
add M21 to Brawl format
See merge request core-developers/forge!3022
2020-07-22 04:17:14 +00:00
Michael Kamensky
8e7b76565d
Merge branch 'phantasmalAI' into 'master'
...
phantasmal_image.txt add NeedsToPlay
See merge request core-developers/forge!3023
2020-07-22 04:17:11 +00:00
Northmoc
a4c498137b
phantasmal_image.txt add NeedsToPlay
2020-07-21 16:40:09 -04:00
Northmoc
033022ccbc
add M21
2020-07-21 16:39:40 -04:00
Michael Kamensky
79030d5d55
Merge branch 'master' into 'master'
...
AILogic for the other Omens
See merge request core-developers/forge!3021
2020-07-21 16:44:50 +00:00
Agetian
bffc880fae
- AILogic for the other Omens
2020-07-21 19:31:17 +03:00
Michael Kamensky
a0e7aec437
Merge branch 'snout' into 'master'
...
trufflesnout.txt life amount fix
See merge request core-developers/forge!3019
2020-07-21 16:23:09 +00:00
Michael Kamensky
d9731428dd
Merge branch 'master' into 'master'
...
Update AI for Omen of the Sea, update the code to allow payment execution for CostPartWithList even if no target cards are in the list
Closes #1514
See merge request core-developers/forge!3020
2020-07-21 15:59:33 +00:00
Agetian
288c80f470
- Execute payment for CostPartWithList even if no target cards are needed (e.g. CostFlipCoin), fixes the AI not paying these costs at all.
2020-07-21 18:40:41 +03:00
Agetian
d01d7a6c9d
- Tweak Omen of the Sea AI
2020-07-21 18:40:04 +03:00
Michael Kamensky
a3d2b4b712
Merge branch 'mana-payment-fix' into 'master'
...
Fix AI/auto payment for the {C} shard
Closes #1517
See merge request core-developers/forge!3018
2020-07-21 15:34:58 +00:00
Agetian
84a7ebe452
- Fix payment for the {C} shard (fixes the AI/auto payment tapping all lands when trying to find something to pay for {C})
2020-07-21 17:43:04 +03:00
Northmoc
947d345cf2
trufflesnout.txt life amount fix
2020-07-21 09:08:19 -04:00
Michael Kamensky
5d40229e85
Merge branch 'master' into 'master'
...
Fix AI for Jwari Shapeshifter
Closes #1513
See merge request core-developers/forge!3017
2020-07-21 09:56:03 +00:00
Agetian
c3b337a072
- Fix AI for Jwari Shapeshifter
2020-07-21 12:44:10 +03:00
Michael Kamensky
3e341e8ab9
Merge branch 'tides' into 'master'
...
read_the_tides.txt fixes
See merge request core-developers/forge!3014
2020-07-21 05:45:48 +00:00
Michael Kamensky
fcc072e8cc
Merge branch 'azorius' into 'master'
...
Azorious -> Azorius
See merge request core-developers/forge!3015
2020-07-21 05:45:40 +00:00
Michael Kamensky
697f6cede5
Merge branch 'effectnames' into 'master'
...
Remove "Name$ CARDNAME Effect" from Effects
See merge request core-developers/forge!3016
2020-07-21 05:45:36 +00:00
Northmoc
566e20fe11
Name$ CARDNAME Effect doesn't work
2020-07-20 20:13:25 -04:00
Northmoc
b6f67a2221
Azorious -> Azorius
2020-07-20 20:08:59 -04:00
Northmoc
48720fa6ea
read_the_tides.txt fixes
2020-07-20 19:04:12 -04:00
Michael Kamensky
50b57157e1
Merge branch 'master' into 'master'
...
Improve AI logic for Bound by Moonsilver.
See merge request core-developers/forge!3013
2020-07-20 05:12:53 +00:00
Agetian
62d3c4457b
- Improve AI logic for Bound by Moonsilver.
2020-07-20 08:03:10 +03:00
Michael Kamensky
c069d0e5d2
Merge branch 'fix-m21-booster-collation' into 'master'
...
Fix M21 booster collation: Move tap lands to land slot, exclude them from common slot
See merge request core-developers/forge!3008
2020-07-20 03:48:41 +00:00
Michael Kamensky
fd84050944
Merge branch '1511-supplant-form-legality-issues' into 'master'
...
Resolve "Supplant Form legality issues"
Closes #1511
See merge request core-developers/forge!3012
2020-07-19 19:38:19 +00:00
Hans Mackowiak
e8c5c78ddd
CardUtil: copy PT boost extra in case something is using LKI to make a token
2020-07-19 20:22:52 +02:00
Michael Kamensky
a542bf8057
Merge branch 'mayLook' into 'master'
...
MayLook: refactor it to use timestamp, also handle facedown exile
Closes #1509
See merge request core-developers/forge!3011
2020-07-19 15:59:43 +00:00
Hans Mackowiak
b816bae232
MayLook: refactor it to use timestamp, also handle facedown exile
2020-07-19 15:59:42 +00:00
pfirpfel
3ba0737bbe
Move tap lands to land slot, exclude them from common slot
2020-07-19 17:27:19 +02:00
Michael Kamensky
aafbdd1a9c
Merge branch 'master' into 'master'
...
Some AI hint updates (M21, some PlayMain1 additions, minor random changes)
See merge request core-developers/forge!3010
2020-07-19 08:26:44 +00:00
Agetian
0c1a6b88bc
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2020-07-19 11:08:19 +03:00
Agetian
4896cf724a
- Resolve merge conflicts.
2020-07-19 11:08:00 +03:00
Agetian
8b7d4a0c97
- Some more AI hint updates, mostly M21.
2020-07-19 08:20:28 +03:00
Agetian
80332687cb
- Add several PlayMain1 hints to cards + Extort (to ensure the AI can extort whatever he casts later that turn).
2020-07-19 06:57:18 +03:00
Michael Kamensky
cef4a85e6f
Merge branch 'sethron' into 'master'
...
Sethron fixes
See merge request core-developers/forge!3009
2020-07-19 03:32:31 +00:00
Tim Mocny
c79b36d5d0
Sethron fixes
2020-07-19 03:32:31 +00:00
Michael Kamensky
f08f960982
Merge branch 'pumpdefine' into 'master'
...
Pump overhaul
See merge request core-developers/forge!2997
2020-07-17 13:25:03 +00:00
Tim Mocny
56d374f15f
Pump overhaul
2020-07-17 13:25:02 +00:00
Michael Kamensky
08970b48b9
Merge branch 'forumfix' into 'master'
...
Various fixes for issues reported on Forum
See merge request core-developers/forge!3007
2020-07-17 13:22:22 +00:00
