Commit Graph

49974 Commits

Author SHA1 Message Date
tool4EvEr
e2036a5203 Clean delayedTriggers from player who lost 2021-04-14 22:58:08 +02:00
tool4EvEr
7107f05adb Fix DelayedTriggers running when card owner left game 2021-04-14 22:12:14 +02:00
austinio7116
529fc42b72 Merge branch 'coremaster' into historicLDA
# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt
2021-04-14 19:09:01 +01:00
Michael Kamensky
7808605a8c Merge branch 'fix' into 'master'
Some fixes

See merge request core-developers/forge!4508
2021-04-14 18:08:07 +00:00
Michael Kamensky
0930013cc2 Merge branch 'card-fixes' into 'master'
Adrix and Nev only applies to you.

See merge request core-developers/forge!4509
2021-04-14 18:07:58 +00:00
Michael Kamensky
51054b70d6 Merge branch 'codie' into 'master'
[C21] Codie tweaks

See merge request core-developers/forge!4507
2021-04-14 18:07:20 +00:00
Michael Kamensky
471fb621e5 Merge branch 'flagbearer' into 'master'
Add Flagbearer

See merge request core-developers/forge!4495
2021-04-14 18:06:56 +00:00
Alumi
1e0c3e7621 Check if chosen targets meets MustTarget requirements in setupTargets() too. (For spell that has multiple targeting SAs) 2021-04-14 18:06:55 +00:00
Northmoc
a75d312770 oversimplify.txt - RememberLKI needed 2021-04-14 13:21:52 -04:00
austinio7116
0fd2ec58be Merge remote-tracking branch 'Core/master' into coremaster 2021-04-14 18:13:19 +01:00
Northmoc
be484a8077 fix oversimplify.txt 2021-04-14 13:07:06 -04:00
Adam Pantel
3d8388ad92 Adrix and Nev only applies to you. 2021-04-14 12:52:00 -04:00
Northmoc
7a5eac3621 support "an opponent" choosing for multiplayer (and add AI hint) 2021-04-14 12:19:31 -04:00
Hans Mackowiak
ce34e937d6 CostExile: fixed exile cost with mana value X 2021-04-14 17:48:42 +02:00
Northmoc
c8646208f0 codie_vociferous_codex.txt add AI hints 2021-04-14 11:39:20 -04:00
Northmoc
3ed83e4f59 codie_vociferous_codex.txt - add ThisTurn$ to delayed trigger - add MayPlay Effect 2021-04-14 11:33:20 -04:00
Northmoc
ebe6a12555 allow no reordering on zones other than library 2021-04-14 11:28:59 -04:00
Northmoc
1727456487 digsite_engineer.txt DB -> AB 2021-04-14 10:37:29 -04:00
swordshine
ef895777ca Merge branch 'master' into 'master'
Card cleanup and Historic update

See merge request core-developers/forge!4505
2021-04-14 10:58:48 +00:00
swordshine
33fa10e9c1 Merge branch 'emblazoned_golem_remove_max_limit' into 'master'
Remove X max limit for Emblazoned Golem

See merge request core-developers/forge!4503
2021-04-14 10:56:51 +00:00
Hythonia
1f9094caec Removed semicolon 2021-04-14 12:43:33 +02:00
Hythonia
9a5c58aae8 Add Strixhaven and Mystical Archives 2021-04-14 12:41:40 +02:00
Hythonia
1b1e6c394d Card cleanup and Historic update 2021-04-14 12:38:17 +02:00
Anthony Calosa
504872ac1e Merge branch 'master' into 'master'
remove extra svar

See merge request core-developers/forge!4504
2021-04-14 10:07:40 +00:00
Anthony Calosa
edc40f4a6c remove extra svar 2021-04-14 18:06:27 +08:00
Lyu Zong-Hong
7b6e08f791 Remove X max limit for Emblazoned Golem 2021-04-14 16:29:57 +09:00
Michael Kamensky
b184db2ee6 Merge branch 'morophon' into 'master'
Add AILogic to Morophon, the Boundless and move two scripts into correct folders

