From abfd5c2f21687c5a0fe58e009b5eaa966999aa1b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 1 Dec 2021 01:51:52 -0600 Subject: [PATCH] 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 --- .../src/main/web/cards/set1/set1-dwarven.json | 3 ++- .../src/main/web/cards/set1/set1-gandalf.json | 6 ++++-- .../gemp-lotr-async/src/main/web/cards/set1/set1-moria.json | 6 ++++-- .../src/main/web/cards/set1/set1-sauron.json | 3 ++- .../gemp-lotr-async/src/main/web/cards/set1/set1-shire.json | 3 ++- .../src/main/web/cards/set1/set1-wraith.json | 3 ++- gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json | 6 ++++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-dwarven.json index 525d2ba85..81ee45808 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-dwarven.json @@ -719,7 +719,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(revealedCards),side(free people))" + "filter": "all(memory(revealedCards),side(free people))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-gandalf.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-gandalf.json index 20e050aca..001492eb8 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-gandalf.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-gandalf.json @@ -406,7 +406,8 @@ { "type": "putCardsFromDeckIntoHand", "count": 2, - "filter": "choose(memory(cardsOnTop))" + "filter": "choose(memory(cardsOnTop))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", @@ -445,7 +446,8 @@ { "type": "putCardsFromDeckIntoHand", "count": 1, - "filter": "choose(memory(cardsOnTop))" + "filter": "choose(memory(cardsOnTop))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-moria.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-moria.json index be89b4695..d584b5d57 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-moria.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-moria.json @@ -181,7 +181,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "memory(revealedCards)" + "filter": "memory(revealedCards)", + "shuffle": false } ] } @@ -912,7 +913,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(revealedCards),culture(moria),orc)" + "filter": "all(memory(revealedCards),culture(moria),orc)", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-sauron.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-sauron.json index c1b689165..f97887136 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-sauron.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-sauron.json @@ -105,7 +105,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(revealedCards),culture(sauron))" + "filter": "all(memory(revealedCards),culture(sauron))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json index 545360b12..f30c35e6a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json @@ -467,7 +467,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(cardsOnTop),culture(shire))" + "filter": "all(memory(cardsOnTop),culture(shire))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json index 3301950aa..e0fb6eb62 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json @@ -446,7 +446,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(revealedCards),culture(wraith))" + "filter": "all(memory(revealedCards),culture(wraith))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json index 51cf32cfc..8de57764d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json @@ -271,7 +271,8 @@ }, { "type": "putCardsFromDeckIntoHand", - "filter": "all(memory(revealedCards),side(free people))" + "filter": "all(memory(revealedCards),side(free people))", + "shuffle": false }, { "type": "discardCardsFromDrawDeck", @@ -866,7 +867,8 @@ "text": "Would you like to take the revealed card into your hand?", "effect": { "type": "putCardsFromDeckIntoHand", - "filter": "memory(revealedCards)" + "filter": "memory(revealedCards)", + "shuffle": false } } }