external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,971 Commits 32 Branches 187 Tags
2bc48f25aeadb61e7259e8b1e7a67fdb336d7edc
Commit Graph

53971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
f0a3d19d38 CountersAi: skip for only one against Vorinclex 2021-10-10 19:17:35 +02:00
Michael Kamensky
a5016c4afc Merge branch 'klaxnek-master-patch-24357' into 'master' 
Update es-ES.properties (UseLaserArrows and ReplaceCard)

See merge request core-developers/forge!5535
 2021-10-10 10:06:09 +00:00
klaxnek
a7fc9b0882 Update es-ES.properties (UseLaserArrows and ReplaceCard) 2021-10-10 08:27:34 +00:00
leriomaggio
1718ca9020 Added full support to card preview with foil and correct updates 
Now all cards displayed in cardpreview panel will automatically adapt to any change in the decklist.
That is, the panel will be reset only if current-displayed card is not in decklist anymore. In all other cases, the preview will adjust depending on the new token status, and/or whether the card is/was foiled!

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-10 09:10:19 +01:00
leriomaggio
44cfc76552 Added support for Foiled cards in Token Key (w. tests) 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-10 08:24:47 +01:00
Michael Kamensky
e773868f18 Merge branch 'commander-tracker' into 'master' 
Add a tracker unfreeze-refreeze to State Based Action 903.9a to avoid Commander visualization issues

See merge request core-developers/forge!5533
 2021-10-10 04:53:02 +00:00
Michael Kamensky
77b46d0a84 Merge branch 'junk' into 'master' 
Fix Junk Winder

See merge request core-developers/forge!5534
 2021-10-10 04:46:41 +00:00
tool4EvEr
d359d6dc3c Fix Junk Winder 2021-10-10 01:05:05 +02:00
leriomaggio
89daddd643 New method to retrieve displayed item. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-10 00:01:33 +01:00
Michael Kamensky
a693083b05 - Minor refactoring to make the ugliness less ugly. 2021-10-09 16:51:59 +03:00
Michael Kamensky
ca71fa97cf - Remove unneeded variable. 2021-10-09 16:42:39 +03:00
Michael Kamensky
02de8ee70a - Add a tracker unfreeze-refreeze to State Based Action 903.9a to avoid Commander visualization issues. 2021-10-09 16:39:57 +03:00
Bug Hunter
e9b93e2215 Merge branch 'payfix' into 'master' 
canPlayAndPayFor: Improve check

See merge request core-developers/forge!5532
 2021-10-09 11:11:00 +00:00
tool4EvEr
53499296bc Improve check 2021-10-09 13:00:10 +02:00
Michael Kamensky
29f836344b Merge branch 'payfix' into 'master' 
canPlayAndPayFor: check for RaiseCost

Closes #871

See merge request core-developers/forge!5531
 2021-10-09 10:52:09 +00:00
Michael Kamensky
e99e535ee4 Merge branch 'twosat-master-patch-15209' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5530
 2021-10-09 10:51:38 +00:00
tool4EvEr
6789c29c6b canPlayAndPayFor: check for RaiseCost 2021-10-09 12:37:21 +02:00
Andreas Bendel
ab6fc6e2bf Update de-DE.properties 
translated UseLaserArrows and ReplaceCard
 2021-10-09 10:06:34 +00:00
Michael Kamensky
514cd61863 Merge branch 'gristAgain' into 'master' 
Card: fix Grist again

Closes #1985

See merge request core-developers/forge!5529
 2021-10-09 09:18:20 +00:00
Hans Mackowiak
93a0a83854 Card: fix Grist again 2021-10-09 10:37:36 +02:00
Michael Kamensky
029b72573b Merge branch 'bearer' into 'master' 
Bearer of the Heavens: fix crash

See merge request core-developers/forge!5528
 2021-10-09 04:17:34 +00:00
Michael Kamensky
3f810f3907 Merge branch 'changezoneall' into 'master' 
Allow additional reordering when moving cards together

See merge request core-developers/forge!5524
 2021-10-09 04:17:16 +00:00
leriomaggio
1934f27da3 Typo in documentation 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-09 00:17:34 +01:00
tool4EvEr
04c1b2664f Clean up 2021-10-08 21:35:50 +02:00
tool4EvEr
9f7012f718 fix crash 2021-10-08 20:00:49 +02:00
Michael Kamensky
77f7966a2c Merge branch 'kamahl' into 'master' 
Kamahl's Sledge: fix crash