See merge request core-developers/forge!4500
2021-04-14 06:37:04 +00:00
Michael Kamensky
d10bf7fa35 Merge branch 'fixplay' into 'master'
Once Upon A Time: Fix AltCost

Closes #1801

See merge request core-developers/forge!4501
2021-04-14 06:36:54 +00:00
Michael Kamensky
ce20d21f4c Merge branch 'khm_rankings' into 'master'
KHM updated rankings + nonbasic land rankings!

See merge request core-developers/forge!4502
2021-04-14 06:36:47 +00:00
Michael Kamensky
48a35746a0 Merge branch 'c21_11' into 'master'
promise_of_loyalty.txt

See merge request core-developers/forge!4485
2021-04-14 06:33:19 +00:00
swordshine
bf9afd4ba1 Merge branch 'card-fixes' into 'master'
Card fixes

See merge request core-developers/forge!4499
2021-04-14 04:07:13 +00:00
Northmoc
0eb2d59ecc add AI DeckHas 2021-04-13 20:07:13 -04:00
Northmoc
b9bcfef817 promise_of_loyalty.txt 2021-04-13 20:07:13 -04:00
Northmoc
27d01500fa KHM updated rankings + nonbasic land rankings! 2021-04-13 16:39:47 -04:00
paul_snoops
d2ea3e4986 Add AILogic to Morophon, the Boundless and move to scripts into correct folders 2021-04-13 18:07:52 +01:00
Adam Pantel
b0cecebe34 Card fixes 2021-04-13 12:48:30 -04:00
tool4EvEr
f4971589c6 Fix AltCost 2021-04-13 18:26:34 +02:00
Bug Hunter
506d64dc8b Merge branch 'pennant' into 'master'
Team Pennant: Fix typo

See merge request core-developers/forge!4498
2021-04-13 16:18:36 +00:00
tool4EvEr
f56aa6cc29 Fix typo 2021-04-13 18:17:51 +02:00
Bug Hunter
a17ec8c2db Merge branch 'admiral' into 'master'
Azure Fleet Admiral: Fix typo

See merge request core-developers/forge!4497
2021-04-13 15:56:25 +00:00
tool4EvEr
a718986e2d Fix typo 2021-04-13 17:55:57 +02:00
Michael Kamensky
242e0e7fdc Merge branch 'stx_draft_fix' into 'master'
fix:stx booster missing sta and lesson cards.

See merge request core-developers/forge!4493
2021-04-13 13:40:28 +00:00
Anthony Calosa
75f7cb6df7 Merge branch 'master' into 'master'
update cards

See merge request core-developers/forge!4496
2021-04-13 13:16:01 +00:00
Anthony Calosa
cf7d0792a2 update cards 2021-04-13 21:13:46 +08:00
Hans Mackowiak
29d260db9d Cards: use CharacteristicDefining for Alternative Cost for now 2021-04-13 10:32:16 +02:00
austinio7116
d7dfad1fe8 More Historic LDA data 2021-04-13 08:27:41 +01:00
CCTV-1
82f404e627 each draft boosters should be contain 1 sta card and 1 lesson card. 2021-04-13 14:08:56 +08:00
Anthony Calosa
c49b4c45c8 Merge branch 'kevlahnota-master-patch-11851' into 'master'
finalize Commander 2021.txt

See merge request core-developers/forge!4492
2021-04-13 05:11:16 +00:00
Anthony Calosa
39f3feb210 Update Commander 2021.txt 2021-04-13 05:10:27 +00:00
Michael Kamensky
4ed89e9515 Merge branch 'bangchuckersAI' into 'master'
FlipACoinAI: add logic for Goblin Bangchuckers

Closes #1666

See merge request core-developers/forge!4487
2021-04-13 04:40:07 +00:00