Commit Graph

7238 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
5e643e59e0 merging gemp improvements branch into card-dev 2021-02-06 20:11:31 -06:00
Christian 'ketura' McCarty
166ba64228 Converting all errata images to jpg and replacing their images with output from the PC card generator. Edited the errata image javascript to read all images from the dictionary instead of just pngs. 2021-02-06 20:08:24 -06:00
Christian 'ketura' McCarty
7ba8203fa6 Adding new PC keywords Concealed and Exposed, with associated rules and unit tests. Adding new PC race Warg. Adding new PC possession type Pony. 2021-02-06 19:11:09 -06:00
Christian 'ketura' McCarty
6465cbfb35 Updated PreventWound to permit memorizing of the unit that had its wound prevented. Updated RevealCardsFromHand to permit targeting either player. Added CantBeAssignedToSkirmish modifier (mostly for Saruman's sake). 2021-02-06 19:06:41 -06:00
Christian 'ketura' McCarty
dadd6c4479 Added new filters for picking allies in a given region, or the fellowship's current region. Altered blueprint ally home definition to support multiple home sites. 2021-02-06 19:02:20 -06:00
Christian 'ketura' McCarty
246e4a6274 Fixing typos in messages. 2021-02-06 18:57:44 -06:00
Christian 'ketura' McCarty
998acd4888 Added some package namespaces for less haphazard individual card testing. Added GenericCardTestHelper, which is intended to be used to make unit tests less obscure. Altered the default AbstractAtTest format to multipath instead of movie. 2021-02-06 18:54:34 -06:00
Christian 'ketura' McCarty
da7da8b8b6 Fixing some server crashes caused by malformed json card definitions. 2021-02-06 18:52:39 -06:00
Christian 'ketura' McCarty
a23d2ae7d1 log4j fixes that prevent constant log spam and actually pipes the output of log errors to file 2021-02-06 18:44:08 -06:00
Christian 'ketura' McCarty
09f7cf4851 Introduced Docker, which permits an instance of gemp to be rolled out with a minimum of environmental setup. Readme includes instructions on how to use it. 2021-02-06 18:36:58 -06:00
Christian 'ketura' McCarty
c29c28814c Updates to Gimli and Aragorn errata 2021-02-06 15:49:56 -06:00
Christian 'ketura' McCarty
af642546e7 Bill The Pony Errata
Added Bill the Pony errata and unit tests.  Added the Pony possession class.
2021-02-06 15:19:09 -06:00
Christian 'ketura' McCarty
24b373a3c1 HttWC Errata and Test Overhaul
Added Aragorn, Heir to the White City errata and associated tests.  Rearranged all errata tests to be in folders corresponding to their set of origin.  Added some unit tests for existing cards which were used while debugging multiple choice functionality.
2021-02-06 13:34:59 -06:00
Christian 'ketura' McCarty
23e5e21fc7 Preliminary commit for HttWC, which appears to be inconsistent in unit tests but may work in a regular game 2021-02-05 08:32:34 -06:00
Christian 'ketura' McCarty
2ec67d6858 Updated RevealCardsFromHand and typos
Updated RevealCardsFromHand to be player agnostic. The "hand" option now specifies which player to use (instead of defaulting always to self).  Fixed typo in Error message of MultipleChoiceAwaitingDecision.
2021-02-05 08:31:32 -06:00
Christian 'ketura' McCarty
c2b855cf7b Fixing typo and what appears to be a copy-paste error with the remove keyword prompt having the same text as add keyword. 2021-02-04 00:24:26 -06:00
Christian 'ketura' McCarty
169aa49dd2 Adding Gimli, Dwarf of the Mountain-race errata / tests 2021-02-03 23:21:47 -06:00
Christian 'ketura' McCarty
fa39f01564 Backup of the current server set 21 json 2021-02-03 21:19:09 -06:00
Christian 'ketura' McCarty
da93ab9bca Checking in fix for PC formats that was floating on the server 2021-02-03 21:17:55 -06:00
Christian 'ketura' McCarty
2fd2726e4a Talent For Not Being Seen Errata and tests 2021-02-03 21:13:59 -06:00
Christian 'ketura' McCarty
65d40dd1d6 Sting Errata. Exposed testing fleshed out.
Introduced Sting errata and unit tests.  Pulled out the concealed/exposed specific parts of the No Stranger tests and put them in their own place, replacing the No Stranger tests with ones that are more specific to that card.
2021-02-03 18:43:23 -06:00
Christian 'ketura' McCarty
01e10c574d Concealed work, No Stranger to the Shadows errata.
Concealed and Exposed keywords added.  No Stranger errata added.  Unit test for No Stranger added; it also puts the two keywords through its paces.
2021-02-03 01:08:15 -06:00
Christian 'ketura' McCarty
9ebd3dc6fa Including missed image info for Saruman, KoI and missing rarity info 2021-02-02 23:14:13 -06:00
Christian 'ketura' McCarty
c71ac3a2cc Saruman, Keeper of Isengard errata and associated changes
Added Saruman, KoI errata.  Added CantBeAssignedToSkirmish to the blueprint json loading.  Edited the PreventWound effect to support the Memorize directive (so saruman could remember the blocked uruk's id and make it fierce). Revamped the unit tests to support playing cards and using actions based on a card reference rather than a hard-coded string.  Edited existing unit tests to use the new functionality.
2021-02-02 23:09:40 -06:00
Christian 'ketura' McCarty
b60b2b2df8 Improved blueprint json parsing to support multiple home sites on allies. 2021-01-31 21:49:47 -06:00
Christian 'ketura' McCarty
01c6b90a30 Added additional generic Exception catch clause to ensure that unexpected parsing errors do not cause the entire server to crash. 2021-01-31 20:38:16 -06:00
marcin.sciesinski
939597da71 Getting rid of possible NPE 2021-01-30 08:26:25 -08:00
Christian 'ketura' McCarty
247460c5bb Added missing card image link 2021-01-30 03:42:25 -06:00
Christian 'ketura' McCarty
31d65e0683 AllyRegion filter added for Horn of Boromir errata
Added errata'd Horn of Boromir and unit tests.  Added new "AllyInCurrentRegion" and "AllyInRegion" filters to facilitate it.  Refactored base of PC card unit tests to be a bit easier to customize card lists.
2021-01-30 03:34:46 -06:00
Christian 'ketura' McCarty
87b27551b2 Adding phase 1 errata candidates with unit tests 2021-01-28 23:09:02 -06:00
Christian 'ketura' McCarty
80e6556601 Fixed elrond errata forcing 2 allies instead of 'up to 2' 2021-01-26 22:04:27 -06:00
Christian 'ketura' McCarty
67952b9e86 Fixing subfolder log directories getting watched by git 2021-01-26 21:44:03 -06:00
Christian 'ketura' McCarty
a6a7e36063 Including placeholder for the default logs location 2021-01-26 21:43:24 -06:00
Christian 'ketura' McCarty
8439ebbb77 Docker Update
Fixed net naming schema for hopefully the last time.  Added a log file binding so that gemp logs can be accessed outside the container.
2021-01-26 21:19:44 -06:00
Christian 'ketura' McCarty
3ae4c3f6a3 Fixing minor errors in previous commit 2021-01-26 21:16:21 -06:00
Christian 'ketura' McCarty
fcac24c02d log4j fixes
Renamed and moved the log4j xml to the proper location in gemp-lotr-server to be found on startup.  Added the log folder to gitignore.  Put references to log4j in all project pom.xml files.
2021-01-26 20:33:22 -06:00
Christian 'ketura' McCarty
167ff78801 Code reformat
Reformatted new unit tests to follow existing java style.  Fleshed out existing helper functions to have shadow variants where any freeps variants existed.
2021-01-26 01:11:02 -06:00
Christian 'ketura' McCarty
2a08b6c063 Set up individual card unit testing
Added GenericCardTest, a helper class that extends AbstractAtTest with a focus on easily and clearly setting up unit tests for testing the implementation of card game text.  Set up the PC errata for Elrond, Lord of Rivendell as a proof of concept.
2021-01-26 00:47:46 -06:00
Christian 'ketura' McCarty
ef901ca907 FOTR Errata
Added all set 1 errata and a couple set 2 errata.  Hooked up the images and rarities.
2021-01-24 11:05:22 -06:00
Christian 'ketura' McCarty
a5987b1a70 Fixing missing rarities for errata test 2021-01-22 12:41:10 -06:00
Christian 'ketura' McCarty
6ed561b89a Fixing server crash when a rarity is not provided for a card 2021-01-22 12:40:51 -06:00
Christian 'ketura' McCarty
68d35845dc Merge branch 'master' into card-dev 2021-01-22 03:22:26 -06:00
Christian 'ketura' McCarty
ad9ac42b91 Merge remote-tracking branch 'marcin/master' 2021-01-22 03:22:05 -06:00
Christian 'ketura' McCarty
15646a9cf7 Testing concealed inclusion 2021-01-22 02:05:14 -06:00
marcin.sciesinski
7669779bb5 Fixed all reported issues 2021-01-19 14:13:25 -08:00
marcin.sciesinski
ca5a95daae Added LiberaPay donations and removed the Covid theme 2021-01-16 13:37:13 -08:00
marcin.sciesinski
7bb28ec721 Consolidating card resolving 2021-01-16 13:21:40 -08:00
marcin.sciesinski
601b3c4764 Consolidating card resolving 2021-01-16 13:14:34 -08:00
marcin.sciesinski
0b21422f0e Consolidating self resolving 2021-01-16 12:34:10 -08:00
marcin.sciesinski
735dafce14 Consolidating memory resolving 2021-01-16 12:25:22 -08:00