Commit Graph

4348 Commits

Author SHA1 Message Date
Chris H
a49ab150f9 Fix imports 2025-02-17 20:19:41 -05:00
Chris H
4bc07e5311 Disable bulk images from the UI 2025-02-17 20:19:41 -05:00
Chris H
44fca5ee5e Restore flatten library 2025-02-15 18:00:19 -05:00
GitHub Actions
2f33c24414 [maven-release-plugin] prepare for next development iteration 2025-02-15 18:00:19 -05:00
GitHub Actions
380f289887 [maven-release-plugin] prepare release forge-2.0.02 2025-02-15 18:00:19 -05:00
Chris H
a5ab069f5b Temporarily remove flatten library for release 2025-02-15 18:00:19 -05:00
Jetz72
493a8f351b Add Speed Tracker to Command Zone (#6982)
* Add command zone effect displaying speed

* Remove enum counter type for speed.

* Make Start Your Engines an SBA.

* LifeLost -> LifeLostAll per speed rules.

* Use same game event for all speed changes.

* Fix keyword not appearing in detail text

* Cleanup extra createSpeedEffect.

* Add support for arbitrary overlay text. Remove fake counters.

* Text styling.

* Remove extra SBA check.

* Remove speed from PlayerView; localization support.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2025-02-10 07:43:48 +03:00
Justin C
bf1192f80d instanceof Pattern variable changes (#6972) 2025-02-05 16:52:14 +03:00
Chris H
45396c1bf4 Fix sellfactor duplication 2025-02-03 18:55:24 -05:00
Chris H
6615090bda Allow jumpstart/"nosell" cards to be sold for 0 credits 2025-02-02 12:55:09 -05:00
Chris H
eaf6f117a2 Don't try to load battle if entering village simultaneously 2025-02-02 12:54:38 -05:00
Chris H
0b87094f96 Fix NPE with POEReference 2025-01-30 21:32:17 -05:00
tool4ever
99fd4d9125 AnimateSubAbility rework (#6819)
* AnimateSubAbility rework

* Remove old fix code, it will no longer be needed

* Add zone ordering

* Add labels

* Clean up

* Fix test

* Tweak logic

* Fix Gilraen

* Refactor with counter

* Clean up

* Cleanup effect if card can't ETB

* Update semesters_end.txt

Format abilities

* Return as Aura trickery

* Apply effect before RE

* Update scripts

* Fix order after creating it earlier

* Fix test

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
2025-01-28 13:18:24 +03:00
Jetz72
33e26c1ad2 Fix alt zone display having the zones on opposite sides of the screen. (#6742) 2025-01-03 18:47:56 +00:00
Jetz
971befb1c9 Fix for hotseat mana selection 2025-01-02 22:20:08 -05:00
Chris H
cd517fddbb Restore flatten for snapshots 2025-01-02 09:40:50 -05:00
GitHub Actions
7388468ceb [maven-release-plugin] prepare for next development iteration 2025-01-02 09:40:50 -05:00
GitHub Actions
31af1108d3 [maven-release-plugin] prepare release forge-2.0.01 2025-01-02 09:40:50 -05:00
Chris H
b4dd336ca7 Remove flatten temporarily for release 2025-01-02 09:40:50 -05:00
Jetz72
386ed8a082 Contraptions (#6717)
* Start of contraptions

* More contraption work

* More contraption stuff.
Steamflogger Boss implementation

* More Contraption things

* Use AI's preferred target for mandatory animate effects

* Possible fix for Boomflinger's empty target prompt

* Remove nullable low-definition mana pool icon.

* Contraption Predicates

* Desktop extra zone menu

* Remember cranked contraptions

* AnimateAi fallback to AITgts; Bee-Bee Gun

* Fix AI paying optional costs to assemble zero contraptions.

* Override predicted damage for DealDamage effects with random amounts

* Fix double prompt when reassembling other players' contraptions

* All remaining contraptions and support cards!

* Remove unused imports

* Some cleanup

* Implement non-assembled contraption rule.
Fix blank line prefix on card detail text.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2025-01-02 09:41:53 +03:00
tool4ever
1c0cb07a2e Remove obsolete GameEvent (#6736) 2025-01-01 17:24:47 +00:00
tool4ever
475020f742 Order hand option (#6729)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-12-30 08:10:02 +03:00
tool4ever
9b6203b883 Full Control unleashed (#6700)
* Fix APNAP order
2024-12-26 12:53:46 +00:00
Jetz
348447c82d Re-Fix IndexOutOfBoundsException, sans janky method chain 2024-12-16 10:44:07 -05:00
Chris H
420f862e90 This function wasn't tested. And it seems like it was written not to be maintainable. Reverting. 2024-12-15 20:35:23 -05:00
kevlahnota
1b493b0a2b Merge pull request #6047 from Jetz72/code-cleanup
Migrate Guava Predicates and Functions to Java implementations
2024-12-15 08:51:39 +08:00
Anthony Calosa
63bf2b1a3d clear bookmarks
- closes #6685
2024-12-15 00:53:03 +08:00
Agetian
770f51e891 - Fix draft rankings not showing in Adventure Mode on the first pick of the draft. (#6674) 2024-12-09 22:08:58 +03:00
Jetz
931e734bc0 Merge remote-tracking branch 'origin/master' into code-cleanup
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ComputerUtil.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
#	forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
2024-12-09 08:52:36 -05:00
Anthony Calosa
40ee86167b fix typo 2024-12-08 08:47:37 +08:00
Anthony Calosa
7482856dad prevent NPE on AdventureDeckEditor onClose event 2024-12-08 08:45:57 +08:00
kevlahnota
ea244ec39b Update CardFaceSymbols.java
fix CR -> ColorlessHybrid
2024-12-06 06:03:10 +08:00
Jetz
6c10351d93 Merge remote-tracking branch 'origin/master' into code-cleanup
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/PlayAi.java
#	forge-core/src/main/java/forge/util/collect/FCollection.java
#	forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
2024-12-05 08:27:25 -05:00
kevlahnota
f637bd970b update check for ItemManagerConfig 2024-12-05 11:49:34 +08:00
kevlahnota
32ba304d11 Update AdventureDeckEditor.java
fix bulk sell menu appearing on other catalogpages
2024-12-05 11:32:45 +08:00
Jetz
44cf7dbbea Merge remote-tracking branch 'origin/master' into code-cleanup
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/AiCardMemory.java
#	forge-ai/src/main/java/forge/ai/AiController.java
#	forge-core/src/main/java/forge/card/ICardDatabase.java
#	forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
#	forge-core/src/main/java/forge/util/FileSection.java
#	forge-core/src/main/java/forge/util/collect/FCollection.java
#	forge-game/src/main/java/forge/game/card/CardProperty.java
#	forge-game/src/main/java/forge/game/combat/Combat.java
#	forge-game/src/main/java/forge/game/spellability/SpellAbility.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
#	forge-gui/src/main/java/forge/deck/DeckgenUtil.java
#	forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
2024-12-04 08:15:30 -05:00
Chris H
a337fd2aed Pay cost verbiage 2024-12-03 21:55:54 -05:00
Anthony Calosa
d733b8933e enable timeout on chooseSpellAbilityToPlayFromList 2024-12-02 10:10:00 +08:00
Anthony Calosa
e8a6d4ce92 prevent crash on Android 11 and below
Completablefuture -> completeOnTimeout
2024-12-02 09:44:29 +08:00
kevlahnota
486e8d37b5 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-29 06:03:51 +08:00
kevlahnota
3971d53746 Update TextRenderer.java
fix symbol out of bounds
2024-11-28 20:00:17 +08:00
Anthony Calosa
e1d7c4a429 use Guava memoize 2024-11-26 05:48:21 +08:00
Anthony Calosa
08bab22a23 refactor lazy initialization 2024-11-25 20:45:05 +08:00
Anthony Calosa
8fa95a01ae update arrows 2024-11-23 19:32:03 +08:00
Anthony Calosa
b0411423f6 use Executor, update MatchScreen 2024-11-23 13:22:41 +08:00
Anthony Calosa
0b9fb9f379 Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT 2024-11-22 19:13:37 +08:00
Anthony Calosa
78e587b32b handle exception 2024-11-22 19:13:15 +08:00
kevlahnota
8486dbbd02 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 16:08:21 +08:00
Anthony Calosa
66045c0c0a .. 2024-11-22 15:45:44 +08:00
kevlahnota
f918ae5978 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 12:46:13 +08:00