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 +} 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" + } } ] }, 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..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 @@ -556,13 +556,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": [ 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/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 920afd531..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"))); @@ -212,16 +215,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 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",