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

Merge pull request #38 from PhallenCassidy/patch-1

Browse Source 
Additional corrections for The Hobbit
This commit is contained in:
Marcin Sciesinski
2017-11-13 12:07:55 -08:00
committed by GitHub
parent 23f3805002 434340cde0
commit 946e2afa48
7 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/elven/Card30_021.java
View File

@@ -39,7 +39,7 @@ import java.util.List;
*/
public class Card30_021 extends AbstractAlly {
public Card30_021() {
super(4, Block.HOBBIT, 3, 8, 4, Race.ELF, Culture.ELVEN, "Elrond", "Herald to Gil-galad", true);
super(4, Block.HOBBIT, 3, 8, 4, Race.ELF, Culture.ELVEN, "Elrond", "Elven Lord", true);
addKeyword(Keyword.WISE);
}

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_048.java
View File

@@ -31,7 +31,7 @@ import java.util.List;
* Set: Main Deck
* Side: Free
* Culture: Shire
* Twilight Cost: 2
* Twilight Cost: 0
* Type: Artifact • Ring
* Vitality: +1
* Resistance: +1
@@ -40,7 +40,7 @@ import java.util.List;
*/
public class Card30_048 extends AbstractAttachableFPPossession {
public Card30_048() {
super(2, 0, 1, Culture.SHIRE, CardType.ARTIFACT, PossessionClass.RING, "The One Ring", null, true);
super(0, 0, 1, Culture.SHIRE, CardType.ARTIFACT, PossessionClass.RING, "The One Ring", null, true);
}
@Override
@@ -102,4 +102,4 @@ public class Card30_048 extends AbstractAttachableFPPossession {
}
return null;
}
}
}

8
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_010.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
* Strength: 6
* Vitality: 3
* Site: 5
* Game Text: To play, spot an Elf. Regroup: Exert Tauriel and spot a minion to return that minion to its owner's hand.
* Game Text: Archer. Maneuver: Exert Tauriel to return an Orc with strength 7 or less to its owner's hand.
*/
public class Card31_010 extends AbstractAlly {
public Card31_010() {
@@ -35,7 +35,7 @@ public class Card31_010 extends AbstractAlly {
@Override
protected List<? extends Action> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self)
&& PlayConditions.canExert(self, game, self)
&& Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), CardType.MINION)) {
final ActivateCardAction action = new ActivateCardAction(self);
@@ -46,11 +46,11 @@ public class Card31_010 extends AbstractAlly {
@Override
protected void opponentChosen(String opponentId) {
action.appendEffect(
new ChooseAndReturnCardsToHandEffect(action, opponentId, 1, 1, CardType.MINION, Filters.lessStrengthThan(7)));
new ChooseAndReturnCardsToHandEffect(action, opponentId, 1, 1, Race.ORC, Filters.lessStrengthThan(8)));
}
});
return Collections.singletonList(action);
}
return null;
}
}
}

14
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java
View File

