Commit Graph

64752 Commits

Author SHA1 Message Date
Anthony Calosa
ceb8e00e62 Merge pull request #3276 from tool4ever/loseEnchant
Aura without Enchant shouldnt't stay attached
2023-06-16 05:11:19 +08:00
Simisays
11ebc4d23d LOTR 10 cards (#3275) 2023-06-15 19:26:53 +00:00
Simisays
88ecaf89d5 LOTR 10 cards (#3261) 2023-06-15 19:26:34 +00:00
tool4EvEr
39ae4b5c83 Aura without Enchant can't stay attached 2023-06-15 20:32:26 +02:00
schnautzr
deae09cd99 Merge branch 'Card-Forge:master' into master 2023-06-15 12:03:09 -05:00
Rob Schnautz
2ec52b4d52 Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-15 11:08:32 -05:00
Rob Schnautz
e1707bd24d unused decks, also added a rat deck 2023-06-15 11:08:11 -05:00
schnautzr
e0b09fef18 Merge branch 'Card-Forge:master' into working 2023-06-15 09:23:55 -05:00
Rob Schnautz
e368a91cab sort out miniboss decks not in use 2023-06-15 08:40:43 -05:00
Rob Schnautz
fdd4f2aebb move greenwizard_hard_rampbis.dck to standard decks 2023-06-15 08:37:21 -05:00
Rob Schnautz
e247fd3698 sort starter decks not in use to subdirectory 2023-06-15 08:34:58 -05:00
Anthony Calosa
203a7a4f73 Merge pull request #3274 from kevlahnota/newmaster2
fix panglacial wurm hidden cardview
2023-06-15 21:31:54 +08:00
schnautzr
99d0063e75 Merge branch 'Card-Forge:master' into working 2023-06-15 08:28:36 -05:00
Anthony Calosa
4e108bbdaa fix panglacial wurm hidden cardview 2023-06-15 21:26:27 +08:00
Rob Schnautz
9c9a00fe43 Update Amonkhet decks to match Shandalar decks. 2023-06-15 08:12:55 -05:00
schnautzr
e0e6ad096b Merge branch 'Card-Forge:master' into master 2023-06-14 19:32:07 -05:00
Rob Schnautz
8938f0a7d6 Rearrange the sprites and decks directories. 2023-06-14 18:11:55 -05:00
Anthony Calosa
da0dca319b Merge pull request #3273 from kevlahnota/newmaster2
update hasLegalCardsPredicate when deckconformance is turned off
2023-06-15 06:48:53 +08:00
Anthony Calosa
cabd79b6b4 update hasLegalCardsPredicate when deckconformance is turned off
- fixes #3271
2023-06-15 06:25:35 +08:00
tool4ever
f59cf3791e Update sword_of_once_and_future.txt (#3270) 2023-06-14 22:33:17 +03:00
schnautzr
3689a2e09b Merge branch 'Card-Forge:master' into master 2023-06-14 11:32:13 -05:00
Rob Schnautz
c911150ee3 Adding Amonkhet to the project. To access, you'll need to change \adventure\settings.json to say "Amonkhet" instead of "Shandalar". When finished, remember to change it back again. 2023-06-14 11:29:42 -05:00
Anthony Calosa
92cfd313e2 Merge pull request #3266 from Simisays/ADVENTUREFIX
Master green wizard crash fix
2023-06-15 00:26:49 +08:00
Simisays
913fede917 Update greenwizard_hard_rampbis.dck 2023-06-14 18:20:11 +02:00
tool4ever
5e6c433a42 Fix AI not being able to use mana from tapped sources (#3264)
* Fix AI not being able to use mana from tapped sources

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-06-14 16:28:39 +03:00
Paul Hammerton
9d772e0906 Merge pull request #3265 from paulsnoops/lotr_legal
Formats update: Add LTR & LTC (also add tokens to editions)
2023-06-14 14:24:27 +01:00
paulsnoops
8481926ab2 Formats update: Add LTR & LTC (also add tokens to editions) 2023-06-14 14:19:20 +01:00
tool4ever
1dbe024db4 Update kaya_the_inexorable.txt 2023-06-14 11:15:51 +02:00
schnautzr
71a94d0842 Merge branch 'Card-Forge:master' into master 2023-06-14 01:19:52 -05:00
Rob Schnautz
015fd574a7 make several adventure resources common (particle_effects, skin, sprites, ui, most of world) 2023-06-14 01:19:09 -05:00
Hans Mackowiak
0625752dc4 Update pollenbright_wings.txt 2023-06-14 07:07:50 +02:00
TabletopGeneral
1adb7e5462 Adventure - draft fixes (#3260)
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2023-06-13 19:01:54 +03:00
Anthony Calosa
705dd1518f Merge pull request #3256 from Simisays/LOTR10
LOTR 10 cards
2023-06-13 17:50:23 +08:00
Agetian
ca948c6b81 - Added puzzles PS_MOM4, PS_MOM5. (#3259)
- Fixed the name of PS_MOM3.
2023-06-12 23:15:57 +03:00
Simisays
a112d4895e Update shire_shirriff.txt 2023-06-12 20:55:53 +02:00
Simisays
220cdc5493 update 2023-06-12 20:10:04 +02:00
Anthony Calosa
5576c1d94e Merge pull request #3255 from Agetian/ai-revealorchoose-cost
AI: Support for RevealOrChoose (Dragon's Fire)
2023-06-13 02:01:15 +08:00
Anthony Calosa
41c65cc250 Merge pull request #3257 from kevlahnota/newmaster2
Update Winlose
2023-06-13 01:55:39 +08:00
Anthony Calosa
b5d1b37ba0 update winlose 2023-06-13 01:48:00 +08:00
Simisays
aafe2b8f76 Update dunland_crebain.txt 2023-06-12 19:06:17 +02:00
Agetian
582f949791 - Simplify source lookup 2023-06-12 18:56:18 +03:00
Simisays
2c1014cc37 Merge remote-tracking branch 'upstream/master' into LOTR10 2023-06-12 17:51:47 +02:00
Simisays
021dee0534 update 2023-06-12 17:51:38 +02:00
Agetian
4b9ff0d23f - For Dragon's Fire, only reveal stuff if power is 4 or greater. 2023-06-12 18:39:33 +03:00
Anthony Calosa
65be16f551 Merge branch 'master' into newmaster2 2023-06-12 23:33:37 +08:00
Anthony Calosa
227d7e88b7 Update tazri_stalwart_survivor.txt 2023-06-12 23:32:16 +08:00
Anthony Calosa
0f5a9071b2 Update danitha_new_benalias_light.txt 2023-06-12 23:30:11 +08:00
Agetian
83b8cacdd4 - More robust RevealOrChoose detection 2023-06-12 18:24:29 +03:00
Agetian
59e8c5aab3 - Fix imports + avoid using variable assignment 2023-06-12 18:23:05 +03:00
Agetian
67e0610d38 - Add logic for RevealOrChoose cost for the AI (Dragon's Fire) 2023-06-12 18:21:00 +03:00