Commit Graph

8739 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
d962b90f5b New V2 Flood Insurance iteration. Altered V2 And The Red Dawn implementation to let freeps choose the order of discard. 2024-11-19 23:00:46 -06:00
Christian 'ketura' McCarty
eca4f9d9bd Adding The Weta Collection to PC-Movie 2024-11-17 14:01:28 -06:00
Christian 'ketura' McCarty
519278b83d Fixing V1 IWHGWYTOE, Merry errata, and Trust Me As You Once Did not enforcing a per-phase limit 2024-11-17 12:47:25 -06:00
Christian 'ketura' McCarty
5c80971714 Fixing unit test foiled by the choice change. Adding championship timer to the main hall. 2024-11-16 22:04:33 -06:00
Christian 'ketura' McCarty
83327dec8e Merge remote-tracking branch 'phallen/patch-1' into v2-cards
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html
Adjusted the above into an alteration for tournamentAdmin.html, where the relevant function was moved.
2024-11-16 21:59:23 -06:00
Christian 'ketura' McCarty
d5bc1492b9 Incorporating PR #121 from Phallen Cassidy: when neither branch of a choice can be fulfilled, resorts to having the player choose which to perform rather than performing neither. 2024-11-16 21:24:00 -06:00
Christian 'ketura' McCarty
126c282172 Somehow the most important file didn't get checked in 2024-11-16 20:53:31 -06:00
Christian 'ketura' McCarty
8d755b8726 PC Errata conversion button
- Added a new button in the deckbuilder that converts all cards currently in the deck to applicable PC errata.  It is disabled outside of PC formats (and Anything Goes) and enabled for a single usage otherwise.
- Optimized card filter a bit so it isn't calling the card collection quite so often during format switching
2024-11-16 20:45:12 -06:00
Christian 'ketura' McCarty
1d8f55c037 Added auto-hiding of all cultures, not just hobbit, so that fotr/movie/expanded eras hide the irrelevant cultures 2024-11-15 09:21:36 -06:00
Christian 'ketura' McCarty
493b8003e9 Fixed V1 Boromir image link being broken. Fixed V1 Aragorn not actually restricting the starting fellowship. 2024-11-15 08:16:51 -06:00
Christian 'ketura' McCarty
3c914b832e Updates
- Fixed PC errata not showing when a block or set filter was applied within PC formats in the deckbuilder
- Added V1 Boromir, Redeemed errata
- Updated Terrible as the Dawn errata to specify "discard another companion"
2024-11-14 23:15:43 -06:00
Christian 'ketura' McCarty
354af9a86d Fixing estel url 2024-11-14 10:58:11 -06:00
Christian 'ketura' McCarty
97ee1aedd9 Updated Estel errata 2024-11-14 10:21:13 -06:00
Christian 'ketura' McCarty
e5b869b44a Fixed play-from-deck actions not working. Fixed all flood insurance cards not properly removing themselves from the game after playing. 2024-11-14 09:53:43 -06:00
Christian 'ketura' McCarty
618bfe3973 V2 Trail of Savagery retooling 2024-11-13 21:46:16 -06:00
Christian 'ketura' McCarty
f2daf74322 Fixing phase dropdown not working in filter. Removing illegitimate "Horn" item class. 2024-11-13 16:47:32 -06:00
Christian 'ketura' McCarty
1095a46fb7 Forgot the card paths 2024-11-12 22:31:45 -06:00
Christian 'ketura' McCarty
0bbb852a89 New Errata Batch
- Cirdan and Greenleaf update
- Adding Fortification to Fortress Never Fallen
- Adding Valiant to the set 5 Legolas and Gimli
2024-11-12 20:44:24 -06:00
Christian 'ketura' McCarty
f096b0d4e1 Deckbuilder Format Overhaul
- Fleshed out deckbuilder format/block/set selection.  The deck format selection now filters what block/set will show up in the card filters in the right pane.
- Fixed Ring-bearer/One Ring filtering not working.  Further fleshed out Ring/Bearer interaction so that other filters may now be used.
2024-11-12 19:03:36 -06:00
Christian 'ketura' McCarty
17e779c33f Fixing Mordor Scimitar not exerting and also not being optional 2024-11-09 20:23:01 -06:00
Christian 'ketura' McCarty
c260f65ce6 Fixed Derurin's target filter. Fixed Shards of Narsil selection method. 2024-11-09 14:34:55 -06:00
Christian 'ketura' McCarty
4f3ca53b94 Fixing culture buttons getting disabled shen clicking on sites 2024-11-08 23:08:28 -06:00
Christian 'ketura' McCarty
e608b11625 Altered new deck tutoring setup to first only have the player select valid cards, then look at a list of all cards in the deck afterwards.
b
2024-11-08 22:43:24 -06:00
Christian 'ketura' McCarty
53036ca5dc Fixed cards that aren't attached meeting play trigger requirements, such as for Trollshaw Forest 2024-11-08 20:59:36 -06:00
Christian 'ketura' McCarty
b69097c4e5 Fixed set 8 Eomer and Faramir only playing 1 revealed card. Added Now For Wrath unit test. 2024-11-08 19:41:06 -06:00
Christian 'ketura' McCarty
408b0e7247 Discard trigger fixes
- Fixed Gnawing Biting Hacking Burning catching minions discarded at the end of the turn
- Fixed V2 Now For Wrath not catching cards discarded from hand or deck
2024-11-08 18:49:35 -06:00
Christian 'ketura' McCarty
7994c9ba71 Fixing missing trigger alterations. 2024-11-08 18:06:57 -06:00
Christian 'ketura' McCarty
5a0909ebae Replacing spaces with tabs due to the spaces defeating a mass replace regex 2024-11-08 17:47:15 -06:00
Christian 'ketura' McCarty
64a3eb823b Updated Trigger definitions so that the optional field is now required 2024-11-08 17:34:02 -06:00
Christian 'ketura' McCarty
45161fb0ed Assignment fixes and others
- (Hopefully) Fixed forced assignment actions causing an incorrect message about too many assigned minions that soft-locks the game
- Syntax fix for previous Siege Engine fix
- Fixed Sam and Merry errata not being properly limited to once per turn
- Fixed a front-end error related to the card display rework
2024-11-08 16:47:58 -06:00
Christian 'ketura' McCarty
9f0afffc9b Fixing some title/game text searches not working properly. 2024-11-08 12:08:09 -06:00
Christian 'ketura' McCarty
1f68e95fb2 Fixed Siege Engine putting tokens on only itself instead of any machine 2024-11-08 10:53:24 -06:00
Christian 'ketura' McCarty
4569a9d423 GCR Card Fixes
- Fixed V2 Theoden counting himself
- Fixed V2 Isengard Foreman being required instead of optional
- Fixed House of Elrond being required instead of optional
- Fixed Catapult discarding from hand instead of from play
- Fixed Citadel of Minas Tirith working on non-gondor companions
- Fixed Drawing His Eye discarding all revealed cards instead of making the player choose one
- Added script for upgrading the old maps to V2 maps
2024-11-08 10:46:16 -06:00
Christian 'ketura' McCarty
bd222d30d3 Fixing multiple filter calls when clearing the filters 2024-11-07 23:50:45 -06:00
Christian 'ketura' McCarty
d746ef5981 fixing CSS reference 2024-11-07 23:18:12 -06:00
Christian 'ketura' McCarty
a4d33c0228 Game Text support
- Added support for properly parsing the CardInfo section of card definitions
- Added support for game text in card definitions
- Added game text to the card info right-click window
- Added support for game text filtering in the deckbuilder
- Removed truly awful tengwar hack (as that information is now on every card)
- adding missed db file from merge
- Converted the card info section of every card to a cut-down version with sane defaults
2024-11-07 22:54:34 -06:00
Christian 'ketura' McCarty
f8ad13a546 Merge branch 'v2-cards' into feature/autozoom
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
#	gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Names.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/packs/SetDefinition.java
#	gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
2024-11-05 12:28:50 -06:00
Christian 'ketura' McCarty
526b5ede93 Fixed Strength of Arms not self-discarding 2024-11-04 20:20:14 -06:00
Christian 'ketura' McCarty
ed5059b198 Fixing horizontal cards in the renumbered V2 2024-11-04 19:23:46 -06:00
Christian 'ketura' McCarty
ed00175984 Fixing bad URLs 2024-11-04 18:30:44 -06:00
Christian 'ketura' McCarty
581592813f Updating V2 URLs for renumbering 2024-11-04 18:15:23 -06:00
Christian 'ketura' McCarty
2cfd477ea8 Added V2 Flood Insurance cards
- added self selector to PlayCardFromDrawDeck
2024-11-04 18:15:22 -06:00
Christian 'ketura' McCarty
59122c9bd3 Shoving all V2 unit tests onto the new numbering 2024-11-04 18:15:22 -06:00
Christian 'ketura' McCarty
bce7b647f3 Renumbering all of V2 2024-11-04 18:15:21 -06:00
Christian 'ketura' McCarty
8cae3615f2 V2 Breached Wall implementation
- Altering all cards that "spot a site you control" and similar to use the count-alteration-aware ControlsSite instead of spotting (except in the case where it's checking for the existence of a literal site, such as in preparation for stacking on a controlled site)
- Altering all cards providing a bonus "for each site you control" to use forEachSiteYouControl instead of forEachYouCanSpot
- Altered existing ControlsSite and OpponentDoesNotControlSite to incorporate site control count modifiers
2024-11-04 11:06:10 -06:00
Christian 'ketura' McCarty
1e04a80cf7 Shoving V1 to use the modern hjson definition style with game text 2024-11-04 08:41:57 -06:00
Christian 'ketura' McCarty
edc21584ef Shoved sets 1, 2, 3, 4, 9, 14, 16, and 19 to using the new hjson template style with game text. Also did some mass cleanup on lore. 2024-11-04 01:31:00 -06:00
Christian 'ketura' McCarty
eb5a21620b More whitespace 2024-11-03 21:59:26 -06:00
Christian 'ketura' McCarty
79ddaf1f5d whitespace alteration to make it easier to parse for a one-off game text script 2024-11-03 21:00:50 -06:00
Christian 'ketura' McCarty
baee767552 Fixed Mablung not being restricted to roaming minion 2024-11-02 18:57:24 -05:00