4659 Commits

Author SHA1 Message Date
Jetz72
539bea6b11 Merge pull request #9096 from Jetz72/fixes20251106
Minor Adventure Updates
2025-11-10 12:17:36 -06:00
tool4ever
a29ead42b0 Remove outdated stuff (#9105) 2025-11-07 11:28:33 +00:00
tool4ever
c765769466 Combine Adventure docs (#9098) 2025-11-06 18:19:58 +00:00
Jetz
d9e356e20c Add some extra checks for safety. 2025-11-06 09:34:56 -05:00
Jetz
f27eb1042f Expand anti-cheese. 2025-11-06 09:30:27 -05:00
Jetz
48be3406c7 Reduce bias towards standard in event selection.
Make allowedEvents override other filters.
Ensure set pool filter can't filter out every event.
2025-11-06 08:50:00 -05:00
Jetz
50a98238d1 Add allowedEvents support for adventure configs 2025-11-06 08:29:55 -05:00
Jetz72
39d35fd016 Merge pull request #8742 from Jetz72/fixes20250918
Refactor "Unique Cards Only" Setting for Mobile Editor
2025-11-05 09:27:38 -06:00
Janek Gröhl
561ad37f4f Fix commander adventure mode crash in limited event. When putting card from sideboard, isCommanderEditor returned true, even though game is in limited mode. Accessing the command zone then led to nullptr. (#9064) 2025-11-05 16:17:00 +01:00
Jetz
01382fbcc4 Merge branch 'master' into fixes20250918
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
2025-11-05 09:06:04 -05:00
Agetian
ab3c66fd0a Add puzzle PS_SPM3. (#9060)
* - Added puzzle PS_SPM3.

* - Minor mistype fix.
2025-11-01 20:26:38 +03:00
Janek Gröhl
ab4c91dd2d Implemented Commander variant of Adventure Mode (#8970)
* Added UI elements for commander mode in NewGame screen.
- still missing random pool of commander candidates sharing a color with each selected color identity.

* Added rudimentary commander choice with preview image.
For now, it is 5 suggestions per color identity with the requirement that the chosen color is part of the commander's identity.

* Commander card is now added to the player inventory and cannot be sold.
The save game adds a flag whether the game is in commander mode, which will be important for the future changes.

* Commander is now auto-added to the initial deck. Commander cannot be removed. Commander is properly saved and loaded.

* Duels now feature the command zone and all rules

* The chosen commander is now set to every deck if the game mode is commander.

* Only cards can be added to the deck that fulfill the color identity.

* heuristically add a pile of singleton cards to function as the starter for the commander's journey.

* Fix land color identity bug in commander pile

* Items are put on autosell if they do not match commander identity.

* Autosell is now properly set with the card flip timing rules. When visiting a shop, the deck conformaty message does not show anymore.

* Remove strict necessity for a fixed commander. This way, a player may choose to switch to a different legendary creature they find.

* 15 Streamlined commander choices without having to swap colors individually.

* Clean up to remove now redundant i18n label. More focus on creatures for starter commander decks.

* Refactor adventure commander deck generation into the DeckgenUtil class

* Refactorings as suggested by @Jetz72.

* Remove custom deck generator

* handle DeckFormat logic through AdventureDeckEditor.
Fix bugs, where partner commanders would be overwritten when using the stock DeckgenUtil.

* Remove random new line

* Code cleanup

* Fix unused import error

* Fix unused import error

* Revert "organise import" changes and random space linebreak changes.

* Removed another import package.* statement

* Implement fixed commander deck to start with. Removed UI edits and random commander choice.

* Add commander-specific cards and a two white overrun effects

* Revert to prior string formatting.

* Remove import *

* Formatting nitpicking to change as little original code as possible.

---------

Co-authored-by: Agetian <stavdev@mail.ru>
2025-11-01 19:56:55 +03:00
Jetz72
f9b6652c2a Flavor Names (#8849)
* Make getAllFaces return nonnull list

* Optimize Predicates

* CardDB and script syntax changes

* Apply syntax changes

* In-game support for flavor names

* Add display names to PaperCards

* Support searching by flavor names

* Remove some WIP stuff

* Update PaperCard translation key.

* Update capitalization

* Auto-map to variants when edition entry uses a flavor name

* Consolidate display name logic.

* Added syntax for generating flavor named variants in edition files.

* Some examples of new syntax.

* Ignore flavored oracle text when searching rules text

* add hasFlavorName

* Add image key

* Get correct variant from card requests with flavor names.
2025-10-21 15:00:59 +02:00
Jetz
4a616c8ac6 Move round calculation to after participant amount is set. 2025-10-16 09:09:08 -04:00
Jetz
7e47a6ee2c Move EventStyle specification closer to similar parameters. 2025-10-15 09:53:36 -04:00
Jetz
1093984bec Merge branch 'master' into setEventCommand
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
#	forge-gui-mobile/src/forge/adventure/stage/MapStage.java
#	forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
2025-10-15 09:19:44 -04:00
Hans Mackowiak
6617e2627c Conquest: make ColorButton instead of ColorFilter 2025-10-14 11:51:14 +02:00
Hans Mackowiak
f8d883d91f ColorSet: turn Set into an Enum (#8757) 2025-10-09 15:03:45 +02:00
Eradev
1962a8d28b Fix typo 2025-10-08 21:10:14 -04:00
Eradev
f3ecd51253 Minor cleanup 2025-10-08 21:10:14 -04:00
Eradev
bceb3c4503 Check every edition of a card instead of just the first one 2025-10-08 21:10:14 -04:00
Eradev
4e17b4c9d2 Missing import 2025-10-08 21:06:33 -04:00
Eradev
caf8b0535f CardUtil File format 2025-10-08 21:06:33 -04:00
Eradev
0ee3dc4e67 Check for Snow lands and Wastes when generating random decks 2025-10-08 21:06:33 -04:00
kevlahnota
3847080221 Merge pull request #8875 from kevlahnota/master4
prevent NPE
2025-10-09 06:10:12 +08:00
Anthony Calosa
f7c965de02 prevent NPE 2025-10-09 06:06:59 +08:00
Eradev
1b8c87e578 Fix event init 2025-10-07 06:30:10 +02:00
Anthony Calosa
04f454ae83 prevent NPE 2025-10-07 05:32:41 +08:00
kevlahnota
a2b324c9ce prevent NPE VAvatar.java 2025-10-04 07:50:11 +08:00
Chris H
c0f5615885 Manually fixing version touches 2025-09-26 09:08:49 -04:00
Anthony Calosa
f11c2ad8a4 fix Vertical layout for VManaPool 2025-09-26 08:29:07 +08:00
kevlahnota
20479518da Merge pull request #8777 from kevlahnota/master4
fix removing item by name
2025-09-25 06:57:09 +08:00
Anthony Calosa
1ded8fe5da fix removing item by name 2025-09-25 06:51:02 +08:00
Hans Mackowiak
2d1fe88d32 FSkinProp: unify Enum to SkinProp places (#8764)
* FSkinProp: unify Enum to SkinProp places

* FSkinProp: add iconFromDeckSection
2025-09-24 19:52:58 +02:00
Anthony Calosa
40629a72a9 update Sentry, update oshi, update android-all, npe prevention 2025-09-23 19:09:15 +08:00
GitHub Actions
a6395373f7 Restore POM files for preparation of next release 2025-09-21 20:58:46 -04:00
GitHub Actions
54f41a28cd [maven-release-plugin] prepare for next development iteration 2025-09-21 20:58:46 -04:00
GitHub Actions
a2c798ba86 [maven-release-plugin] prepare release forge-2.0.06 2025-09-21 20:58:46 -04:00
Anthony Calosa
6ec6d64cb2 update FModel, add Icon Overlay for Horizontal tabs 2025-09-19 22:06:38 +08:00
Anthony Calosa
cb7fc3df4e fix gap and visibility on horizontal layout 2025-09-19 10:32:18 +08:00
Jetz
bd04a6f1b9 Move unique card filtering from editor to card manager. 2025-09-18 09:46:03 -04:00
Anthony Calosa
c2c3add52b update switch 2025-09-18 19:35:23 +08:00
Anthony Calosa
1c7bc1c0d3 remove duplicated code and minor format 2025-09-18 19:27:55 +08:00
kevlahnota
0cab03b96c Update VManaPool.java 2025-09-18 06:37:45 +08:00
Hans Mackowiak
34323107c9 AetherFilter: use Predicate for Caption (#8724)
* AetherFilter: use Predicate for Caption
2025-09-17 18:00:08 +02:00
kevlahnota
415e2c12e1 Merge pull request #8725 from kevlahnota/master4
fix tab display area size on Horizontal layout
2025-09-17 12:28:25 +08:00
Anthony Calosa
930019db40 fix tab display area size on Horizontal layout 2025-09-17 12:24:35 +08:00
Hans Mackowiak
6cf2f20cdc ColorSet: store EnumSet and toString as Final (#8720) 2025-09-16 16:32:16 +02:00
kevlahnota
4a6275d282 Merge pull request #8710 from Card-Forge/enhance-prize-visiblity
Only show event cost before you sign up for the event
2025-09-16 15:15:58 +08:00
Anthony Calosa
40f6a5b472 update 2025-09-16 12:03:18 +08:00