ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,816 Commits 1 Branch 0 Tags
5b765d4094f1757883ac2d3f7efc70c4ef25f5aa
Commit Graph

7816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian 'ketura' McCarty
15c71fa6f6 Fixed crow's exert to draw not being optional 2021-12-18 17:47:54 -06:00
Christian 'ketura' McCarty
2f2e9eecf2 Merge branch 'card-dev' 2021-12-18 17:21:47 -06:00
Christian 'ketura' McCarty
72f95745d3 Fixed RIT not being twilight. Fixed Bag End Study not triggering. 2021-12-18 17:15:12 -06:00
Christian 'ketura' McCarty
ae5b966fa9 fixing bad card id 2021-12-18 16:36:41 -06:00
Christian 'ketura' McCarty
b0c5b1ef95 Fixing non-https links to hobbit cards 2021-12-18 16:08:32 -06:00
Christian 'ketura' McCarty
b43ea2357b Finished up Ringwraith for set V1. Fixed Lament for Gandalf. 2021-12-18 15:53:00 -06:00
Christian 'ketura' McCarty
ad3badbdcb Adding comment warning about modifying the serialization function 2021-12-18 14:33:57 -06:00
Christian 'ketura' McCarty
01b53ff002 Moved the new set 33 serialization to the end to hopefully fix the broken trophies 2021-12-18 14:27:10 -06:00
Christian 'ketura' McCarty
7eeb56f434 Temporarily altered the set filters to included the playtest sets for the Yuletide leagues. Fixed image links not being zero filled. 2021-12-18 05:48:17 -06:00
Christian 'ketura' McCarty
00472760a6 Fixing typos in image names 2021-12-18 05:28:03 -06:00
Christian 'ketura' McCarty
e471bab001 Fixing duplicate image ids 2021-12-18 05:18:27 -06:00
Christian 'ketura' McCarty
1112a7225b Added Focus as a last-minute errata. Added all image files 2021-12-18 05:06:45 -06:00
Christian 'ketura' McCarty
033e7d3222 Finished Set V1 Isengard. Minor typos in other cards. 2021-12-18 03:51:02 -06:00
Christian 'ketura' McCarty
54daab6dcc Fixing Legolas, Moria Crossroads, and Nertea errata to all use latest json hooks 2021-12-18 01:54:50 -06:00
Christian 'ketura' McCarty
e35d30f514 Added CantCancelSkirmish modifier with appropriate handling, and hooked it into json. Added Activated trigger hooks for json. Added trigger hooks for freeps beginning assignments. 2021-12-18 01:53:29 -06:00
Christian 'ketura' McCarty
76c73f5420 Cleaned up site 3 and Would Have Gone to use existing json functions. Site 4 is going to require some elbow grease down the line. 2021-12-17 12:42:39 -06:00
Christian 'ketura' McCarty
ec1659ceb9 Merge branch 'master' into card-dev 2021-12-17 12:06:49 -06:00
Christian McCarty
0bf5819e71 Merge pull request #17 from PhallenCassidy/PC-Cards 
Gandalf, Gondor, Shire, and Sites for PC V1
 2021-12-17 12:05:55 -06:00
Phallen Cassidy
5b07200f07 Cards for PC set V1 2021-12-17 09:43:35 -05:00
Christian 'ketura' McCarty
4b47cf35ed Added in the Sauron VSet1 cards, courtesy of LStephens. Added event handling and trigger for taking off the Ring. 2021-12-17 03:14:57 -06:00
Christian 'ketura' McCarty
4550d52b4d Completed first draft of holiday errata 2021-12-17 02:12:18 -06:00
Christian 'ketura' McCarty
2690b9e801 Added additional league format options for playtest formats 2021-12-17 00:34:25 -06:00
Christian 'ketura' McCarty
06f043ba4a Finished about two-thirds of the 2021 Holiday Errata 2021-12-17 00:30:59 -06:00
Christian 'ketura' McCarty
d73ac0cee3 Added an optional digital-only secondary ability that asks freeps how many times to repeat the action (to permit deck discard without slowing down the game) 2021-12-17 00:30:27 -06:00
Christian 'ketura' McCarty
3de00495a5 Altered Beneath the Mountains and Ever My Heart Rises to offer a hidden second ability that allows for the user to choose how many times to repeat the action to no effect, to reduce NPE when playing deck-discard strategies. 2021-12-16 01:40:57 -06:00
Christian 'ketura' McCarty
a4b04132d5 Merge branch 'master' into card-dev 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java
 2021-12-16 00:47:11 -06:00