See merge request core-developers/forge!5527
 2021-10-08 17:54:43 +00:00
tool4EvEr
ffacead162 fix crash 2021-10-08 19:45:22 +02:00
tool4EvEr
8c3fe81669 Allow reordering of multiple attachments 2021-10-08 19:34:23 +02:00
tool4EvEr
421474b025 Fix for Null Profusion 2021-10-08 19:34:23 +02:00
TRT
7dfab9c54e Reorder for Genesis Ultimatum 2021-10-08 19:34:22 +02:00
TRT
4939a5ef8c Allow additional reordering when moving cards together 2021-10-08 19:34:21 +02:00
leriomaggio
e9aa12bc46 Extensive code refactoring, updates with new token types, and new support for allowed deck sections 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-08 16:46:33 +01:00
Hans Mackowiak
c905dd753b Merge branch '1984' into 'master' 
move eff.updateStateForView() in other effects

Closes #1984

See merge request core-developers/forge!5526
 2021-10-08 15:33:17 +00:00
Northmoc
e29718444e move eff.updateStateForView() in other effects 2021-10-08 11:10:05 -04:00
Michael Kamensky
7af36d7c0f Merge branch 'master' into 'master' 
VentureAi timing tweaks, minor AI hint

See merge request core-developers/forge!5525
 2021-10-08 14:56:59 +00:00
Michael Kamensky
dd63093642 - Tweak the timing for VentureAi activations when it has an associated cost. 2021-10-08 17:55:04 +03:00
Michael Kamensky
e417d510c4 - Added an AI hint to Devoted Paladin. 2021-10-08 17:42:53 +03:00
Michael Kamensky
6a15f3d30c Merge branch 'damageprevent' into 'master' 
DamagePreventAi: Add extra sanity check

See merge request core-developers/forge!5523
 2021-10-08 13:17:36 +00:00
TRT
b5800afa65 Add extra sanity check 2021-10-08 15:14:24 +02:00
leriomaggio
affc37ed0c Updates from getNumber to getQuantity from parsed tokens. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-08 13:55:00 +01:00
leriomaggio
c2f3b7d4fc Added support to game format, allowed sections, and B&R inclusion. ParseInput moved + specialised FIX for commander 
This commit includes additional support to game format and banned/restricted cards in deck import controller. These settings will be passed on to DeckRecognizer when preparing for card list processing.
The whole card list parsing has been moved to deckrecognizer now, but DeckImportController still integrates later-stage (specialised) FIX for Commanders.
In particular, specialised checks are performed (whenever commander section is supported in current editor) to Sideboard and Commander sections checking whether (A) any commander is in side, and in case raise warning, or to check whether commanders in commander section are way too many.

Those will always result in Additional warnings ADDED to the (displayed) decklist, and won't interfere in any way with the import process.

If one wants to import 3 commanders in commander section who am I to say no!? :D

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-08 13:54:12 +01:00
leriomaggio
9f04f0cec7 Improved Token Mana Symbol Regexp with support for two colours tokens (and symbols) 
All corresponding tests have been extended, and improved to cover the new supported Mana Tokens

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-08 13:45:31 +01:00
Michael Kamensky
490c1ce7bc Merge branch 'damagedeal' into 'master' 
DamageDealAi: Improve mandatory targeting with stuff like Fury, so AI less masochistic

See merge request core-developers/forge!5522
 2021-10-08 09:24:05 +00:00
TRT
5b99cea173 Clean up 2021-10-08 11:21:25 +02:00
Michael Kamensky
7e8b8e9f6d Merge branch 'changedTypeTable' into 'master' 
Card: changed Color/Type as Table

Closes #1982

See merge request core-developers/forge!5521
 2021-10-08 09:02:03 +00:00
Michael Kamensky
7380de6bb5 Merge branch 'master' into 'master' 
[Mobile] Add Replace Card Variant Option for Deck Editor

See merge request core-developers/forge!5520
 2021-10-08 09:01:15 +00:00
tool4EvEr
d3a24a93ce Improve mandatory targeting with stuff like Fury, so AI less masochistic 2021-10-08 09:42:29 +02:00
Hans Mackowiak
b83174e6ee Card: changed Color/Type as Table 2021-10-08 07:22:00 +02:00
Anthony Calosa
f867c99113 update 2021-10-08 11:49:29 +08:00
Anthony Calosa
0fb7ea9e00 Merge remote-tracking branch 'core/master' 2021-10-08 11:41:29 +08:00