@@ -3,7 +3,7 @@ package com.gempukku.lotro.cards.set31.troll;
import com.gempukku.lotro.cards.AbstractPermanent;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.TriggerConditions;
import com.gempukku.lotro.cards.effects.AddUntilEndOfTurnModifierEffect;
import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
import com.gempukku.lotro.cards.effects.ChoiceEffect;
import com.gempukku.lotro.cards.effects.PreventableEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
@@ -28,7 +28,7 @@ import java.util.List;
* Set: The Short Rest
* Side: Shadow
* Culture: Troll
* Twilight Cost: 0
* Twilight Cost: 2
* Type: Condition • Support Area
* Game Text: At the start of each assignment phase, you may discard a minion (or exert
* a [TROLL] Troll) to spot a [DWARVEN] or [SHIRE] companion. That companion cannot be
@@ -36,17 +36,17 @@ import java.util.List;
*/
public class Card31_065 extends AbstractPermanent {
public Card31_065() {
super(Side.SHADOW, 0, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Caught in a Sack");
super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Caught in a Sack");
}
@Override
public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (TriggerConditions.startOfPhase(game, effectResult, Phase.ASSIGNMENT)
&& (PlayConditions.canExert(self, game, 1, Culture.TROLL, Race.TROLL) || PlayConditions.canDiscardFromPlay(self, game, CardType.MINION))) {
&& (PlayConditions.canExert(self, game, 1, Culture.GUNDABAD, Race.TROLL) || PlayConditions.canDiscardFromPlay(self, game, CardType.MINION))) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 1, Culture.TROLL, Race.TROLL) {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 1, Culture.GUNDABAD, Race.TROLL) {
@Override
public String getText(LotroGame game) {
return "Exert a [TROLL] Troll";
@@ -67,7 +67,7 @@ public class Card31_065 extends AbstractPermanent {
protected void cardSelected(LotroGame game, final PhysicalCard card) {
action.appendEffect(new PreventableEffect(
action,
new AddUntilEndOfTurnModifierEffect(new CantBeAssignedToSkirmishModifier(self, card)),
new AddUntilEndOfPhaseModifierEffect(new CantBeAssignedToSkirmishModifier(self, card)),
Collections.singletonList(game.getGameState().getCurrentPlayerId()),
new PreventableEffect.PreventionCost() {
@Override
@@ -81,4 +81,4 @@ public class Card31_065 extends AbstractPermanent {
}
return null;
}
}
}

11
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java
View File

@@ -20,13 +20,20 @@ import java.util.List;
* Culture: Troll
* Twilight Cost: 2
* Type: Condition
* Game Text: Plays to your support area. Shadow: Discard 2 cards from hand to play a minion from your discard
* Game Text: To play, spot a Troll. Shadow: Discard 2 cards from hand to play a minion from your discard
* pile.
*/
public class Card31_067 extends AbstractPermanent {
public Card31_067() {
super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Troll Campfire", null, true);
}
@Override
public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
&& Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Race.TROLL);
}
@Override
public List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
@@ -42,4 +49,4 @@ public class Card31_067 extends AbstractPermanent {
}
return null;
}
}
}

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java
View File

@@ -17,14 +17,14 @@ import java.util.List;
* Set: The Short Rest
* Side: Shadow
* Culture: Troll
* Twilight Cost: 1
* Twilight Cost: 2
* Type: Possession • Hand Weapon
* Strength: +3
* Game Text: Bearer must be a Troll. Bearer is damage +1.
*/
public class Card31_068 extends AbstractAttachable {
public Card31_068() {
super(Side.SHADOW, CardType.POSSESSION, 1, Culture.GUNDABAD, PossessionClass.HAND_WEAPON, "Troll Knife");
super(Side.SHADOW, CardType.POSSESSION, 2, Culture.GUNDABAD, PossessionClass.HAND_WEAPON, "Troll Knife");
}
@Override
@@ -39,4 +39,4 @@ public class Card31_068 extends AbstractAttachable {
modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE));
return modifiers;
}
}
}

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

@@ -317,9 +317,9 @@
"code":"hobbit_tsr",
"sites":"HOBBIT",
"cancelRingBearerSkirmish":true,
"restricted":["30_2", "30_22", "30_5", "30_43", "30_44", "30_45", "30_46", "30_6", "30_7", "30_8", "30_9", "30_21", "30_10", "30_25", "30_26", "30_27", "30_28", "30_29", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_58", "30_47", "30_48", "30_19"],
"limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_14", "31_15", "31_16", "31_24", "31_29", "31_34", "31_36", "31_39", "31_40", "31_43", "31_58", "31_56", "31_62", "31_65"],
"limit3":["30_23", "30_1", "30_3", "30_4", "30_24", "30_30", "30_13", "30_14", "30_31", "30_20", "30_32", "30_39", "30_40", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_17", "31_18", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_28", "31_33", "31_37", "31_38", "31_41", "31_42", "31_47", "31_57", "31_60", "31_64", "31_66", "31_67", "31_68", "31_69"],
"restricted":["30_2", "30_22", "30_5", "30_43", "30_44", "30_45", "30_46", "30_6", "30_7", "30_8", "30_9", "30_21", "30_10", "30_25", "30_26", "30_27", "30_28", "30_29", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_58", "30_47", "30_48", "30_19", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_15", "31_24", "31_34", "31_36", "31_39", "31_58", "31_62", "31_65"],
"limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_13", "31_14", "31_16", "31_29", "31_40", "31_43", "31_56"],
"limit3":["30_23", "30_1", "30_3", "30_4", "30_24", "30_30", "30_13", "30_14", "30_31", "30_20", "30_32", "30_39", "30_40", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_17", "31_18", "31_19", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_27", "31_28", "31_30", "31_31", "31_32", "31_33", "31_35", "31_37", "31_38", "31_41", "31_42", "31_47", "31_57", "31_59", "31_60", "31_61", "31_63", "31_64", "31_66", "31_67", "31_68", "31_69"],
"set":[30, 31],
"hall":true
}