Commit Graph

8731 Commits

Author SHA1 Message Date
Jetz72
bba94d5a9e Merge branch 'Card-Forge:master' into fixes20240825 2024-08-26 00:26:28 -04:00
Jetz
4afc86b4b4 Support functional variants in translations 2024-08-26 00:25:43 -04:00
Jetz
fd56341446 DetachedCardEffect GameCopier copying 2024-08-25 16:40:58 -04:00
Jetz
b97788d8eb DetachedCardEffect LKI copying 2024-08-25 09:58:59 -04:00
Hans Mackowiak
c3a2e67130 CopyPermanentEffect: use DefinedName for special copies (#5988)
* CopyPermanentEffect: use DefinedName for special copies
2024-08-25 10:44:15 +02:00
Hans Mackowiak
3ef0479d76 LandAbility: skip if already in Battlefield 2024-08-25 09:12:55 +02:00
Jetz
7b7dd0f7c3 Fix commander snapshotting
Fix DetachedCardEffect snapshottong
2024-08-24 16:35:35 -04:00
Jetz
34e5938f08 Remove "by Commander Effect" from SA list 2024-08-24 16:34:22 -04:00
tool4ever
30a358dda1 Fix Wheel of Potential (#5983)
* Wheel of Potential revision

* Logic cleanup

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-08-24 14:25:36 +03:00
Jetz
0b43d3ebf5 Merge branch 'master' into youreInCommand 2024-08-23 19:06:02 -04:00
Jetz
955314527a Single commander effect per player
Support DetachedCardEffect with no source card
2024-08-23 19:04:59 -04:00
Jetz
610488bc22 include components for RememberTargets 2024-08-23 18:55:52 -04:00
TRT
45b333b8ac Fix NPE with Brilliant Ultimatum 2024-08-23 12:10:31 +02:00
Hans Mackowiak
77710cf1b0 refactor LandAbility to be created by CardFactory (#5047)
---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-08-23 10:57:33 +02:00
tool4ever
064512ed83 Implement CR 800.4m (#189)
* Relocate effects instead of exiling
2024-08-21 18:14:13 +00:00
tool4ever
d369c500df Misc cleanup (#5958) 2024-08-21 17:47:25 +02:00
Hans Mackowiak
7ba2d02172 GameActionUtil: use Multikicker as KeywordExtraCost (#5881)
* GameActionUtil: use Multikicker as KeywordExtraCost

* ~ remove getMultiKickerManaCost

* ~ remove Announce$ Multikicker

* some AI tweaks

* Fix MultiKicker for AI

* Update ComputerUtilMana.java

* Update ComputerUtil.java
2024-08-21 10:25:47 +03:00
Hans Mackowiak
492ff16c12 Keyword: add 'Bands with other' keyword (#5950) 2024-08-19 06:32:44 +02:00
Jetz
ec7f2be51c Merge branch 'master' into youreInCommand
# Conflicts:
#	forge-game/src/main/java/forge/game/player/Player.java
2024-08-17 15:40:38 -04:00
Jetz
6929231fd5 setCommanders rewrite 2024-08-17 15:21:44 -04:00
tool4ever
1857d1795d Improve resetOriginalHost (#5939)
Co-authored-by: TRT <>
2024-08-17 09:58:34 +02:00
Chris H
4554dee721 Generate individual booster slots with individual replacement percentages
Convert MH3 to booster slot percentages
2024-08-16 16:57:21 -04:00
Anthony Calosa
de3b6b82cb fix NPE 2024-08-16 10:27:25 +08:00
Jetz
6a53c187ad You're In Command + Support 2024-08-15 09:33:11 -04:00
Chris H
8be414d9dd Blb release (#5929)
* [maven-release-plugin] prepare release forge-1.6.64

* [maven-release-plugin] prepare for next development iteration

* Update pom.xml

* Update AndroidManifest.xml

* Update pom.xml

* Update Forge.java

---------

Co-authored-by: GitHub Actions <actions@github.com>
2024-08-14 21:06:29 -04:00
kevlahnota
024bf68040 Merge pull request #5920 from kevlahnota/master2
Update Sentry
2024-08-14 13:26:48 +08:00
Anthony Calosa
4deff44f76 remove hint 2024-08-14 06:40:45 +08:00
Chris H
6886992009 Fix bad references for snapshots 2024-08-13 14:53:19 -04:00
tool4ever
67b18b2e08 Update scripts (#5919) 2024-08-13 19:37:43 +02:00
Anthony Calosa
4a2991588b Update Sentry libs
- fix Java Property on startup
2024-08-13 20:11:20 +08:00
Jetz72
8f77b1e3ce GamePieceType and isCollectible (#5889)
* GamePieceType and isCollectible.
Can no longer ante conjured cards.
Helper set of ZoneTypes that are part of the command zone.

* Faster GamePieceType evaluation

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2024-08-12 09:35:16 +02:00
tool4ever
e93b130a36 Merge pull request #5865 from tool4ever/uphill
Fix Uphill Battle
2024-08-11 20:26:46 +02:00
tool4ever
6c7600dd1b Merge pull request #5895 from Jetz72/code-cleanup
Miscallaneous Cleanup Part 3
2024-08-11 19:30:21 +02:00
tool4ever
d2c42071aa Fix token CMC when copying (#5898)
* Fix token CMC when copying

* Fix TDFC token copy using front CMC

---------

Co-authored-by: TRT <>
2024-08-11 19:09:59 +02:00
Hans Mackowiak
9f8c5b96ec ~NPE fix 2024-08-11 07:58:30 +02:00
Jetz
a7e1338eea Cleanup - valueOf -> parseInt 2024-08-10 12:55:49 -04:00
Jetz
f7d0929ea0 Cleanup - More Lambdas to method references 2024-08-10 12:54:16 -04:00
Jetz
4614c6c0c9 Cleanup - Map.getOrDefault and Map.computeIfAbsent 2024-08-10 12:48:52 -04:00
Jetz
bdc890c32c Cleanup - Collections.sort -> list.sort 2024-08-10 12:43:38 -04:00
Jetz
0ee46ff6ef Cleanup - .equals("") -> .isEmpty() 2024-08-10 12:28:18 -04:00
Jetz
daa9d59a67 Cleanup - addAll -> constructor parameter 2024-08-10 12:17:54 -04:00
Jetz
ae9877ce3c Cleanup - Collection.toArray 2024-08-10 10:25:35 -04:00
Hans Mackowiak
10f6d176bd DigEffect: fix moveParams reused 2024-08-10 12:03:33 +02:00
TRT
9fe6b06487 Clean up 2024-08-09 22:28:14 +02:00
Hans Mackowiak
a800bf681c GameActionUtil: store OptionalKeywordAmount in CastSA (#5853)
* GameActionUtil: store OptionalKeywordAmount in CastSA

* ~ rename and make into a Table
2024-08-08 22:16:17 +02:00
Hans Mackowiak
0b4814542e CardFactory: add offspring imagekey (#5871) 2024-08-07 12:32:05 +02:00
TRT
22aa5d8e08 Fix Garth + Uphill Battle 2024-08-07 08:26:13 +02:00
TRT
0a773c30bc Fix Uphill Battle 2024-08-06 21:11:22 +02:00
Hans Mackowiak
0e72dfb563 Update Card.java
Fix NullPTR
2024-08-06 15:13:15 +02:00
tool4ever
6268448dfe Register LTB trigger extra during replacements (#5851)
Co-authored-by: TRT <>
2024-08-06 06:31:09 +03:00