From e045db6d6d0397041e8ecbcdd7ad1b1e7ecb0ec1 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Feb 2013 16:51:42 +0000 Subject: [PATCH] Code lift and review of old cards. --- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_029.java | 3 +-- .../java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java | 2 +- .../com/gempukku/lotro/cards/set20/dunland/Card20_029.java | 2 +- .../java/com/gempukku/lotro/cards/set20/elven/Card20_082.java | 2 +- .../com/gempukku/lotro/cards/set20/gandalf/Card20_168.java | 2 +- .../java/com/gempukku/lotro/cards/set4/dwarven/Card4_047.java | 2 +- .../java/com/gempukku/lotro/cards/set4/gandalf/Card4_096.java | 2 +- .../java/com/gempukku/lotro/cards/set4/gandalf/Card4_097.java | 2 +- .../java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java | 2 +- .../java/com/gempukku/lotro/cards/set4/shire/Card4_307.java | 2 +- .../java/com/gempukku/lotro/cards/set6/gollum/Card6_044.java | 2 +- .../java/com/gempukku/lotro/cards/set7/gollum/Card7_076.java | 2 +- .../java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java | 2 +- .../java/com/gempukku/lotro/cards/set7/gondor/Card7_091.java | 2 +- .../java/com/gempukku/lotro/cards/set8/wraith/Card8_068.java | 2 +- .../java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java | 2 +- .../java/com/gempukku/lotro/cards/set8/wraith/Card8_082.java | 2 +- 18 files changed, 18 insertions(+), 19 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java index accd152ce..27fe9895f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java @@ -54,7 +54,7 @@ public class Card1_015 extends AbstractAttachableFPPossession { new SelfDiscardEffect(self)); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( - new PreventAllWoundsActionProxy(self, self.getAttachedTo()), Phase.SKIRMISH)); + new PreventAllWoundsActionProxy(self, self.getAttachedTo()))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java index d8d390590..c52e5e83c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java @@ -77,8 +77,7 @@ public class Card1_029 extends AbstractOldEvent { } return null; } - }, Phase.SKIRMISH - )); + })); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java index 1bf4d033e..7bc64a08b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java @@ -66,7 +66,7 @@ public class Card17_103 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java index a1d2905c5..75873a0e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java @@ -63,7 +63,7 @@ public class Card20_029 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_082.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_082.java index 879a14a9f..eb31ccae9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_082.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_082.java @@ -51,7 +51,7 @@ public class Card20_082 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_168.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_168.java index 1a3b2f6bb..bb896efa2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_168.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_168.java @@ -60,7 +60,7 @@ public class Card20_168 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_047.java index c6a1c56db..76e39ac0c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_047.java @@ -57,7 +57,7 @@ public class Card4_047 extends AbstractPermanent { }); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( - new PreventAllWoundsActionProxy(self, character), Phase.SKIRMISH)); + new PreventAllWoundsActionProxy(self, character))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_096.java index 13adf82de..6cf6977f6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_096.java @@ -40,7 +40,7 @@ public class Card4_096 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( - new PreventAllWoundsActionProxy(self, card), Phase.SKIRMISH)); + new PreventAllWoundsActionProxy(self, card))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_097.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_097.java index aa2448f26..06f83c0fe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_097.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_097.java @@ -43,7 +43,7 @@ public class Card4_097 extends AbstractOldEvent { action.appendEffect( new PreventableEffect(action, new AddUntilEndOfPhaseActionProxyEffect( - new PreventAllWoundsActionProxy(self, Filters.gandalf), Phase.SKIRMISH) { + new PreventAllWoundsActionProxy(self, Filters.gandalf)) { @Override public String getText(LotroGame game) { return "Prevent all wounds to Gandalf"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java index 0221a1c39..d328e4881 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java @@ -69,7 +69,7 @@ public class Card4_128 extends AbstractOldEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java index fdb81ce75..027865d8f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java @@ -66,7 +66,7 @@ public class Card4_307 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_044.java index d969804b8..7ded131a8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_044.java @@ -73,7 +73,7 @@ public class Card6_044 extends AbstractEvent { } return null; } - }, Phase.REGROUP)); + })); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_076.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_076.java index b5c433072..65b71bcda 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_076.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_076.java @@ -64,7 +64,7 @@ public class Card7_076 extends AbstractEvent { } return null; } - }, Phase.REGROUP)); + })); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java index 1093bab8d..3684fc50d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java @@ -57,7 +57,7 @@ public class Card7_083 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_091.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_091.java index 2d9129726..3ce263779 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_091.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_091.java @@ -68,7 +68,7 @@ public class Card7_091 extends AbstractCompanion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.gandalf)); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( - new PreventAllWoundsActionProxy(self, self), Phase.SKIRMISH)); + new PreventAllWoundsActionProxy(self, self))); actions.add(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_068.java index 62a5c6301..04d754fcd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_068.java @@ -72,7 +72,7 @@ public class Card8_068 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java index daa73d1ec..0bbd6696a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java @@ -56,7 +56,7 @@ public class Card8_073 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_082.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_082.java index 7715c0700..a72c4ed24 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_082.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_082.java @@ -60,7 +60,7 @@ public class Card8_082 extends AbstractEvent { } return null; } - }, Phase.SKIRMISH)); + })); } }); return action;