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

Simplified some Gandalf events

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-02 12:33:42 -07:00
parent d5a56a8cd0
commit 0acf7d520f
2 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-gandalf.json
View File

@@ -132,23 +132,19 @@
"effects": {
"type": "event",
"effect": {
"type": "choice",
"texts": [
"Make an unbound companion strength +3",
"Make an unbound companion strength +2"
],
"effects": [
{
"type": "modifyStrength",
"filter": "choose(unbound,companion,not(resistanceLessThan(4)))",
"amount": 3
"type": "modifyStrength",
"filter": "choose(unbound,companion)",
"memorize": "unboundCompanion",
"amount": {
"type": "condition",
"condition": {
"type": "memoryMatches",
"memory": "unboundCompanion",
"filter": "resistanceLessThan(4)"
},
{
"type": "modifyStrength",
"filter": "choose(unbound,companion,resistanceLessThan(4))",
"amount": 2
}
]
"true": 2,
"false": 3
}
}
}
},
@@ -192,23 +188,19 @@
"effects": {
"type": "event",
"effect": {
"type": "choice",
"texts": [
"Make a minion strength -3",
"Make a minion strength -2"
],
"effects": [
{
"type": "modifyStrength",
"filter": "choose(minion,inSkirmishAgainst(companion,not(resistanceLessThan(5))))",
"amount": -3
"type": "modifyStrength",
"filter": "choose(minion)",
"memorize": "chosenMinion",
"amount": {
"type": "condition",
"condition": {
"type": "memoryMatches",
"memory": "chosenMinion",
"filter": "inSkirmishAgainst(companion,not(resistanceLessThan(5)))"
},
{
"type": "modifyStrength",
"filter": "choose(minion,not(inSkirmishAgainst(companion,not(resistanceLessThan(5)))))",
"amount": -2
}
]
"true": -3,
"false": -2
}
}
}
}

42
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java
View File

@@ -333,4 +333,46 @@ public class NewCardsAtTest extends AbstractAtTest {
assertEquals(Zone.DISCARD, blackBreath.getZone());
}
@Test
public void strengthBonusDependingOnCharacterPlayedOn() throws DecisionResultInvalidException, CardNotFoundException {
initializeSimplestGame();
final PhysicalCardImpl gandalf = createCard(P1, "40_70");
final PhysicalCardImpl bolsteredSpirits = createCard(P1, "40_67");
PhysicalCardImpl nazgul = createCard(P2, "40_211");
_game.getGameState().addCardToZone(_game, gandalf, Zone.FREE_CHARACTERS);
_game.getGameState().addCardToZone(_game, bolsteredSpirits, Zone.HAND);
_game.getGameState().addCardToZone(_game, nazgul, Zone.SHADOW_CHARACTERS);
skipMulligans();
// Pass in fellowship
playerDecided(P1, "");
// Pass in shadow
playerDecided(P2, "");
//Pass in maneuver
playerDecided(P1, "");
playerDecided(P2, "");
//Pass in archery
playerDecided(P1, "");
playerDecided(P2, "");
//Pass in assignment
playerDecided(P1, "");
playerDecided(P2, "");
playerDecided(P1, gandalf.getCardId() + " " + nazgul.getCardId());
playerDecided(P1, "" + gandalf.getCardId());
playerDecided(P1, "0");
playerDecided(P1, "");
assertEquals(7 + 3, _game.getModifiersQuerying().getStrength(_game, gandalf));
}
}