Christian 'ketura' McCarty
484b836302
Merge branch 'grand-card-rework' into v2-cards
2024-09-24 17:27:05 -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
66faeb898a
Merge branch 'grand-card-rework' into v2-cards
2024-09-24 17:20:11 -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
8afafa197e
Let This Be The Hour unit tests
2024-09-24 10:12:22 -05:00
Christian 'ketura' McCarty
73ee3db4f5
Merge branch 'grand-card-rework' into v2-cards
2024-09-24 09:28:32 -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
307a74ad3c
comma in merge
2024-09-19 12:10:20 -05:00
Christian 'ketura' McCarty
026c20aaa3
Merge branch 'grand-card-rework' into v2-cards
...
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
2024-09-19 10:24:06 -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
Christian 'ketura' McCarty
6032d3a47a
Fixed Blood Runs Chill for real this time
2024-09-14 23:47:34 -05:00
Christian 'ketura' McCarty
1194f2b902
Fixing PC errata for Come Down not discarding the fortification
2024-09-14 16:05:36 -05:00
Christian 'ketura' McCarty
c793d072b4
Adding FA Greenleaf. Adding unbranded Goblin Runner FA, as well as placeholders for both of them in the PC packs to be released after the 2024 WC
2024-09-14 13:01:23 -05:00
Christian 'ketura' McCarty
1c62c52c3d
Fixing display hack for the walk-ons
2024-09-14 12:16:06 -05:00
Christian 'ketura' McCarty
79a57eaac1
Merge branch 'grand-card-rework' into v2-cards
2024-09-11 22:28:08 -05:00
Christian 'ketura' McCarty
6f20bd558f
Fixing Hides not permitting self-discard. Fixing Blood Runs Chill discarding from hand instead of in play.
2024-09-11 22:27:54 -05:00
Christian 'ketura' McCarty
ecaa818b40
Merge branch 'grand-card-rework' into v2-cards
2024-09-11 22:05:37 -05:00
Christian 'ketura' McCarty
3fd1a8e5fd
Fixing crashes from cards with a limit-one-per-character clause
2024-09-11 22:05:24 -05:00
Christian 'ketura' McCarty
c5b9ab645d
Fixing Deadly Contest not adding the bonus tokens for spotting both Legolas and Gimli
2024-09-11 22:04:09 -05:00
Christian 'ketura' McCarty
2dcc1f6056
Fixed To Highest Peak failing if there are no moria minions to discard.
2024-09-11 21:55:20 -05:00
Christian 'ketura' McCarty
8e42f88e24
Merge branch 'grand-card-rework' into v2-cards
2024-09-11 21:19:12 -05:00
Christian 'ketura' McCarty
63659541fd
Fixed cards with abilities that activate while stacked crashing the game if using certain filters. Added unit tests for Uruk Veteran and Uruk Trooper.
2024-09-11 20:49:50 -05:00
Christian 'ketura' McCarty
5c26c2aa8a
V2 balance update.
2024-09-07 18:08:05 -05:00
Christian 'ketura' McCarty
ec1fccbb80
Fixed From Deepest Dungeon crashing at the start of the Shadow phase
2024-09-07 16:52:14 -05:00
Christian 'ketura' McCarty
eded4f57f0
Fixing merge
2024-09-07 16:30:13 -05:00
Christian 'ketura' McCarty
cc18a8a795
Merge branch 'grand-card-rework' into v2-cards
...
# Conflicts:
# gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDiscard.java
2024-09-07 16:29:55 -05:00
Christian 'ketura' McCarty
e2110fa746
Play from discard with variable discount fixes
...
- Added MaxDiscount field to PlayFromDiscard, which is used while calculating candidates
- Fixed Black Sails of Umbar crashing in several places
- Added unit tests for Black Sails
2024-09-07 16:28:03 -05:00
Christian 'ketura' McCarty
97bf47a8bf
Fixing Naith Armaments targeting bearer. Hopefully fixing Let This Be The Hour not applying strength value.
2024-09-07 00:18:09 -05:00
Christian 'ketura' McCarty
be373aaa6f
Fixing test error
2024-09-06 23:49:56 -05:00
Christian 'ketura' McCarty
08ac45dc6f
Fixed Wolf-pit's Shadow ability not activating. Added unit tests for Wolf-pit
2024-09-06 23:20:38 -05:00
Christian 'ketura' McCarty
a7e9fa03ca
Merge branch 'master' into v2-cards
...
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
# gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
# 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/setV01/V1_shire.hjson
2024-09-06 18:16:07 -05:00
Christian 'ketura' McCarty
b7954e226d
Missed pom commit
2024-08-30 22:21:35 -05:00
Christian 'ketura' McCarty
a27394b576
Tournament admin panel + fixes
...
- Reworked tournament lifecycle so that DefaultTournament is able to refresh its definitions from the database rather than requiring it be destroyed and recreated.
- Refactored tournament service functions to use "record" and "retrieve" to label functions that are strictly wrappers to the database.
- Fixed server cache clear causing in-progress tournaments to duplicate their active tables.
- Fixed Paused tournament status not actually working due to above issues.
- Added admin panel forms for creating Scheduled Tournaments and altering the current status of a given tournament.
- Fixed league opponent win % stat not being set.
2024-08-30 22:04:55 -05:00
Christian 'ketura' McCarty
5cd095a585
sql script updates, docker comment
2024-08-30 08:04:33 -05:00
MarcinSc
43e72f204c
Tournament game results are now reported to an instance of Tournament from TournamentService, which might be different than the initial one.
2024-08-29 18:43:04 +07:00
MarcinSc
0b79c44806
Moved the creation of games and broadcasting outside of tournament lock to prevent theoretical deadlocks. These actions are now made through a list of actions returned from tournament advance method.
2024-08-28 22:59:33 +07:00
MarcinSc
cc4677aca6
Moved the creation of games and broadcasting outside of tournament lock to prevent theoretical deadlocks. These actions are now made through a list of actions returned from tournament advance method.
2024-08-28 12:16:58 +07:00
