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
MarcinSc
aba90bdac9
Migrated Dunland cards in set 5 to hjson
2024-04-21 23:17:52 +07:00
MarcinSc
9f6533b363
Migrated Site cards in set 4 to hjson
2024-04-20 19:37:59 +07:00
MarcinSc
d6be0e053c
Migrated Site cards in set 4 to hjson
2024-04-20 19:32:40 +07:00
MarcinSc
e8b80e9607
Migrated Shire cards in set 4 to hjson
2024-04-20 18:31:06 +07:00
MarcinSc
56b88abcb5
Migrated Rohan cards in set 4 to hjson
2024-04-20 17:19:47 +07:00
MarcinSc
2c19c2e289
Migrated Rohan cards in set 4 to hjson
2024-04-20 17:19:29 +07:00
MarcinSc
23f581b114
Merge remote-tracking branch 'upstream/grand-card-rework' into Converting-set-4-to-hjson
2024-04-20 16:26:13 +07:00
Christian 'ketura' McCarty
203d4bb55d
Map cards now save and load and validate for pertinent formats
2024-04-20 02:59:27 -05:00
Christian 'ketura' McCarty
488f152c02
Added UI handling for new Map card section, which only shows for PC-Movie and PC-Movie playtest.
2024-04-19 09:13:33 -05:00
Christian 'ketura' McCarty
769f127225
Committing a half-finished rework of the deckbuilding UI to be completed later
2024-04-19 07:50:24 -05:00
Christian 'ketura' McCarty
ebeb5cb48b
Fixing logging not working for unit tests
2024-04-17 00:00:03 -05:00
Christian 'ketura' McCarty
e3d6633137
Upgrading Java from 17 -> 21 and upgrading all dependencies
...
- Updating all dependencies to their latest non-beta versions
(except for junit, as junit 5 is significantly different from junit4)
- Converted the log4j configuration as the XML format changed. Switched the rolling appenders to random access rolling appenders and turned on asynchronous logging, as this is supposed to be dramatically faster in all cases.
- Altered some DB POJO classes whose field names did not match exactly, as fastjson is now more strict about capitalization
- Altered JSON deserialization of arrays to use modern APIs which are much more readable
- Minor improvements to the Docker setup, including automatic working directory movement
2024-04-16 23:58:49 -05:00
MarcinSc
a543493cef
Migrated Raider cards in set 4 to hjson
2024-04-16 15:27:30 +07:00
Christian 'ketura' McCarty
befe8eb48a
Switched to using the google Guava reflection, which appears to work in maven just fine.
2024-04-16 02:30:52 -05:00
Christian 'ketura' McCarty
3a67c76afb
Version 1 of a rewritten Java class loader. Works in the IDE, but does not work in maven.
2024-04-16 02:09:52 -05:00
MarcinSc
29f52b00d9
Migrated Isengard cards in set 4 to hjson
2024-04-16 11:34:03 +07:00
Christian 'ketura' McCarty
a28af6b7b5
Adding temporary blueprint library loader, with a test battery to compare the output of the two for imminent development.
2024-04-15 22:48:04 -05:00
Christian 'ketura' McCarty
573270e7b6
Gametext loading in hjson cards, tweaks to card loading
...
- Added game text, lore, and promo text processors for hjson card loading
- Tweaked title hjson field loading to deprecate the * in titles for uniqueness
- Added an ID field to the base blueprint so that blueprint references are aware of what their own ID is
- Added population of the blueprint ID on creation for both hjson and java cards
- Fixed bad version of a dependency (was using a RC)
2024-04-15 22:45:43 -05:00
Christian 'ketura' McCarty
942a1698ab
Fixing set 4 hjson errors highlighted by unit tests
2024-04-15 02:05:13 -05:00
Christian 'ketura' McCarty
ffb1342aeb
Merge remote-tracking branch 'marcin/Converting-set-4-to-hjson' into grand-card-rework
...
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_051.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_065.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_076.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_077.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_078.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_086.java
# gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_125.java
# gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set04-Onering.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Elven.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set04/Card_04_001_Tests.java
2024-04-15 01:59:08 -05:00
Christian 'ketura' McCarty
d5a3691cb2
Altering json handling of numeric keywords; "keyword X" and "keyword+X" are now both valid
2024-04-15 01:53:52 -05:00
Christian 'ketura' McCarty
b891385e26
Cleaning up compilation issues
2024-04-15 01:49:34 -05:00
Christian 'ketura' McCarty
cac5eab4ed
What is hopefully the last unit test iteration for now
2024-04-15 01:33:10 -05:00
Christian 'ketura' McCarty
fcb5b5d12f
Adding missed response keywords
2024-04-15 01:03:10 -05:00
Christian 'ketura' McCarty
a97dfe7366
unit test regeneration to match the event keyword stuff
2024-04-15 00:55:25 -05:00
Christian 'ketura' McCarty
f2dc56d87f
Stub regeneration for better keyword detection on events
2024-04-15 00:52:27 -05:00
Christian 'ketura' McCarty
96d95f55e1
Additional unit test functions for rings
2024-04-15 00:15:22 -05:00
Christian 'ketura' McCarty
3ed7e15031
Regenerating and activating unit tests for set 18+19. Minor title tweaks.
2024-04-15 00:14:58 -05:00
Christian 'ketura' McCarty
9beab882a6
Regenerating and activating unit tests for set 16+17. Minor title tweaks.
2024-04-14 23:55:37 -05:00
