ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,589 Commits 1 Branch 0 Tags
df88f905685a8ffff578ae671b96e57363b2f976
Commit Graph

8589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian 'ketura' McCarty
df88f90568 Merge branch 'master' into grand-card-rework 
# Conflicts:
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
 2024-10-30 19:55:04 -05:00
Christian McCarty
79ccf6cfa2 Merge pull request #120 from PhallenCassidy/patch-3 
Fix for Moon-letters
 2024-10-30 12:02:07 -05:00
PhallenCassidy
d13ec7c177 Fix for Moon-letters 
Choice effects were swapped, they now line up with the text as expected.
 2024-10-30 13:01:02 -04:00
Christian 'ketura' McCarty
e7b0818315 bad URL copy-paste 2024-10-29 21:49:12 -05:00
Christian 'ketura' McCarty
04f9219c83 2024 WC Promos 2024-10-29 21:45:42 -05:00
Christian 'ketura' McCarty
972d198cac helper db script updates 2024-10-28 22:25:40 -05:00
Christian 'ketura' McCarty
9eb03df677 Unlocking full art Greenleaf and unbranded Goblin Runner for the PC promo packs 2024-10-27 20:02:05 -05:00
Christian 'ketura' McCarty
1ef242549a Updating WC verbiage hack 2024-10-25 19:07:23 -05:00
Christian 'ketura' McCarty
f35970339b Updating WC table verbiage 2024-10-19 07:09:53 -05:00
Christian 'ketura' McCarty
f2d642e839 Merge branch 'master' into grand-card-rework 
# Conflicts:
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_338_Tests.java
 2024-10-18 08:09:57 -05:00
Christian 'ketura' McCarty
9e6ebda4ed Fleshing out RTIM test conclusion 2024-10-18 07:47:22 -05:00
Christian McCarty
4ae761e0ad Merge pull request #118 from MarcinSc/master 
Fixed issue with cards creating assignments during fierce skirmish
 2024-10-18 07:33:05 -05:00
Marcin Sciesinski
f4ce01fc12 Fixed issue with cards creating assignments 2024-10-18 13:32:04 +07:00
Marcin Sciesinski
13fe76fcb9 Fixed issue with cards creating assignments 2024-10-18 13:31:24 +07:00
Marcin Sciesinski
010401554f Fixed issue with cards creating assignments 2024-10-18 13:28:54 +07:00
Marcin Sciesinski
35ea56778a Fixed issue with cards creating assignments 2024-10-18 13:23:32 +07:00
Christian 'ketura' McCarty
6dda33292b Added unit tests to attempt and fix a bug with Return to its Master 2024-10-18 00:41:25 -05:00
Christian 'ketura' McCarty
66fa538dbc Updating WC Swiss rounds from 8 to 10 2024-10-18 00:37:18 -05:00
Christian 'ketura' McCarty
5505bd346e Fixed Ulaire Nertea causing Ford of Bruinen to apply its discount to all Nazgul played by Nertea's ability 2024-10-17 22:19:22 -05:00
Christian 'ketura' McCarty
2d4b5a11d3 Converting master fixes to grand card rework paradigms 2024-10-16 21:32:53 -05:00
Christian 'ketura' McCarty
5880534d91 Merge branch 'master' into grand-card-rework 
# Conflicts:
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_363_Tests.java
 2024-10-16 20:27:02 -05:00