Christian 'ketura' McCarty
7dae6311cc fixing typo 2021-12-16 00:38:33 -06:00
Christian McCarty
19de951c68 Merge pull request #15 from PhallenCassidy/master 
Last Hobbit Draft Game expansion + various card bugfixes
 2021-12-16 00:37:55 -06:00
Christian McCarty
75297810cf Merge pull request #16 from PhallenCassidy/gameHall 
Minor changes to game hall
 2021-12-16 00:29:10 -06:00
PhallenCassidy
7e4c785afb Added race for The Hobbit's Gwaihir and Beorn 
Last two holdouts
 2021-12-15 10:40:21 -05:00
Phallen Cassidy
d325448402 Minor changes to game hall 2021-12-07 15:22:18 -05:00
PhallenCassidy
aad72b0d84 Allowing last Hobbit expansion in collections 
So that the Hobbit Draft Game cards can actually be used in the draft.
 2021-12-06 14:36:01 -05:00
Phallen Cassidy
11df26ab2e Fixed Jails 2021-12-06 13:11:11 -05:00
Phallen Cassidy
241574b4a2 Corrected Bilbo's skirmish ability 2021-12-06 13:10:16 -05:00
Phallen Cassidy
9e25f84173 Fixes for the last Hobbit Draft Game expansion 2021-12-06 13:04:08 -05:00
Christian 'ketura' McCarty
abfd5c2f21 Altered all json cards that use putcardsFromDeckIntoHand that pull from the top or bottom of the deck so that they do not shuffle on use 2021-12-01 01:51:52 -06:00
Christian 'ketura' McCarty
0b714fe71b Added French format filter to the deckbuilder 2021-12-01 01:13:17 -06:00
Christian 'ketura' McCarty
1f9af9dbd8 Adding French format as requested by Enola: https://lotrtcgwiki.com/forums/index.php?topic=12007.0 2021-11-30 09:29:17 -06:00
Christian 'ketura' McCarty
0d35a354a9 Added most elven cards from VSet1. 2021-11-30 09:23:51 -06:00
Christian 'ketura' McCarty
43e5a5db96 Added optional text field to trigger definitions. Fixed PutCardsFromDeckIntoHand not shuffling afterwards by default. Fixed copy-paste error in MinTwilight 2021-11-30 09:23:07 -06:00
Phallen Cassidy
314391bde0 Merge remote-tracking branch 'origin/master' 2021-11-26 10:55:32 -05:00
PhallenCassidy
7971f98437 Merge branch 'PlayersCouncil:master' into master 2021-11-26 10:54:24 -05:00
Phallen Cassidy
2de285eb41 Lindir, Elven Minstrel 2021-11-26 10:32:03 -05:00
Phallen Cassidy
4545cfbb84 Fire and Water expansion for The Hobbit Draft Game 2021-11-26 09:30:08 -05:00
Phallen Cassidy
758ff70394 New versions of Bilbo for The Hobbit Draft 2021-11-25 23:19:44 -05:00
Phallen Cassidy
a47ce94020 1C261 "Orc Ambusher" 
Should only respond to events played in the regroup phase
 2021-11-25 23:03:18 -05:00
Christian 'ketura' McCarty
ee7750fdc4 Fixing memory retrieval not working with MinTwilight and MaxTwilight filters 2021-11-24 21:07:58 -06:00
Christian 'ketura' McCarty
b55682f316 Adding November 2021 PC Promos 2021-11-23 00:51:42 -06:00
Christian 'ketura' McCarty
22fad69269 Added a set clone so that individual /ignores do not accidentally propagate to the entire server's blacklist 2021-11-16 14:49:47 -06:00
Christian 'ketura' McCarty
931c1d09d2 Fixing changed constructor signatures 2021-11-16 09:16:00 -06:00