Commit Graph

5026 Commits

Author SHA1 Message Date
Anthony Calosa
b1d3e712be unused import 2021-05-10 07:50:23 +00:00
Michael Kamensky
d4dc65c45f Merge branch 'show_remaining_shield' into 'master'
Show remaining shields amount for damage prevention and redirection effect

See merge request core-developers/forge!4684
2021-05-10 03:27:03 +00:00
Lyu Zong-Hong
ea65a3423e Show remaining shields amount for damage prevention and redirection effect 2021-05-10 10:04:45 +09:00
Lyu Zong-Hong
04811da9cc Update AI damage prevention prediction code 2021-05-10 08:09:27 +09:00
Lyu Zong-Hong
20491e1136 Refactor fog and protection to use replacement effect 2021-05-09 20:17:26 +09:00
Michael Kamensky
8440f72e9e Merge branch 'cascade' into 'master'
PlayAi confirmAction only when card is worth it

See merge request core-developers/forge!4661
2021-05-09 04:01:22 +00:00
Lyu Zong-Hong
d42ee05740 Fix NPE in getTotalPreventionShieldAmount 2021-05-09 07:46:04 +09:00
Michael Kamensky
c4bf644240 Merge branch 'refactor_static_prevention' into 'master'
Refactor Damage Prevention - Step 2

See merge request core-developers/forge!4676
2021-05-08 13:57:04 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
Michael Kamensky
46e5c3233a Merge branch 'master' into 'master'
Spoiled cards from MH2 and AFR

See merge request core-developers/forge!4674
2021-05-08 13:56:08 +00:00
Hythonia
75da8833dc Urza's Saga fix 2021-05-08 10:22:33 +02:00
Michael Kamensky
c40a132811 Merge branch 'refactor_prevention' into 'master'
Refactor Damage Prevention - Step 1

See merge request core-developers/forge!4675
2021-05-08 04:34:44 +00:00
Alumi
288267ae11 Refactor Damage Prevention - Step 1 2021-05-08 04:34:42 +00:00
Michael Kamensky
8f1a493327 Merge branch 'digreveal' into 'master'
add support to Dig for Reveal$ False

See merge request core-developers/forge!4667
2021-05-08 04:34:08 +00:00
Northmoc
f97adc325f simplify boolean function 2021-05-07 15:06:40 -04:00
Hythonia
8aa72e9397 MH2 and AFR 2021-05-07 19:45:55 +02:00
tool4EvEr
3ab7886eab Refactor confirmAction 2021-05-07 18:14:20 +02:00
Anthony Calosa
5ee94199bb Merge branch 'fixturns' into 'master'
Fix multiplayer extra turns deadlock

See merge request core-developers/forge!4665
2021-05-07 00:48:21 +00:00
Northmoc
1ce213004a add support to Dig for Reveal$ False 2021-05-06 17:23:45 -04:00
tool4EvEr
e223fa2002 Fix extra turns deadlock 2021-05-06 21:39:24 +02:00
Michael Kamensky
6fc542ff7d Merge branch 'clash' into 'master'
ClashEffect: Fix Triggers

Closes #1821

See merge request core-developers/forge!4662
2021-05-06 03:46:14 +00:00
tool4EvEr
1232f1be28 Fix Escalate Cost 2021-05-05 22:20:57 +02:00
tool4EvEr
738c7b968a Fix Triggers 2021-05-05 21:59:01 +02:00
tool4EvEr
d6e7d1ffee Check if card for PlayEffect is worth it 2021-05-05 21:14:15 +02:00
Hans Mackowiak
717a3eaede Merge branch 'fixstatic' into 'master'
Fix StaticEffect missing changes from RemoveLandTypes

See merge request core-developers/forge!4655
2021-05-05 10:41:02 +00:00
Michael Kamensky
92472c815a Merge branch 'partner2' into 'master'
Partner with: better fix

See merge request core-developers/forge!4650
2021-05-04 18:18:02 +00:00
Michael Kamensky
1afce00069 Merge branch 'controllers' into 'master'
getAllPossibleAbilities: Restore old controllers

Closes #1806

See merge request core-developers/forge!4646
2021-05-04 18:17:41 +00:00
tool4EvEr
06230ffa40 Fix StaticEffect missing changes from RemoveLandTypes 2021-05-04 19:21:47 +02:00
tool4EvEr
ea0add13ad Partner with: cleaner fix 2021-05-03 20:14:56 +02:00
tool4EvEr
0d1b751600 Update wouldPhaseBeSkipped logic 2021-05-03 17:06:39 +02:00
tool4EvEr
faa8013208 Restore old controllers for AI checks 2021-05-02 17:03:44 +02:00
Michael Kamensky
689d3bb9b5 Merge branch 'fixloop' into 'master'
Fix multiplayer loop from SA controlled by loser

See merge request core-developers/forge!4636
2021-05-02 14:25:27 +00:00
tool4EvEr
820c869e2c Avoid clearTriggers 2021-05-02 11:44:41 +02:00
tool4EvEr
e3715c3f81 Update ceasetoExist check 2021-05-02 00:02:49 +02:00
tool4EvEr
df6b552ac1 Fully clear unwanted triggers 2021-05-01 20:36:42 +02:00
Michael Kamensky
9bb4d7ed93 Merge branch 'turns' into 'master'
Update advanceToNextPhase logic

See merge request core-developers/forge!4633
2021-05-01 17:36:38 +00:00
tool4EvEr
8155376c45 Fix multiplayer loop from SA controlled by loser 2021-05-01 12:33:25 +02:00
tool4EvEr
de8aaf35a3 Update advanceToNextPhase logic 2021-04-30 23:34:16 +02:00
tool4EvEr
329f4072be Fix ResolvedThisTurn 2021-04-30 19:36:29 +02:00
Hans Mackowiak
4bebc8486c Merge branch 'fixbandingnpe' into 'master'
Fix Banding NPE

See merge request core-developers/forge!4617
2021-04-28 21:14:51 +00:00
Hans Mackowiak
fd0f6e4113 Merge branch 'fixNPE' into 'master'
getTargetableCards: Fix AI NPE

See merge request core-developers/forge!4611
2021-04-28 21:13:19 +00:00
Bug Hunter
8e4c40ba2a getTargetableCards: Fix AI NPE 2021-04-28 21:13:19 +00:00
Hans Mackowiak
e9ff6ece35 Merge branch 'fixtrig' into 'master'
Fix Karmic Justice

See merge request core-developers/forge!4613
2021-04-28 21:12:08 +00:00
Bug Hunter
ba02ce9261 Fix Karmic Justice 2021-04-28 21:12:07 +00:00
Bug Hunter
9afc192154 Revert "Check all RE order quietly"
This reverts commit 0ad6552f8ac900f24f6756bb42973e4b4cbf7a2a.
2021-04-28 21:00:56 +00:00
tool4EvEr
835ffaafd4 Fix Banding NPE 2021-04-28 19:28:22 +02:00
Michael Kamensky
202ddd8157 Merge branch 'clone' into 'master'
Fix temporary clones keeping Remembered on Self

Closes #1810

See merge request core-developers/forge!4612
2021-04-28 04:09:01 +00:00
tool4EvEr
620e95cebf Fix temporary clones keeping Remembered on Self 2021-04-27 21:52:12 +02:00
Hans Mackowiak
178f98c82f CardProperty: add SharesColorWithOther to stop comparing cards with themselves 2021-04-27 15:15:08 +02:00
Hans Mackowiak
682884355f TargetRestrictions: hotfix isDividedAsYouChoose to fix TestCase 2021-04-27 09:17:16 +02:00