ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #67 from PhallenCassidy/master

Browse Source 
Hobbit fixes, LotR improvements
This commit is contained in:
Marcin Sciesinski
2020-03-31 03:53:41 +07:00
committed by GitHub
parent 01bb7ca4c2 505c968492
commit 8e6b46a1ee
7 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json
View File

@@ -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 @@
}
]
}
}
}

14
gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json
View File

@@ -569,6 +569,20 @@
"effect": {
"type": "resetWhileInZoneData"
}
},
{
"type": "trigger",
"trigger": {
"type": "movesFrom",
"filter": "self"
},
"condition": {
"type": "phase",
"phase": "regroup"
},
"effect": {
"type": "resetWhileInZoneData"
}
}
]
},

4
gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
View File

@@ -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)"
}

6
gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
View File

@@ -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": [

1
gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
View File

@@ -254,6 +254,7 @@
<option value="movie8">Movie block - Sets 1-8</option>
<option value="movie9">Movie block - Sets 1-9</option>
<option value="movie_sans9">Movie block - Sets 1-8,10</option>
<option value="movie_highlander">Movie block - Highlander</option>
<option value="war_block">War of the Ring block</option>
<option value="war_block11">War of the Ring block - Set 11</option>
<option value="war_block12">War of the Ring block - Sets 11-12</option>

11
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -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

8
gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
View File

@@ -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",