From 831ae4aaf8cc8e0dc3b68ce4d638c60415622415 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 12 Oct 2011 22:36:47 +0000 Subject: [PATCH] Fixing ally and siteNumber mishup. --- .../lotro/cards/set1/elven/Card1_040.java | 2 +- .../lotro/cards/set1/elven/Card1_045.java | 2 +- .../lotro/cards/set1/elven/Card1_055.java | 2 +- .../lotro/cards/set1/elven/Card1_064.java | 4 +-- .../lotro/cards/set1/elven/Card1_065.java | 4 +-- .../lotro/cards/set1/elven/Card1_067.java | 2 +- .../lotro/cards/set1/shire/Card1_297.java | 2 +- .../lotro/cards/set1/site/Card1_352.java | 2 +- .../lotro/cards/set3/elven/Card3_008.java | 3 +- .../lotro/cards/set3/elven/Card3_013.java | 2 +- .../com/gempukku/lotro/filters/Filters.java | 11 +++++++ .../src/main/webapp/js/gameAnimations.js | 32 +++++++++++++++++++ .../src/main/webapp/js/gameUi.js | 29 +++-------------- 13 files changed, 59 insertions(+), 38 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java index 87d379ff3..222ca9011 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java @@ -57,7 +57,7 @@ public class Card1_040 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.siteNumber(3), Filters.siteBlock(Block.FELLOWSHIP)))); + new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java index aa96888d9..9265c5f88 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java @@ -53,7 +53,7 @@ public class Card1_045 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)))); + new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java index 601e3ea51..ace777fc5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java @@ -73,7 +73,7 @@ public class Card1_055 extends AbstractPermanent { @Override public Modifier getAlwaysOnModifier(PhysicalCard self) { - return new StrengthModifier(self, Filters.and(Filters.type(CardType.ALLY), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)), 1); + return new StrengthModifier(self, Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)), 1); } private String[] opponentsHavingAtLeast7Cards(LotroGame game, String currentPlayer) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_064.java index e456538dd..9e97efbe6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_064.java @@ -34,14 +34,14 @@ public class Card1_064 extends AbstractEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) { return super.checkPlayRequirements(playerId, game, self, twilightModifier) - && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.siteNumber(3), Filters.siteBlock(Block.FELLOWSHIP)); + && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)); } @Override public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier) { final PlayEventAction action = new PlayEventAction(self); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.siteNumber(3), Filters.siteBlock(Block.FELLOWSHIP)) { + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)) { @Override protected void forEachCardExertedCallback(PhysicalCard elfAlly) { action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_065.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_065.java index 3eba70717..478e04a85 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_065.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_065.java @@ -34,14 +34,14 @@ public class Card1_065 extends AbstractEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) { return super.checkPlayRequirements(playerId, game, self, twilightModifier) - && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)); + && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)); } @Override public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier) { final PlayEventAction action = new PlayEventAction(self); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)) { + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.race(Race.ELF), Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)) { @Override protected void forEachCardExertedCallback(PhysicalCard elfAlly) { action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java index 0851d4670..8fecf34be 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java @@ -35,7 +35,7 @@ public class Card1_067 extends AbstractAlly { } private Filter getFilter(PhysicalCard self) { - return Filters.and(Filters.type(CardType.SITE), Filters.owner(self.getOwner()), Filters.siteNumber(3), Filters.siteBlock(Block.FELLOWSHIP)); + return Filters.and(Filters.type(CardType.SITE), Filters.owner(self.getOwner()), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)); } private LotroCardBlueprint getCopied(LotroGame game, PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java index 94a913dea..e9e14c58a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java @@ -42,7 +42,7 @@ public class Card1_297 extends AbstractAlly { action.appendCost( new ExertCharactersEffect(self, self)); action.appendEffect( - new ChooseAndHealCharactersEffect(action, playerId, Filters.type(CardType.ALLY), Filters.race(Race.HOBBIT), Filters.not(Filters.sameCard(self)), Filters.siteNumber(1), Filters.siteBlock(Block.FELLOWSHIP))); + new ChooseAndHealCharactersEffect(action, playerId, Filters.type(CardType.ALLY), Filters.race(Race.HOBBIT), Filters.not(Filters.sameCard(self)), Filters.isAllyHome(1, Block.FELLOWSHIP))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java index 659c8de0b..0fc059226 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java @@ -25,6 +25,6 @@ public class Card1_352 extends AbstractSite { @Override public Modifier getAlwaysOnModifier(PhysicalCard self) { - return new StrengthModifier(self, Filters.and(Filters.type(CardType.ALLY), Filters.siteNumber(6), Filters.siteBlock(Block.FELLOWSHIP)), 3); + return new StrengthModifier(self, Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)), 3); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_008.java index 1d06095ce..54409d7d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_008.java @@ -36,8 +36,7 @@ public class Card3_008 extends AbstractCompanion { Filters.and( Filters.culture(Culture.ELVEN), Filters.type(CardType.ALLY), - Filters.siteNumber(3), - Filters.siteBlock(Block.FELLOWSHIP) + Filters.isAllyHome(3, Block.FELLOWSHIP) ), 3), -3)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_013.java index d1a1e0885..09e7b942c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_013.java @@ -40,7 +40,7 @@ public class Card3_013 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.siteNumber(3), Filters.siteBlock(Block.FELLOWSHIP)) { + new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)) { @Override protected void cardSelected(PhysicalCard ally) { action.insertEffect( diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index 12bb57dac..89cc5d802 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -272,6 +272,17 @@ public class Filters { }; } + public static Filter isAllyHome(final int siteNumber, final Block siteBlock) { + return Filters.and( + Filters.type(CardType.ALLY), + new Filter() { + @Override + public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + return physicalCard.getBlueprint().isAllyAtHome(siteNumber, siteBlock); + } + }); + } + public static Filter isAllyAtHome() { return Filters.and( Filters.type(CardType.ALLY), diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js index 6b161738b..9b160e8dd 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js @@ -390,6 +390,38 @@ var GameAnimations = Class.extend({ this.game.chatBox.appendMessage(message, "warningMessage"); }, + showSkirmishValues: function(skirmish) { + this.game.fpStrengthDiv.text(skirmish[0].getAttribute("fpStrength")); + this.game.shadowStrengthDiv.text(skirmish[0].getAttribute("shadowStrength")); + }, + + processDecision: function(decision) { + var decisionType = decision.getAttribute("type"); + if (decisionType == "INTEGER") { + this.game.integerDecision(decision); + } else if (decisionType == "MULTIPLE_CHOICE") { + this.game.multipleChoiceDecision(decision); + } else if (decisionType == "ARBITRARY_CARDS") { + this.game.arbitraryCardsDecision(decision); + } else if (decisionType == "ACTION_CHOICE") { + this.game.actionChoiceDecision(decision); + } else if (decisionType == "CARD_ACTION_CHOICE") { + this.game.cardActionChoiceDecision(decision); + } else if (decisionType == "CARD_SELECTION") { + this.game.cardSelectionDecision(decision); + } else if (decisionType == "ASSIGN_MINIONS") { + this.game.assignMinionsDecision(decision); + } + }, + + updateGameState: function() { + var that = this; + setTimeout( + function() { + that.game.updateGameState(); + }, 1000); + }, + windowResized: function() { var that = this; $("#main").queue( diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index b79d742ba..0fabdedc2 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -532,10 +532,8 @@ var GempLotrGameUI = Class.extend({ this.layoutUI(false); var skirmish = element.getElementsByTagName("skirmish"); - if (skirmish.length > 0) { - this.fpStrengthDiv.text(skirmish[0].getAttribute("fpStrength")); - this.shadowStrengthDiv.text(skirmish[0].getAttribute("shadowStrength")); - } + if (skirmish.length > 0) + this.animations.showSkirmishValues(skirmish); if (this.allPlayerIds != null) { var clocks = element.getElementsByTagName("clocks")[0].getElementsByTagName("clock"); @@ -558,28 +556,9 @@ var GempLotrGameUI = Class.extend({ var decisions = element.getElementsByTagName("decision"); if (decisions.length == 1) { var decision = decisions[0]; - var decisionType = decision.getAttribute("type"); - if (decisionType == "INTEGER") { - this.integerDecision(decision); - } else if (decisionType == "MULTIPLE_CHOICE") { - this.multipleChoiceDecision(decision); - } else if (decisionType == "ARBITRARY_CARDS") { - this.arbitraryCardsDecision(decision); - } else if (decisionType == "ACTION_CHOICE") { - this.actionChoiceDecision(decision); - } else if (decisionType == "CARD_ACTION_CHOICE") { - this.cardActionChoiceDecision(decision); - } else if (decisionType == "CARD_SELECTION") { - this.cardSelectionDecision(decision); - } else if (decisionType == "ASSIGN_MINIONS") { - this.assignMinionsDecision(decision); - } + this.animations.processDecision(decision); } else { - var that = this; - setTimeout( - function() { - that.updateGameState(); - }, 1000); + this.animations.updateGameState(); } },