Commit Graph

8934 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
947c2d3266 Fixing V2 Eastement Hills discarding from play and not from hand 2024-10-16 20:29:18 -05:00
Christian 'ketura' McCarty
5620ed6ff9 Merge branch 'grand-card-rework' into v2-cards 2024-10-16 20:27:23 -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
Marcin Sciesinski
0cd76e2cb7 Added more ATs 2024-10-17 03:07:01 +07:00
Marcin Sciesinski
06c7db4a6b Added more ATs 2024-10-17 02:31:53 +07:00
Marcin Sciesinski
5400954588 Added more ATs 2024-10-17 01:49:26 +07:00
Marcin Sciesinski
5a32d8d20b Added more ATs 2024-10-16 20:15:01 +07:00
Marcin Sciesinski
13de59179b Added more ATs 2024-10-16 19:11:38 +07:00
Christian 'ketura' McCarty
79d8788353 Importing card display rework from SWCCG - Deckbuilder
- the /cards/Card*.js files are all fresh rewrites of jCards and jGroups using a more object-oriented approach.  This was primarily due to the hover over polish, but is also intended to take over all card display code so they can be displayed + grouped in a sane manner using flexboxes and css instead of absolute positioning and manual math everywhere.
- Completely overhauled SortAndFilterCards to import stat-based filters from SWCCG (and to kill that enormous arrowhead if-pyramid)
- Overhauled deckbuilder to use the new card display code.  Also took opportunity to add advanced filtering and improve filter layout>
- Replaced culture icons in the deckbuilder to use SVGs for non-hobbit cultures
- Moved wiki advanced search link away from the top where it is frequently accidentally clicked
- Reduced number of default cards from 18 to 12 to match the reduced space
- Improved dark mode for all controls in the deckbuilder
2024-10-15 01:18:39 -05:00
Marcin Sciesinski
7507fc860d Added tests for discounts and assignment costs 2024-10-15 00:03:58 +07:00
Christian 'ketura' McCarty
f8e58924a9 Archived set 40. Fixed about half the generic unit tests that happened to use set 40 for testing, and commented out the rest (some were obviously just individual card tests, some were not, but all were annoying) 2024-10-08 23:22:11 -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
626d8d5583 Fixing V2 Balrog threat trigger not being optional 2024-09-27 14:32:29 -05:00
Christian 'ketura' McCarty
8a483c4427 V2 Card title typo 2024-09-27 13:49:35 -05:00
Christian 'ketura' McCarty
74ff66cda1 V2 balance patch 2024-09-27 13:41:53 -05:00
Christian 'ketura' McCarty
42cfae8834 V2 fixes
- Fixed Lorien Swordsman V2 Errata using the wrong filter
- Fixed V2 Ancient Evil not being optional
- Fixed V2 Ancient Evil not self-discarding upon using the ability
2024-09-27 07:51:34 -05:00
Christian 'ketura' McCarty
5d87ad458e Merge branch 'grand-card-rework' into v2-cards 2024-09-26 00:20:53 -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
90502167db Fixing V2 Isengard Grunt not having a defined home site 2024-09-25 11:07:01 -05:00
Christian 'ketura' McCarty
4e2b3f3b6e Fixed Through Fire And Water being required, also fixed it triggering with 0 threats 2024-09-24 18:56:22 -05:00
Christian 'ketura' McCarty
21d0b8a339 Fixed Uruk Prowler not being optional 2024-09-24 18:47:58 -05:00
Christian 'ketura' McCarty
b0d4792730 Fixed And The Red Dawn reversing the freeps/shadow effects. Added copious unit tests for this card. 2024-09-24 18:45:50 -05:00
Christian 'ketura' McCarty
cb383ebb4e Fixing Wolf Pit unit tests. Fixing player resolver refactor in V2-specific triggers 2024-09-24 17:34:05 -05:00
Christian 'ketura' McCarty
79703118ee Fixing Wolf Pit being required instead of optional 2024-09-24 17:30:04 -05:00
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