From 4485e4050b0d00a2478df94fcc40a8bb57cb7a9a Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 27 Mar 2020 21:44:34 -0400 Subject: [PATCH 01/10] Some Hobbit fixes --- .../src/main/web/cards/set31/set31-fp.json | 11 +++-------- .../src/main/web/cards/set31/set31-shadow.json | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index bf0711829..d8c44c281 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -518,11 +518,6 @@ "filter": "self,attachedTo(any)" }, "cost": [ - { - "type": "memorize", - "filter": "bearer", - "memory": "bearer" - }, { "type": "transferToSupport", "filter": "self" @@ -536,7 +531,7 @@ }, "effect": { "type": "cancelSkirmish", - "filter": "memory(bearer)" + "filter": "bearer" } } } @@ -556,13 +551,13 @@ "effect": [ { "type": "modifyStrength", - "filter": "all(culture(dwarven),companion,hasStacked(follower))", + "filter": "all(culture(dwarven),companion,hasAttached(follower))", "amount": 2, "until": "start(regroup)" }, { "type": "addKeyword", - "filter": "all(culture(dwarven),companion,hasStacked(and(follower,culture(gandalf))))", + "filter": "all(culture(dwarven),companion,hasAttached(and(follower,culture(gandalf))))", "keyword": "defender+1", "until": "start(regroup)" } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json index 8b5c104f1..b3464c9d2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json @@ -82,7 +82,7 @@ "cost": [ { "type": "exert", - "filter": "choose(name(Gollum),not(roaming))" + "filter": "choose(self,not(roaming))" }, { "type": "assignFpCharacterToSkirmish", @@ -304,7 +304,7 @@ "31_26": { "title": "Threatening Warg", "culture": "gundabad", - "cost": 3, + "cost": 4, "type": "possession", "possession": "mount", "strength": 4, @@ -1157,7 +1157,7 @@ "31_65": { "title": "Caught in a Sack", "culture": "troll", - "cost": 2, + "cost": 0, "type": "condition", "keyword": "support area", "effects": [ From 347986a61845f15923a4d201c79878b325f5b8ba Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 27 Mar 2020 23:19:51 -0400 Subject: [PATCH 02/10] Fixing references to "mounted" --- .../src/main/web/cards/set31/set31-fp.json | 9 +++++++-- .../src/main/web/cards/set31/set31-shadow.json | 2 +- .../src/main/web/cards/set32/set32-fp.json | 2 +- .../src/main/web/cards/set32/set32-shadow.json | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index d8c44c281..36d278de5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -518,6 +518,11 @@ "filter": "self,attachedTo(any)" }, "cost": [ + { + "type": "memorize", + "filter": "bearer", + "memory": "bearer" + }, { "type": "transferToSupport", "filter": "self" @@ -527,11 +532,11 @@ "type": "conditional", "condition": { "type": "canSpot", - "filter": "inSkirmish,mounted,orc" + "filter": "inSkirmish,hasAttached(mount),orc" }, "effect": { "type": "cancelSkirmish", - "filter": "bearer" + "filter": "memory(bearer)" } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json index b3464c9d2..4cf81e197 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json @@ -265,7 +265,7 @@ } }, "31_25": { - "title": "Savage Worg", + "title": "Savage Warg", "culture": "gundabad", "cost": 3, "type": "possession", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json index 91486e7c1..7b9dcb1b3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json @@ -110,7 +110,7 @@ "type": "modifier", "modifier": { "type": "modifyStrength", - "filter": "bearer,inSkirmishAgainst(mounted,minion)", + "filter": "bearer,inSkirmishAgainst(hasAttached(mount),minion)", "amount": 1 } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json index 54d69498b..d4fe66ef0 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json @@ -455,7 +455,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,mounted" + "filter": "self,hasAttached(mount)" }, "cost": { "type": "exert", @@ -640,7 +640,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,mounted" + "filter": "self,hasAttached(mount)" }, "cost": { "type": "exert", @@ -738,7 +738,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,mounted" + "filter": "self,hasAttached(mount)" }, "cost": { "type": "exert", From 277891893c8db2651f27bfd2b830ab29b20b9b1d Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Sat, 28 Mar 2020 13:56:46 -0400 Subject: [PATCH 03/10] Fix to 1U153 "Uruk Slayer" Ability should be usable any number of times, but strength gain still limited to 3 --- .../main/web/cards/set1/set1-isengard.json | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json index bf2c9ab37..1d9d880d0 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json @@ -958,23 +958,18 @@ "effects": { "type": "activated", "phase": "skirmish", - "condition": { - "type": "perPhaseLimit", - "limit": 3 + "cost": { + "type": "removeTwilight" }, - "cost": [ - { - "type": "incrementPerPhaseLimit", - "limit": 3 - }, - { - "type": "removeTwilight" - } - ], "effect": { "type": "modifyStrength", "filter": "self", - "amount": 1 + "amount": { + "type": "cardAffectedLimitPerPhase", + "prefix": "str-", + "source": 1, + "limit": 3 + } } } }, @@ -1232,4 +1227,4 @@ } ] } -} \ No newline at end of file +} From ae3826b98c566e412303647cc723974ec531bca2 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 08:05:24 -0400 Subject: [PATCH 04/10] Temporarily change daily tournaments to All Cards --- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 920afd531..625ec785a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -212,16 +212,16 @@ public class HallServer extends AbstractServer { try { _tournamentQueues.put("fotr_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-15 19:30:00").getTime(), _repeatTournaments, "fotrDailyEu-", "Daily Gondor Fellowship Block", 0, - true, _tournamentCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), + true, _defaultCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), "fotr_block", 4)); _tournamentQueues.put("fotr_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-16 00:30:00").getTime(), _repeatTournaments, "fotrDailyUs-", "Daily Rohan Fellowship Block", 0, - true, _tournamentCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), + true, _defaultCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), "fotr_block", 4)); _tournamentQueues.put("movie_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "movieDailyEu-", "Daily Gondor Movie Block", 0, - true, _tournamentCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), + true, _defaultCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), "movie", 4)); _tournamentQueues.put("movie_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-17 00:30:00").getTime(), _repeatTournaments, "movieDailyUs-", "Daily Rohan Movie Block", 0, - true, _tournamentCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), + true, _defaultCollectionType, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss-3"), "movie", 4)); } catch (ParseException exp) { // Ignore, can't happen From b83848f4cf6e63683e886fd538fbe5b8bc4cd27e Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 08:27:08 -0400 Subject: [PATCH 05/10] Highland Movie format for leagues --- gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html | 1 + .../gemp-lotr-server/src/main/resources/lotrFormats.json | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index a470ed085..93adc59bc 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -254,6 +254,7 @@ + diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 55455baea..1131d657c 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -340,6 +340,14 @@ "set":[1, 2, 3], "hall":false }, + { + "name":"Movie block - Highlander", + "code":"movie_highlander", + "sites":"KING", + "maximumSameName":1, + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + "hall":false + }, { "name":"Limited", "code":"limited_hobbit", From 161a626f82f816061ab090f4b8c6b27a5de712db Mon Sep 17 00:00:00 2001 From: dmasalin Date: Mon, 30 Mar 2020 13:20:48 -0400 Subject: [PATCH 06/10] Add TS Tournaments --- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 625ec785a..3d485d247 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -200,6 +200,9 @@ public class HallServer extends AbstractServer { _tournamentQueues.put("fotr_queue", new ImmediateRecurringQueue(1500, "fotr_block", CollectionType.ALL_CARDS, "fotrQueue-", "Fellowship Block", 4, true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination"))); + _tournamentQueues.put("ts_queue", new ImmediateRecurringQueue(1500, "towers_standard", + CollectionType.ALL_CARDS, "tsQueue-", "Towers Standard", 4, + true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination"))); _tournamentQueues.put("movie_queue", new ImmediateRecurringQueue(1500, "movie", CollectionType.ALL_CARDS, "movieQueue-", "Movie Block", 4, true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination"))); From 8f41709a35779658658a095fc16b5d9de185aa2f Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 13:49:35 -0400 Subject: [PATCH 07/10] Revert 'Fixing references to "mounted"' --- .../src/main/web/cards/set31/set31-fp.json | 9 ++------- .../src/main/web/cards/set31/set31-shadow.json | 2 +- .../src/main/web/cards/set32/set32-fp.json | 2 +- .../src/main/web/cards/set32/set32-shadow.json | 6 +++--- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index 36d278de5..d8c44c281 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -518,11 +518,6 @@ "filter": "self,attachedTo(any)" }, "cost": [ - { - "type": "memorize", - "filter": "bearer", - "memory": "bearer" - }, { "type": "transferToSupport", "filter": "self" @@ -532,11 +527,11 @@ "type": "conditional", "condition": { "type": "canSpot", - "filter": "inSkirmish,hasAttached(mount),orc" + "filter": "inSkirmish,mounted,orc" }, "effect": { "type": "cancelSkirmish", - "filter": "memory(bearer)" + "filter": "bearer" } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json index 4cf81e197..b3464c9d2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json @@ -265,7 +265,7 @@ } }, "31_25": { - "title": "Savage Warg", + "title": "Savage Worg", "culture": "gundabad", "cost": 3, "type": "possession", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json index 7b9dcb1b3..91486e7c1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json @@ -110,7 +110,7 @@ "type": "modifier", "modifier": { "type": "modifyStrength", - "filter": "bearer,inSkirmishAgainst(hasAttached(mount),minion)", + "filter": "bearer,inSkirmishAgainst(mounted,minion)", "amount": 1 } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json index d4fe66ef0..54d69498b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json @@ -455,7 +455,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,hasAttached(mount)" + "filter": "self,mounted" }, "cost": { "type": "exert", @@ -640,7 +640,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,hasAttached(mount)" + "filter": "self,mounted" }, "cost": { "type": "exert", @@ -738,7 +738,7 @@ "phase": "regroup", "condition": { "type": "cantSpot", - "filter": "self,hasAttached(mount)" + "filter": "self,mounted" }, "cost": { "type": "exert", From 629055ef1217ed5f6b74aad599afeedbaee5ce52 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 13:50:38 -0400 Subject: [PATCH 08/10] Fix to 1U338 "Ford of Bruinen" --- .../src/main/web/cards/set1/set1.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json index 536640cd5..ebb14c455 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json @@ -569,6 +569,20 @@ "effect": { "type": "resetWhileInZoneData" } + }, + { + "type": "trigger", + "trigger": { + "type": "movesFrom", + "filter": "self" + }, + "condition": { + "type": "phase", + "phase": "regroup" + }, + "effect": { + "type": "resetWhileInZoneData" + } } ] }, From 3e09446d9c46cfb6ec0aab6291b6b40c0eb35e74 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 14:02:34 -0400 Subject: [PATCH 09/10] Reverting change to The Hobbit's Gwaihir --- .../src/main/web/cards/set31/set31-fp.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index d8c44c281..36d278de5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -518,6 +518,11 @@ "filter": "self,attachedTo(any)" }, "cost": [ + { + "type": "memorize", + "filter": "bearer", + "memory": "bearer" + }, { "type": "transferToSupport", "filter": "self" @@ -527,11 +532,11 @@ "type": "conditional", "condition": { "type": "canSpot", - "filter": "inSkirmish,mounted,orc" + "filter": "inSkirmish,hasAttached(mount),orc" }, "effect": { "type": "cancelSkirmish", - "filter": "bearer" + "filter": "memory(bearer)" } } } From 505c968492c0ddfc28ccaa37389f01d12d04330c Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 30 Mar 2020 14:04:02 -0400 Subject: [PATCH 10/10] Pushing correct code for Gwaihir Whoops --- .../gemp-lotr-async/src/main/web/cards/set31/set31-fp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index 36d278de5..086e5e668 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -532,7 +532,7 @@ "type": "conditional", "condition": { "type": "canSpot", - "filter": "inSkirmish,hasAttached(mount),orc" + "filter": "inSkirmish,mounted,orc" }, "effect": { "type": "cancelSkirmish",