Commit Graph

1795 Commits

Author SHA1 Message Date
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
Jetz
e880a83df2 Let SVars in functional variants overwrite original script 2025-02-15 12:34:00 -05:00
Jetz
8149966915 Fix Tyrranax Rex importing 2025-02-15 07:50:06 +01:00
Justin C
bf1192f80d instanceof Pattern variable changes (#6972) 2025-02-05 16:52:14 +03:00
Hans Mackowiak
f92c570bff Update CardRules.java (#6768)
small fix to unify Characteristic Defining Abilities
2025-01-14 11:49:08 +01: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
9b6203b883 Full Control unleashed (#6700)
* Fix APNAP order
2024-12-26 12:53:46 +00:00
tool4ever
48a33e37c3 Some cleanup (#6712) 2024-12-22 10:27:29 +00:00
tool4ever
c7afe3ce7a Some cleanup (#6696) 2024-12-16 11:27:00 +00: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
Anthony Calosa
b858b48fde remove Collections.synchronized 2024-12-05 16:39:10 +08:00
Anthony Calosa
8e16456b2e update comments 2024-12-04 22:12:22 +08:00
Anthony Calosa
36f0021cae revert threadsafeiterable 2024-12-04 22:04:29 +08:00
kevlahnota
a0cad5fa48 fix FCollection (#6657) 2024-12-04 14:45:05 +01:00
Jetz
db2764f1ce Fix Build Errors 2024-12-04 08:27:37 -05: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
kevlahnota
c6c55a5a6a Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-12-01 12:12:31 +08:00
Ayora29
115276fa56 Update draftable edition sections (#6631)
* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix art index when parsing edition files sections
Add "scheme" section
Add fallback sheet in BoosterGenerator
Rewrite FileSection and Use LinkedHashMap for sections map

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Convert MKM to BoosterSlots

* Rename "RareMythic" section

* Remove conjured cards that do not have unique artwork.

* Restore basic land order

* Fixes

* parseSections : Fix Index out of bounds error for empty file

* FileSection.java : use for loop instead of do/while

---------

Co-authored-by: Agetian <stavdev@mail.ru>
2024-11-29 12:15:11 +03: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
Agetian
85e3cef612 Revert "Update draftable edition sections (#6274)" (#6623)
This reverts commit 46f3f01450.
2024-11-24 16:48:01 +03:00
Ayora29
46f3f01450 Update draftable edition sections (#6274)
* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix art index when parsing edition files sections
Add "scheme" section
Add fallback sheet in BoosterGenerator
Rewrite FileSection and Use LinkedHashMap for sections map

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Convert MKM to BoosterSlots

* Rename "RareMythic" section

* Remove conjured cards that do not have unique artwork.

* Restore basic land order
2024-11-24 16:39:21 +03:00
Anthony Calosa
b0411423f6 use Executor, update MatchScreen 2024-11-23 13:22:41 +08:00
Anthony Calosa
78e587b32b handle exception 2024-11-22 19:13:15 +08:00
kevlahnota
f01d03e706 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 06:13:37 +08:00
tool4ever
5fa9f5b50e Fix Kentaro (#6600) 2024-11-21 16:58:13 +00:00
Anthony Calosa
dda5afe704 refactor ManaPool
move custom multimap implementation for floating mana since this only covers small section
2024-11-21 13:33:52 +08:00
Chris H
0bc4e5d7b9 Restore flatten and version for now 2024-11-20 20:48:21 -05:00
GitHub Actions
c95afd86d8 [maven-release-plugin] prepare for next development iteration 2024-11-20 20:48:21 -05:00
GitHub Actions
ac37ee1947 [maven-release-plugin] prepare release forge-2.0.00 2024-11-20 20:48:21 -05:00
Chris H
0553eb58ef Temporarily remove flatten to get a release out 2024-11-20 20:48:21 -05:00
Anthony Calosa
0854fbb947 update FCollection
Replace copyonwritearray to a custom implementation for concurrent modification exception. A little bit slower but supports iterator operations.
Added FCollectionTest
2024-11-19 22:32:37 +08:00
Anthony Calosa
619130b519 remove unused import 2024-11-17 08:07:07 +08:00
Anthony Calosa
5dc84a68c4 remove threadsafeIterable
The original purpose which is to create a copy of linkedlist to iterate to avoid concurrent modification, but we use copyonwritearray design and it is already thread safe and iteration while modification is handled internally.
2024-11-17 08:00:29 +08:00
kevlahnota
0247acbd49 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 18:52:12 +08:00
Anthony Calosa
95e3304948 add coloridversion check 2024-11-16 18:24:22 +08:00
kevlahnota
b5f96ab8e2 Merge branch 'master' into CrypticSpire 2024-11-16 17:14:51 +08:00
Anthony Calosa
f52b7abe61 create ConcurrentMultiMap, remove unused map 2024-11-15 20:24:20 +08:00
kevlahnota
d9c4c818b5 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-15 16:53:04 +08:00
kevlahnota
4b13e55d83 fix infinite notice for missing tokens 2024-11-15 16:26:05 +08:00
kevlahnota
fc85623343 better to use a linkedqueue 2024-11-15 11:51:26 +08:00
kevlahnota
8a1d25e4e9 fix failing test 2024-11-15 11:46:20 +08:00
kevlahnota
37eed29ad2 try this multimap for manapool 2024-11-15 11:08:17 +08:00