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

Fixing couple of bugs

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-07 20:02:02 -07:00
parent 603e98c217
commit 3dca2704ea
4 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-sites.json
View File

@@ -158,6 +158,7 @@
},
"effect": {
"type": "choice",
"player": "fp",
"texts": [
"Exert Thorin",
"Exert 2 other companions"
@@ -256,6 +257,13 @@
"filter": "orc",
"memorize": "playedOrc"
},
"condition": {
"type": "not",
"condition": {
"type": "hasInZoneData",
"filter": "self"
}
},
"effect": {
"type": "appendCardIdsToWhileInZone",
"memory": "playedOrc"

8
gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
View File

@@ -444,7 +444,7 @@
},
"effect": {
"type": "heal",
"filter": "self"
"filter": "choose(name(Gandalf))"
}
},
{
@@ -757,7 +757,8 @@
{
"type": "modifyStrength",
"filter": "memory(exertedAlly)",
"amount": 3
"amount": 3,
"until": "start(regroup)"
},
{
"type": "allyCanParticipateInArcheryFireAndSkirmishes",
@@ -786,7 +787,8 @@
"type": "forEachYouCanSpot",
"filter": "or(name(Gandalf),name(Elrond),name(Galadriel))"
"multiplier": -1
}
},
"until": "start(regroup)"
}
}
},

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

@@ -374,6 +374,13 @@
"filter": "nazgul",
"memorize": "playedNazgul"
},
"condition": {
"type": "not",
"condition": {
"type": "hasInZoneData",
"filter": "self"
}
},
"effect": {
"type": "appendCardIdsToWhileInZone",
"memory": "playedNazgul"

36
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java
View File

@@ -848,9 +848,12 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint {
return null;
DefaultActionContext actionContext = new DefaultActionContext(self.getOwner(), game, self, null, null);
RequiredTriggerAction action = new RequiredTriggerAction(self);
discardedFromPlayRequiredTriggerAction.createAction(action, actionContext);
return action;
if (discardedFromPlayRequiredTriggerAction.isValid(actionContext)) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
discardedFromPlayRequiredTriggerAction.createAction(action, actionContext);
return action;
}
return null;
}
@Override
@@ -859,9 +862,12 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint {
return null;
DefaultActionContext actionContext = new DefaultActionContext(playerId, game, self, null, null);
OptionalTriggerAction action = new OptionalTriggerAction(self);
discardedFromPlayOptionalTriggerAction.createAction(action, actionContext);
return action;
if (discardedFromPlayOptionalTriggerAction.isValid(actionContext)) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
discardedFromPlayOptionalTriggerAction.createAction(action, actionContext);
return action;
}
return null;
}
@Override
@@ -870,9 +876,12 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint {
return null;
DefaultActionContext actionContext = new DefaultActionContext(self.getOwner(), game, self, null, null);
RequiredTriggerAction action = new RequiredTriggerAction(self);
killedRequiredTriggerAction.createAction(action, actionContext);
return action;
if (killedRequiredTriggerAction.isValid(actionContext)) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
killedRequiredTriggerAction.createAction(action, actionContext);
return action;
}
return null;
}
@Override
@@ -881,9 +890,12 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint {
return null;
DefaultActionContext actionContext = new DefaultActionContext(playerId, game, self, null, null);
OptionalTriggerAction action = new OptionalTriggerAction(self);
killedOptionalTriggerAction.createAction(action, actionContext);
return action;
if (killedOptionalTriggerAction.isValid(actionContext)) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
killedOptionalTriggerAction.createAction(action, actionContext);
return action;
}
return null;
}
@Override