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
Christian 'ketura' McCarty
952e9a66b3
Altered /ignore behavior to also include the last 50 banned users, which should cause banned user's chats to disappear from the chat
2021-11-16 08:31:59 -06:00
Christian 'ketura' McCarty
9235f9171f
Fixing self discard protection
2021-11-08 00:10:45 -06:00
Christian 'ketura' McCarty
9694d092c2
Trying to address discard ability for moria vset1
2021-11-07 23:58:19 -06:00
Christian 'ketura' McCarty
e8c69f13c6
Sorted some keys for faster lookup by devs
2021-11-07 23:57:34 -06:00
Christian 'ketura' McCarty
2054925fcf
Fixes
...
Fixed multiple instances of One Purpose triggering on the same tentacle.
Fixed Darkness Grew acting like it could be activated at any time. Also fixed it not looking for the Balrog.
Hopefully fixed Dark Waters not self-defending
2021-11-07 18:59:57 -06:00
Christian 'ketura' McCarty
33bbd8995b
fixing missing sets in debug format
2021-11-07 16:00:33 -06:00
Christian 'ketura' McCarty
a3f0cf5fb6
adding debug format for testing
2021-11-07 15:50:48 -06:00
Christian 'ketura' McCarty
951f918196
Fixing missed tests and added placeholder code for all VSet1 images
2021-11-07 15:40:15 -06:00
Christian 'ketura' McCarty
174a7f621d
Completed the remaining three Moria cards for VSet1
2021-11-07 15:37:24 -06:00
Christian 'ketura' McCarty
dcbef7b7c7
Improved automatic json data to not have parsing errors by default. Improved standard formatting.
2021-11-07 03:21:36 -06:00
Christian 'ketura' McCarty
18e0dc0154
Added 2.5 of the moria cards
2021-11-07 03:14:01 -06:00
Christian 'ketura' McCarty
d055131705
Added Crow race. Added "ringbearer" filter with no spaces to match every single other filter.
2021-11-07 03:12:35 -06:00
Christian 'ketura' McCarty
e7aff360c0
Adding Pre-Hunters Expanded at the request of a community member
2021-11-06 02:24:51 -05:00
Christian 'ketura' McCarty
1b0ec8d3cf
Adding the auto-generated json and tests for all of VSet1. Implemented all of the Dwarven cards.
2021-11-06 02:22:38 -05:00
Christian 'ketura' McCarty
d404443cbc
Adding various null-op fields for containing game text etc
2021-11-06 02:18:40 -05:00
Christian 'ketura' McCarty
a1344b6b4a
October 2021 PC Promos
2021-10-24 22:22:11 -05:00
Christian 'ketura' McCarty
15691254be
commit before branch switch
2021-10-24 22:08:19 -05:00
Christian 'ketura' McCarty
f9d78e33ec
Enabled Towers Standard Enhanced in the game hall by request.
2021-10-05 18:30:34 -05:00
Christian 'ketura' McCarty
768130f056
continuing work on vcards
2021-10-05 18:27:46 -05:00
Christian 'ketura' McCarty
35a8ca86b8
Added Item filter and DiscardFromDeck trigger
...
Added item filter (which is just possession + artifact)
Added trigger which keys off of cards being discarded from the deck. Added the bulk of Deepest Delvings as a result.
2021-09-22 03:15:49 -05:00
Christian 'ketura' McCarty
bf5204edfb
Adding Dwarven Hospitality from VSet1
2021-09-21 14:56:15 -05:00
Christian 'ketura' McCarty
ce803d3758
Refactoring "InsertAdHocModifier" -> "Apply AdHocModifier"
2021-09-21 02:48:51 -05:00
Christian 'ketura' McCarty
189af8e2d2
Merge branch 'master' into card-dev
...
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
2021-09-20 23:10:27 -05:00
Christian 'ketura' McCarty
9f70e45c6e
Adding September PC Promos (Isildur + Shelob)
2021-09-19 21:32:25 -05:00
Phallen Cassidy
a48754969a
Merge remote-tracking branch 'origin'
2021-09-14 16:21:49 -04:00
