external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,143 Commits 31 Branches 187 Tags
eefc20a1ac61b51e1be0d822c804273aefa77a8a
Commit Graph

8422 Commits

Author SHA1 Message Date
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
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
Hans Mackowiak
140791ead7 Apply ReplaceAddCounter with ReplaceMoved for ETB Counter (#5791) 
* Apply ReplaceAddCounter with ReplaceMoved for ETB Counter

* ~ fix EffectOnly for ETB Counters
 2024-08-05 22:40:47 +02:00
Renato Filipe Vidal Santos
9f7a0374fd ETB update: Java code: Card.java, CardFactoryUtil.java (#5839) 
* Add files via upload

* Update CardFactoryUtil.java
 2024-08-05 07:06:29 +02:00
Renato Filipe Vidal Santos
45081ab045 Add files via upload (#5840) 2024-08-04 21:50:49 +02:00
Renato Filipe Vidal Santos
e6dc3e193f ETB update: Java code: GameActionUtil.java 2024-08-04 20:51:12 +02:00
tool4ever
8bc31ee567 Heirloom Epic and support (#5761) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-08-02 11:17:52 +02:00
Glorax
3b29804568 Rottenmouth Viper (#5704) 2024-08-02 08:19:02 +00:00
tool4ever
51c78e952a Chief Engineer can't convoke for snow or colorless shards (#5760) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-08-02 10:07:59 +02:00
Fulgur14
e2017328a6 Update CounterEnumType.java 2024-08-02 09:56:37 +02:00
Jetz72
d62dfe1c8c Miscallaneous Cleanup Part 2 - Lambdas and Method References (#5737) 
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

* Cleanup - CardPredicate Aggregates to method references

* Cleanup - Other static functions to method references

* Cleanup - Ambiguous class reference
Unclear when or how this happened...

* Cleanup - Anonymous -> Method reference

* Cleanup - Anonymous -> Lambda

* Cleanup - Comparator helper methods

* Cleanup - final method in final class

* Cleanup - private final methods

* Remove unused imports

* Convert a couple more lambdas to comparators.

* Simplify creature type list comparison.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-08-02 08:23:58 +03:00
tool4EvEr
6028ba9e33 Fix mapping 2024-08-01 14:04:42 +02:00
tool4EvEr
fdd490030f Check for new trigger 2024-08-01 14:04:42 +02:00
Hans Mackowiak
23d0b05547 SacrificeOnce Trigger 2024-08-01 14:04:42 +02:00
Hans Mackowiak
a58a197945 Update DestroyEffect.java 
remove Sacrifice$
 2024-08-01 11:53:54 +02:00
tool4EvEr
4218ea0fa8 TokenEffect no longer has state 2024-08-01 11:30:53 +02:00
tool4ever
31275df288 Fix casting Chaotic Strike when no attacker gets declared (#5745) 2024-07-31 20:12:04 +00:00
Chris H
c0230d1cb9 Add Expend and Teapot Slinger (#5731) 
* Add Expend and Teapot Slinger

* Fixes

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-07-31 11:21:41 +03:00
tool4EvEr
0a474c955a Fix Catastrophe allowing regeneration on land choice for creatures 2024-07-30 10:36:52 +02:00
Jetz72
ec9f6e2d2b Added attraction light icons (#5663) 
Refactored functional variants to be merged in the card face rather than the card factory
Some variant characteristics now show in deck builder columns
Fixed loading progress amount
"[card] has neither ManaCost nor Color" warning now actually displays when these are missing.

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-07-30 08:28:45 +03:00
Fulgur14
e758c364da Added Alania, Divergent Storm (#5714) 
* Fix corner case of triggering for another Otter after flicker
 2024-07-29 19:16:40 +00:00