Christian 'ketura' McCarty
7d065bd550 Fixing Glimpse of Fate PC errata being required instead of optional 2024-10-16 18:16:02 -05:00
Christian 'ketura' McCarty
be20092bc8 Fixing Nertea and Tol Brandir playing one more minion than the player asked for 2024-10-07 09:09:57 -05:00
Christian 'ketura' McCarty
d3bf3de7f0 Deleting card. 2024-09-29 22:30:28 -05:00
Christian 'ketura' McCarty
e5bc543cce Converting invitation to a tautological card instead of a card. 2024-09-29 22:29:44 -05:00
Christian 'ketura' McCarty
e20bf34fa0 Altered tournament rewards boosters to include far more PC promos more frequently. Added do-nothing promo "card" for the 2024 WC invitation. 2024-09-29 22:17:44 -05:00
Christian 'ketura' McCarty
fc067ce281 Adding unit tests for The Ruling Ring and Isildur's Bane 2024-09-26 00:20:41 -05:00
Christian 'ketura' McCarty
40ae63887f Unit tests for The Great Ring. 2024-09-25 23:15:03 -05:00
Christian 'ketura' McCarty
e670872a24 Added unit tests for Ring of Doom. Fixed RoD not being restricted to burden conversion during the skirmish phase. 2024-09-25 22:57:59 -05:00
Christian 'ketura' McCarty
340dc03698 Ring of Rings unit tests. Also fixing Ring of Rings reacting even if the ring was already worn. 2024-09-25 22:40:34 -05:00
Christian 'ketura' McCarty
0083a56e04 Unit tests for The Binding Ring 2024-09-25 19:45:37 -05:00
Christian 'ketura' McCarty
126da19762 Unit tests for Such a Weight to Carry. Tweaks to ATAR tests. 2024-09-25 17:55:02 -05:00
Christian 'ketura' McCarty
0f30e53b67 Adding unit tests for Answer to All Riddles. Fixed ATAR not restricting itself to the skirmish phase. 2024-09-25 13:28:20 -05:00
Christian 'ketura' McCarty
367898f7ab Fixed We Left None Alive putting raider tokens on itself instead of rohan 2024-09-24 17:26:56 -05:00
Christian 'ketura' McCarty
6ba1fe290e Fixed Pelennor Flat not triggering. More broadly, fixed all sorts of triggers which define a performing player who is not the card owner. 2024-09-24 17:19:19 -05:00
Christian 'ketura' McCarty
d2547c0f7b Fixed Barrows of Edoras not working. Also fixed PutCardsFromXonTop/BottomOfDeck not iterating properly in the choice window. 2024-09-24 11:59:19 -05:00
Christian 'ketura' McCarty
2dfc6d94c9 Spaces to tabs, because I'm evil 2024-09-24 11:37:40 -05:00
Christian 'ketura' McCarty
b673a9e08a Merge branch 'master' into grand-card-rework 2024-09-24 09:28:09 -05:00
Christian 'ketura' McCarty
6b2af8fa75 Sealed tournament fixes 
- Fixed sealed tournaments swallowing deck registration during the deck registration phase
- Removed the "all players have registered" short-circuit condition, so that players don't get rug-pulled if making last-minute adjustments
 2024-09-23 21:42:46 -05:00
Christian 'ketura' McCarty
429b4d092a Adding currently active sealed leagues/tournaments to the deck target format dropdown so that validation can be used. 2024-09-23 19:54:27 -05:00
Christian 'ketura' McCarty
1d39bf2811 Bug fixes 
- Fixed missing return value in deck stats causing a superfluous error in the log
- Fixed deck validation causing an error in PC-Movie if a Map was added before a RB or Ring
- Fixed leagues not permitting decks to be altered or tables to be created on the same day of a serie end
 2024-09-23 19:25:18 -05:00
Christian 'ketura' McCarty
04b3ca3111 Fixing merge issues converting between json code bases 2024-09-19 10:21:52 -05:00
Christian 'ketura' McCarty
6c52005d79 Merge branch 'feature/sealed-tourney' into grand-card-rework 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Moria-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Moria-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Ringwraith-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set02/Card_02_076_ErrataTests.java
#	gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_103_ErrataTests.java
 2024-09-19 09:55:00 -05:00
Christian 'ketura' McCarty
3d4fd507c8 Fixing date snafus that lead to sealed leagues double-issuing product if the league is joined before the start date 2024-09-19 09:43:51 -05:00
Christian 'ketura' McCarty
62a4567bf5 Fixed duplicate callout messages when changing stages in sealed tournaments. Fixed sealed tournaments not being made aware of deck registrations 2024-09-19 08:15:19 -05:00
Christian 'ketura' McCarty
eac9904a5c Tournament system overhaul 
- Added json parameters to the tournament and scheduled tournament databases
- Added support for sealed tournaments that issue cards at the start of the event, grant a deckbuilding period, and a short deck registration grace period before resuming tournament play as normal
- Added support for joining tournaments after they've started during certain eligible stages
 2024-09-19 00:57:11 -05:00
Christian 'ketura' McCarty
fa7e18889f Fixed Helpless revert still going to the support area 2024-09-15 11:34:17 -05:00
Christian 'ketura' McCarty
c46fdd3ae9 Errataing Ettenmoors for PC 2024-09-15 01:06:00 -05:00
Christian 'ketura' McCarty
703b9796f9 Fixing latest errata batch pointing to old images 2024-09-15 00:41:59 -05:00
Christian 'ketura' McCarty
4577d31861 2024 Post-FC Errata batch 
- 7 PC errata
- Importing IfEffect from the grand card rework
- Fixing Come Down errata not having proper syntax
 2024-09-15 00:31:38 -05:00