Commit Graph

62371 Commits

Author SHA1 Message Date
Paul Hammerton
768eec795e A-Patrician Geist fix (#2349) 2023-01-30 11:02:52 +01:00
tool4ever
7688740c08 Update urabrasks_forge.txt 2023-01-30 07:53:05 +01:00
Anthony Calosa
e8599ed4bc Merge pull request #2348 from jjayers99/master
Adventure shop spawn correction
2023-01-30 14:27:16 +08:00
TabletopGeneral
ccd51a6907 Merge branch 'Card-Forge:master' into master 2023-01-29 23:09:39 -05:00
jjayers99
828e3cf59a Adjust duplicate shop check to still spawn from intended list once all options have already been spawned once. 2023-01-29 18:43:32 -05:00
Anthony Calosa
1a63a6aee5 Merge pull request #2342 from jjayers99/master
Regex syntax fix for adventure mode shops
2023-01-30 06:17:31 +08:00
jjayers99
b6364df7f2 Merge branch 'master' of https://github.com/jjayers99/forge 2023-01-29 17:07:23 -05:00
Anthony Calosa
1a1a7cb805 Merge pull request #2344 from tool4ever/ONEsupport
Support: All Will Be One + Goliath Hatchery
2023-01-30 06:04:37 +08:00
Anthony Calosa
ff484e30ff Merge pull request #2346 from Agetian/fix-enlist-desc
Fix Enlist description during cost payment
2023-01-30 06:03:30 +08:00
tool4EvEr
e6874237d7 Fix trigger 2023-01-29 20:54:58 +01:00
Simisays
91d4f2fa93 Update ezuri_stalker_of_spheres.txt (#2347) 2023-01-29 18:53:12 +01:00
TabletopGeneral
6e60a9cf77 Merge branch 'Card-Forge:master' into master 2023-01-29 11:03:56 -05:00
jjayers99
283a93c168 Adventure tweaks
Fixed rotating shop with too many cards spawning. Refactored Jumpstart pack selection to prevent selecting two copies of the same pack when other options are available.
2023-01-29 11:02:37 -05:00
Agetian
b701d61658 Merge branch 'Card-Forge:master' into fix-enlist-desc 2023-01-29 17:51:53 +03:00
Michael Kamensky
8df876eb3d - Fix Enlist description during cost payment. 2023-01-29 17:50:20 +03:00
Agetian
dc58d229be Add achievements for ONE/ONC (by Marek14) (#2345)
* - Added puzzles PS_BRO1 - PS_BRO3.
- Added a way to add tokens by script from GameState.
- Fixed u_2_2_spirit_vigilance_drawcounter token name capitalization.

* - Added puzzle PS_J221

* - Added ONE/ONC achievements by Marek14.
2023-01-29 17:49:20 +03:00
tool4EvEr
8519eeed23 Clean up 2023-01-29 15:16:10 +01:00
Michael Kamensky
4fff3c43b6 - Added ONE/ONC achievements by Marek14. 2023-01-29 17:00:23 +03:00
tool4EvEr
b4a4304f3f Fix scripts 2023-01-29 14:20:39 +01:00
tool4EvEr
167c8a3f33 Support: All Will Be One + Goliath Hatchery 2023-01-29 14:20:11 +01:00
Agetian
ee6c3550f9 Merge branch 'Card-Forge:master' into master 2023-01-29 08:46:19 +03:00
jjayers99
78a85209c9 Merge branch 'master' of https://github.com/jjayers99/forge 2023-01-28 15:49:39 -05:00
jjayers99
3a8fc95731 regex syntax fix 2023-01-28 15:49:11 -05:00
TabletopGeneral
65cc489e45 Merge branch 'Card-Forge:master' into master 2023-01-28 15:46:08 -05:00
jjayers99
a93a3a555d regex syntax fix 2023-01-28 15:40:06 -05:00
Paul Hammerton
c536ef80ad Merge pull request #2341 from paulsnoops/stx_draft_fix
STX collector booster quick fix
2023-01-28 19:57:39 +00:00
paulsnoops
4caa17ec34 STX collector booster quick fix 2023-01-28 19:53:36 +00:00
paulsnoops
fce57caf85 STX collector booster quick fix 2023-01-28 19:51:24 +00:00
Paul Hammerton
400d1425e9 Merge pull request #2339 from JohnWilliams77/patch-73
Update Strixhaven Mystical Archive.txt
2023-01-28 19:37:50 +00:00
Simisays
b0f1bf9bf4 Update vraska_betrayals_sting.txt (#2340) 2023-01-28 18:35:47 +00:00
JohnWilliams77
ca80fe301b Update Strixhaven Mystical Archive.txt 2023-01-28 18:08:06 +00:00
Anthony Calosa
71afc087d9 Update CardUtil.java
remove unreachable
2023-01-29 01:25:47 +08:00
Anthony Calosa
42a339813c fix missing return 2023-01-29 01:24:53 +08:00
Anthony Calosa
b5c1fe0c91 Merge pull request #2338 from kevlahnota/newmaster2
prevent PatternSyntaxException
2023-01-29 01:22:25 +08:00
Anthony Calosa
ff74ff67c2 Merge branch 'master' into newmaster2 2023-01-29 01:10:40 +08:00
Anthony Calosa
e9e2d97889 prevent PatternSyntaxException 2023-01-29 01:09:36 +08:00
Anthony Calosa
fa36389564 Merge pull request #2336 from churrufli/master
Net Decks Archive Updates
2023-01-28 16:24:19 +08:00
Churrufli
8d9e9fb2db Net Decks Archive Updates 2023-01-28 08:57:49 +01:00
Anthony Calosa
612332ba13 Merge pull request #2335 from kevlahnota/newmaster2
update shard ui image
2023-01-28 08:09:10 +08:00
paulsnoops
96a758fc6a Booster Draft: ONE 2023-01-27 19:09:02 -05:00
Anthony Calosa
f743c0e6af update shard ui image 2023-01-28 08:07:18 +08:00
paulsnoops
a8220aa49b Alchemy Rebalancing for January 17, 2023 2023-01-27 19:04:29 -05:00
Anthony Calosa
adde942bd7 Merge pull request #2332 from jjayers99/master
DMU & BRO Jumpstart
2023-01-28 07:18:35 +08:00
Anthony Calosa
1e598f17f4 Merge pull request #2288 from Simisays/ATRAXA
ONE Atraxa, Grand Unifier and some cleanup
2023-01-28 07:02:47 +08:00
Anthony Calosa
c468759aed Merge pull request #2300 from Simisays/MOREONE
ONE 14 cards
2023-01-28 07:02:25 +08:00
Anthony Calosa
5234bae05a Merge pull request #2328 from Simisays/ONE13
ONE 10 cards
2023-01-28 07:02:05 +08:00
Simisays
8e81ecfd40 Update gleeful_demolition.txt 2023-01-27 22:52:08 +01:00
TabletopGeneral
7597dd6e4d Merge branch 'Card-Forge:master' into master 2023-01-27 16:42:41 -05:00
jjayers99
cd296818af DMU & BRO Jumpstart
Added Jumpstart packs for DMU & BRO.

Configured block data to be able to use them to play Sealed.

Revamped Adventure starter logic to use packs rather than specific sheets to support use of these packs and any others that have random contents - Added ability to select Jumpstart source to use for Standard Adventure deck creation.
2023-01-27 16:41:00 -05:00
Simisays
6f45450c94 Update blazing_crescendo.txt 2023-01-27 22:29:32 +01:00