Commit Graph

8495 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
c98eceda58 Added generated unit tests, including active stat tests for all of V2. Edited generated hjson to pass these basic tests. 2024-04-25 22:01:09 -05:00
Christian 'ketura' McCarty
48cf234ab5 Renaming V2 hjson 2024-04-25 21:20:44 -05:00
Christian 'ketura' McCarty
e8f1a0a453 Regenerating hjson for V2 2024-04-25 21:19:09 -05:00
Christian 'ketura' McCarty
3825d2fcfb Merge branch 'master' into v2-cards 2024-04-25 19:54:25 -05:00
Christian 'ketura' McCarty
c0d85c4427 Fixing card image reference snafus with the Barlimen/Elronds errata. 2024-04-24 22:00:50 -05:00
Christian 'ketura' McCarty
4c290e8470 Fixing card image reference snafus with the Barlimen/Elronds errata. 2024-04-24 21:58:38 -05:00
Christian 'ketura' McCarty
9d96c056d3 Merge branch 'master' into grand-card-rework. Had to manually merge the yuletide errata changes.
# Conflicts:
#	gemp-lotr/docker/docker-compose.yml
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-elven.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/errata/yuletide/set01-Gandalf-errata-playtest.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gondor-errata-playtest.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set03-Sauron-errata-playtest.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set08-Raider-errata-playtest.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Isengard-errata-playtest.hjson
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
2024-04-24 21:23:42 -05:00
Christian 'ketura' McCarty
3b74de7f9b Fixing json capitalization in league admin page 2024-04-24 01:02:09 -05:00
MarcinSc
4eb1877eeb Migrated Dwarven cards in set 7 to hjson 2024-04-23 12:46:08 +07:00
MarcinSc
ad3c70b2a4 Migrated Ring cards in set 7 to hjson 2024-04-23 12:12:51 +07:00
Christian 'ketura' McCarty
d4cc5c0085 Fixing the wrong replay binding getting removed from the docker compose a year ago 2024-04-22 22:23:44 -05:00
Christian 'ketura' McCarty
b32a9ad123 Fixing deck sharing feature double-applying navigation prefix 2024-04-22 19:49:14 -05:00
Christian 'ketura' McCarty
32b93a5761 Fixed pre-game panel showing in the distant background when reconnecting after the game starts 2024-04-22 19:44:59 -05:00
Christian 'ketura' McCarty
0b8d462894 Fixing the Weta Collection not being legal in WOTR Standard 2024-04-22 19:38:32 -05:00
Christian 'ketura' McCarty
8320f8bb62 Removing debugger statements 2024-04-22 19:33:40 -05:00
Christian 'ketura' McCarty
7b053ff747 Fixing broken server info post-json-upgrade 2024-04-22 19:32:46 -05:00
MarcinSc
f4a1c6c97d Migrated Site cards in set 6 to hjson 2024-04-23 00:17:28 +07:00
MarcinSc
7778643846 Migrated Site cards in set 6 to hjson 2024-04-23 00:05:41 +07:00
MarcinSc
43a16b8a1d Migrated Shire cards in set 6 to hjson 2024-04-22 23:57:56 +07:00
MarcinSc
00c0f59465 Migrated Sauron cards in set 6 to hjson 2024-04-22 23:39:44 +07:00
MarcinSc
e41842d94c Migrated Rohan cards in set 6 to hjson 2024-04-22 23:18:48 +07:00
MarcinSc
9eaa6d0d51 Migrated Ringwraith cards in set 6 to hjson 2024-04-22 22:59:10 +07:00
MarcinSc
1cf74b3f6e Migrated Raider cards in set 6 to hjson 2024-04-22 22:41:42 +07:00
MarcinSc
20a2c14f7a Migrated Moria cards in set 6 to hjson 2024-04-22 22:33:49 +07:00
MarcinSc
84e7b73592 Migrated Isengard cards in set 6 to hjson 2024-04-22 22:24:49 +07:00
MarcinSc
a1ec82ac27 Migrated Gondor cards in set 6 to hjson 2024-04-22 18:27:35 +07:00
MarcinSc
1459592b70 Migrated Gollum cards in set 6 to hjson 2024-04-22 16:22:33 +07:00
MarcinSc
1bc25f6d94 Migrated Gandalf cards in set 6 to hjson 2024-04-22 15:59:34 +07:00
MarcinSc
4f43220f17 Migrated Elven cards in set 6 to hjson 2024-04-22 14:41:53 +07:00
Christian 'ketura' McCarty
7f9195a5df Fixing more strict json errors 2024-04-22 02:23:27 -05:00
Christian 'ketura' McCarty
1bb32eb774 Fixing fastJson case-sensitive parsing striking again 2024-04-22 02:15:38 -05:00
MarcinSc
dcd758d768 Migrated Dwarven cards in set 6 to hjson 2024-04-22 14:15:12 +07:00
MarcinSc
887b723faf Migrated Dunland cards in set 6 to hjson 2024-04-22 13:50:04 +07:00
Christian 'ketura' McCarty
b954c86113 temporarily disabling failing tests 2024-04-22 01:08:27 -05:00
MarcinSc
4b6ebc8a68 Migrated Site cards in set 5 to hjson 2024-04-22 13:00:36 +07:00
MarcinSc
2082cc5b2d Migrated Shire cards in set 5 to hjson 2024-04-22 12:54:27 +07:00
Christian 'ketura' McCarty
963851af11 Promoting yuletide playtest cards in js 2024-04-22 00:50:32 -05:00
MarcinSc
1ba44e294d Migrated Sauron cards in set 5 to hjson 2024-04-22 12:45:24 +07:00
Christian 'ketura' McCarty
01e65e2373 Fixing various unit test failures 2024-04-22 00:25:05 -05:00
MarcinSc
846e68f1e7 Migrated Rohan cards in set 5 to hjson 2024-04-22 12:11:14 +07:00
MarcinSc
94f2bdae47 Migrated Raider cards in set 5 to hjson 2024-04-22 11:44:49 +07:00
MarcinSc
c0cda4eec7 Migrated Isengard cards in set 5 to hjson 2024-04-22 11:25:10 +07:00
Christian 'ketura' McCarty
da06287c68 Promoting Yuletide errata (finally). 2024-04-21 17:09:30 -05:00
Christian 'ketura' McCarty
14eb9425bb Mass wiping some redundant comments from the corpus of hjson card files. 2024-04-21 16:42:37 -05:00
Christian 'ketura' McCarty
ba10e786c9 Adding new pre-game info screen + full Map card functionality for PC multipath formats
- Adding new screen during bidding that reminds players of the current settings, to be courteous, and to concede.
- Pre-game screen shows the player's deck, deck notes, and links to the deck so players can refresh their memory
- Moved deck sharing URL generation to the LotroDeck, so that it can be used within the pre-game screen
- Maps are shown during the pre-game screen if the format uses them
- Altered the game process so that the first step primes the pre-game screen info
- Added playing of both player's Map cards before the first site is placed down.
2024-04-21 14:19:41 -05:00
MarcinSc
803e0e6470 Migrated Gondor cards in set 5 to hjson 2024-04-22 00:54:03 +07:00
MarcinSc
e681d4394d Migrated Gollum cards in set 5 to hjson 2024-04-22 00:07:37 +07:00
MarcinSc
f0f57cdf1a Migrated Gandalf cards in set 5 to hjson 2024-04-21 23:41:43 +07:00
MarcinSc
5342feff9b Migrated Elven cards in set 5 to hjson 2024-04-21 23:28:51 +07:00
MarcinSc
b75e975092 Migrated Dunland cards in set 5 to hjson 2024-04-21 23:18:27 +07:00