From 2f61f1f4c91bbba3c5ea2e45978d4d4007f04959 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 13 Jun 2017 22:07:42 -0400 Subject: [PATCH 01/25] Corrected Culture --- .../com/gempukku/lotro/cards/set31/dwarven/Card31_005.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java index 3239e8ada..3f2e909ef 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card31_005 extends AbstractAttachableFPPossession { public Card31_005() { - super(2, 0, 1, Culture.SHIRE, CardType.ARTIFACT, PossessionClass.ARMOR, "Mithril-coat", null, true); + super(2, 0, 1, Culture.DWARVEN, CardType.ARTIFACT, PossessionClass.ARMOR, "Mithril-coat", null, true); } @Override @@ -54,4 +54,4 @@ public class Card31_005 extends AbstractAttachableFPPossession { }, 2)); return modifiers; } -} \ No newline at end of file +} From eca7daabf26211ebeab4d836bf47c73ff11bc895 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 13 Jun 2017 22:09:11 -0400 Subject: [PATCH 02/25] Corrected Culture --- .../java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java index 853cdfc6a..91b820d39 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_013 extends AbstractFollower { public Card31_013() { - super(Side.FREE_PEOPLE, 3, 2, 1, 0, Culture.SHIRE, "Beorn", "Skin-Changer", true); + super(Side.FREE_PEOPLE, 3, 2, 1, 0, Culture.GANDALF, "Beorn", "Skin-Changer", true); } @Override From ea2ec17793591241b81678b49c5f79500bd6c462 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 11:11:47 -0400 Subject: [PATCH 03/25] Repaired Format Tab I think? I can't find any history of that being changed, is there supposed to be a forward slash there? --- gemp-lotr/gemp-lotr-async/src/main/web/hall.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html index 203cab550..58758939d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html @@ -159,7 +159,7 @@ document.write('
  • League Rules (updated)
    • ');
  • Instructions
    • -
  • Format Rules
    • +
  • Format Rules
  • Contribute
  • Your stats
  • Server stats
    • From c51729d976c924253a4db8d5d540d9d08bf55def Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 19:03:39 -0400 Subject: [PATCH 04/25] Fixed image path for The Main Deck site 8 Thanks for being patient with me about putting double quotes where single quotes should go. I was ignorant enough to think it didn't make any difference, but I see first-hand how important it is here. --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js index bcfd98b8b..5001f8ac2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js @@ -54,7 +54,7 @@ var hobbit = { '30_53': 'http://hobbitdraftgame.free.fr/Cards_Good_def/5_Mirkwood.png', '30_54': 'http://hobbitdraftgame.free.fr/Cards_Good_def/6_Esgaroth.png', '30_55': 'http://hobbitdraftgame.free.fr/Cards_Good_def/7_Erebor.png', - '30_56': "http://hobbitdraftgame.free.fr/Cards_Good_def/8_Smaug's_den.png", + '30_56': 'http://hobbitdraftgame.free.fr/Cards_Good_def/8_Smaug\'s_den.png', '30_57': 'http://hobbitdraftgame.free.fr/Cards_Good_def/9_Battle_of_the_five_armies.png', '30_58': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Smaug.png', '31_1': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dwarven_Axe.png', From d3bc6b3b2492ba4091e196c6c7e6f65e435fb98f Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:59:26 -0400 Subject: [PATCH 05/25] Consolidated Hobbit Shadow cultures Intent is to remove the filter checkbox for all now-redundant cultures. Edited The Hobbit: The Short Rest deckbuilding option to include The Main Deck (not as useful for a player by itself). --- .../src/main/web/js/gemp-019/cardFilter.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js index 6d2a9fc93..5455e7dc6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js @@ -138,7 +138,7 @@ var CardFilter = Class.extend({ + "" //Additional Hobbit Draft blocks + "" - + "" + + "" + ""); this.nameInput = $(""); this.sortSelect = $("" //Additional Hobbit Draft Shadow cultures + "" - + "" - + "" - + "" - + "" + //+ "" + //+ "" + //+ "" + //+ "" + ""); var combos = $("
    "); @@ -296,7 +296,7 @@ var CardFilter = Class.extend({ $("#type").change(filterOut); //Additional Hobbit Draft labels - $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD,#labelMIRKWOOD,#labelSMAUG,#labelSPIDER,#labelTROLL").click(filterOut); + $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD").click(filterOut); }, layoutUi:function (x, y, width, height) { From 58b08148a6cb8c8bedb6f3811b9a941434a8ec42 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 23:02:12 -0400 Subject: [PATCH 06/25] Added images for the two remaining new cultures --- .../src/main/web/images/cultures/esgaroth.png | Bin 0 -> 1746 bytes .../src/main/web/images/cultures/gundabad.png | Bin 0 -> 1787 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png new file mode 100644 index 0000000000000000000000000000000000000000..8d81942b285a0bc5c99d70c7e41edb7d3ed24441 GIT binary patch literal 1746 zcmd5+J!lj`6rS1L?C#wq5XnX5Ac%;a#>PTom3SdJ#TX=wA}DEX1jWL_!k;37SO{rs ztP~7N>=ctqQ4mxR3lT((XadQpnB;Envb*E=&E1~6cOq)#JLcZJzi+LldOD!&@qI&iq4>K#d-EzhsT0G8P6}~kkW1d*KE4f3=Tu?; zpz}VJ>s;U0J2^Fr!lQ+J|Jbf|a?GBpAmcw58Rz$IWhG&6Zf{qNFI6hL5!i$6lU3iJ z2^9yElqfgpZL*Y7<`>V)FIFnAK9x#pp(U0wpg0%)=zs2_%1IOswg zpuw=@`=%EJ2dYZlj&6|vwqXc@6OgB~bq}K;Lkj=9Y&+9tnkCu|hUFj_sDssBM7^!G z`b9VZCOfun*TDod?P9h1VbSxpVEYpgflZtj+hv<%Nt=LVg#)#w&5O}pa9_*Ig6YNt zAa3*_kmi{{F~NvMY^lO|LhD^~wDV;F{Sa_MvqK+7yJ9A-Y=qpojU3Z0ZT!?G2JHRR?O`z{r@EMZ*cP_-OS1 z4#bKFo4<#QfsMrMhA>-x6W`+LJf*)m_m94ZEc{!Ue^7XQ?e5DW>k5M-`8xy0&iw!{ C{%V*2 literal 0 HcmV?d00001 diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png new file mode 100644 index 0000000000000000000000000000000000000000..f1dd61982b0d2e36c009acfa01afc8b7291a4de1 GIT binary patch literal 1787 zcmdUvO-K}B7{}jTWjC#D4GnB*Vd+$dvcm=)0!dfaL6jv{C_I$019|X+n()%4qQfF4 z&yoE+yJa*_{K_3)$kf`Vqg@S9pM`ng+hc)ID^e(@7zW?v+>^oa7^yL$c zsYYW=!s^bQ!L|syVq7Q7=>#Tru_vE1Tk?7E{P8rIhOzE*SB%-+EJV!A{Z^83$Lj5h ze`-i2v-?j>Wy_?}L&dXB=jiaTJ>n1=(|Oq*bnH@Qe8{dJ(lI;E4(F}h>Eg+K zkz(xW`gY?#yKGh}Q5b-$dQ;-PPy~56;g&SR229BWHVFy11zXS)PRZ?JV9gzDcKr%= z6U4TK7NdC)HLc_O6l6dIzrnl|un*nbZ|pcMyRqK*urHz=8V|zlK<&^Sx5}5?ia%V-p;_CAUUg)&;0GFZT1P0XK~goyU)oU>SG(-$ zoiFd1X?u^lymmS_O}wXCB@oe&2@GigIRU@mF34YRxJC1I(8om%^a9AQY=u*)(Zz5U cnrf8(^Hj&P_Wr>`H@Dv+tE(?J*Ky&-ABf6lP5=M^ literal 0 HcmV?d00001 From 177577573afd80b66dacc0ba7fdf54e1a2716853 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 17 Jun 2017 09:08:28 -0400 Subject: [PATCH 07/25] Reverted change The Format Rules tab isn't up, but I don't think I was right to change that path. --- gemp-lotr/gemp-lotr-async/src/main/web/hall.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html index 58758939d..203cab550 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html @@ -159,7 +159,7 @@ document.write('
  • League Rules (updated)
    • ');
  • Instructions
    • -
  • Format Rules
    • +
  • Format Rules
  • Contribute
  • Your stats
  • Server stats
    • From 78d6da2c9dd0cda7becee4b4e86795df03a7abac Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 22 Jun 2017 21:07:11 -0400 Subject: [PATCH 08/25] Corected image paths --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js index 5001f8ac2..fcf700db7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js @@ -123,9 +123,9 @@ var hobbit = { '31_64': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Bert.png', '31_65': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Caught_In_A_Sack.png', '31_66': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Tom.png', - '31_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_William.png', + '31_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Campfire.png', '31_68': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Knife.png', - '31_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Campfire.png', + '31_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_William.png', '32_1': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Crown_of_Erebor.png', '32_2': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dain.png', '32_3': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Du_Bekar.png', From f104b86023ff3dd41c599aeb8900ed20930817bf Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 2 Jul 2017 20:08:56 -0400 Subject: [PATCH 09/25] Added FotR Poorman's to League Admin menu --- gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index 53f652668..342f922f2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -230,6 +230,7 @@ +
    Series duration in days:
    Maximum matches in series:
    From 72b08fefe0cda6a97d1441cb8081cacb43dcc4bf Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 2 Jul 2017 22:32:58 -0400 Subject: [PATCH 10/25] Added King Block formats at Merrick's request Set 7 and sets 7 & 8, for use in constructed leagues --- .../src/main/resources/lotrFormats.json | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 6fe4a4f64..f00ba246c 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -30,17 +30,17 @@ "code":"fotr_poorman", "sites":"FELLOWSHIP", "cancelRingBearerSkirmish":true, - "banned":["1_1", "1_13", "1_14", "1_15", "1_16", "1_22", "1_23", "1_28", "1_30", "1_33", "1_34", "1_35", "1_36", "1_38", "1_40", "1_45", "1_47", "1_49", "1_50", "1_55", "1_62", "1_66", "1_69", - "1_71", "1_72", "1_75", "1_79", "1_80", "1_81", "1_83", "1_87", "1_88", "1_89", "1_90", "1_93", "1_95", "1_96", "1_99", "1_100", "1_111", "1_114", "1_115", "1_118", "1_120", "1_123", "1_124", - "1_125", "1_127", "1_128", "1_129", "1_131", "1_132", "1_137", "1_139", "1_140", "1_143", "1_147", "1_148", "1_155", "1_163", "1_165", "1_166", "1_167", "1_169", "1_170", "1_172", "1_173", - "1_175", "1_183", "1_186", "1_189", "1_190", "1_195", "1_199", "1_200", "1_204", "1_205", "1_206", "1_208", "1_210", "1_212", "1_214", "1_216", "1_217", "1_221", "1_224", "1_228", "1_229", - "1_230", "1_236", "1_237", "1_240", "1_243", "1_244", "1_245", "1_246", "1_247", "1_250", "1_252", "1_253", "1_254", "1_256", "1_259", "1_263", "1_264", "1_265", "1_272", "1_276", "1_279", - "1_282", "1_284", "1_288", "1_289", "1_291", "1_302", "1_307", "1_308", "1_310", "1_313", "1_314", "1_318", "2_1", "2_7", "2_11", "2_12", "2_15", "2_19", "2_20", "2_22", "2_25", "2_27", - "2_32", "2_36", "2_38", "2_39", "2_43", "2_45", "2_46", "2_49", "2_50", "2_52", "2_53", "2_57", "2_66", "2_73", "2_74", "2_75", "2_77", "2_80", "2_84", "2_85", "2_86", "2_93", "2_94", "2_97", - "2_100", "2_105", "2_108", "2_109", "2_112", "2_113", "3_1", "3_3", "3_8", "3_13", "3_15", "3_17", "3_19", "3_21", "3_23", "3_27", "3_29", "3_34", "3_38", "3_39", "3_40", "3_41", "3_42", - "3_44", "3_50", "3_52", "3_54", "3_64", "3_65", "3_66", "3_67", "3_68", "3_71", "3_77", "3_80", "3_81", "3_85", "3_91", "3_93", "3_99", "3_102", "3_103", "3_104", "3_105", "3_110", "3_113"], + "banned":["1_1", "1_13", "1_14", "1_15", "1_16", "1_22", "1_23", "1_28", "1_30", "1_33", "1_34", "1_35", "1_36", "1_38", "1_40", "1_45", "1_47", "1_49", "1_50", "1_55", "1_62", "1_66", "1_69", + "1_71", "1_72", "1_75", "1_79", "1_80", "1_81", "1_83", "1_87", "1_88", "1_89", "1_90", "1_93", "1_95", "1_96", "1_99", "1_100", "1_111", "1_114", "1_115", "1_118", "1_120", "1_123", "1_124", + "1_125", "1_127", "1_128", "1_129", "1_131", "1_132", "1_137", "1_139", "1_140", "1_143", "1_147", "1_148", "1_155", "1_163", "1_165", "1_166", "1_167", "1_169", "1_170", "1_172", "1_173", + "1_175", "1_183", "1_186", "1_189", "1_190", "1_195", "1_199", "1_200", "1_204", "1_205", "1_206", "1_208", "1_210", "1_212", "1_214", "1_216", "1_217", "1_221", "1_224", "1_228", "1_229", + "1_230", "1_236", "1_237", "1_240", "1_243", "1_244", "1_245", "1_246", "1_247", "1_250", "1_252", "1_253", "1_254", "1_256", "1_259", "1_263", "1_264", "1_265", "1_272", "1_276", "1_279", + "1_282", "1_284", "1_288", "1_289", "1_291", "1_302", "1_307", "1_308", "1_310", "1_313", "1_314", "1_318", "2_1", "2_7", "2_11", "2_12", "2_15", "2_19", "2_20", "2_22", "2_25", "2_27", + "2_32", "2_36", "2_38", "2_39", "2_43", "2_45", "2_46", "2_49", "2_50", "2_52", "2_53", "2_57", "2_66", "2_73", "2_74", "2_75", "2_77", "2_80", "2_84", "2_85", "2_86", "2_93", "2_94", "2_97", + "2_100", "2_105", "2_108", "2_109", "2_112", "2_113", "3_1", "3_3", "3_8", "3_13", "3_15", "3_17", "3_19", "3_21", "3_23", "3_27", "3_29", "3_34", "3_38", "3_39", "3_40", "3_41", "3_42", + "3_44", "3_50", "3_52", "3_54", "3_64", "3_65", "3_66", "3_67", "3_68", "3_71", "3_77", "3_80", "3_81", "3_85", "3_91", "3_93", "3_99", "3_102", "3_103", "3_104", "3_105", "3_110", "3_113"], "restricted":["1_248"], - "set":[1, 2, 3], + "set":[1, 2, 3], "hall":false }, { @@ -133,6 +133,23 @@ "restricted":["7_49"], "set":[7, 8, 10] }, + { + "name":"King block - Set 7", + "code":"king1_block", + "sites":"KING", + "cancelRingBearerSkirmish":true, + "set":[7], + "hall":false + }, + { + "name":"King block - Sets 7-8", + "code":"king2_block", + "sites":"KING", + "cancelRingBearerSkirmish":true, + "restricted":["7_96"], + "set":[7, 8], + "hall":false + }, { "name":"Movie block", "code":"movie", From 89b9896b7341230926d90427da5c27266bf67690 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Mon, 3 Jul 2017 13:13:13 -0400 Subject: [PATCH 11/25] Updated new constructed format R-lists as per Decipher's CRD --- gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index f00ba246c..69f0862cb 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -138,6 +138,7 @@ "code":"king1_block", "sites":"KING", "cancelRingBearerSkirmish":true, + "restricted":["7_49"], "set":[7], "hall":false }, @@ -146,7 +147,7 @@ "code":"king2_block", "sites":"KING", "cancelRingBearerSkirmish":true, - "restricted":["7_96"], + "restricted":["7_49"], "set":[7, 8], "hall":false }, From 3bb28be24f940d25d6867545749f7a78e73d3e5f Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Mon, 3 Jul 2017 13:13:53 -0400 Subject: [PATCH 12/25] Added King Block formats for Constructed League --- gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index 342f922f2..de58b21eb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -209,6 +209,7 @@ + @@ -217,6 +218,8 @@ + + @@ -230,7 +233,6 @@ -
    Series duration in days:
    Maximum matches in series:
    From 704885e8b9d75c1705ae8dc6a87dc290057eb902 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 6 Jul 2017 21:41:06 -0400 Subject: [PATCH 13/25] Minor bugfix to Easterling Assailant 7C140 Previously, Easterling Assailant was able to heal itself. --- .../java/com/gempukku/lotro/cards/set7/raider/Card7_140.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java index a37e909ed..1609f5692 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java @@ -45,7 +45,7 @@ public class Card7_140 extends AbstractMinion { boolean hasInitiative = PlayConditions.hasInitiative(game, Side.SHADOW); int healCount = hasInitiative ? 2 : 1; action.appendEffect( - new ChooseAndHealCharactersEffect(action, playerId, healCount, healCount, Keyword.EASTERLING)); + new ChooseAndHealCharactersEffect(action, playerId, healCount, healCount, Filters.not(self), Keyword.EASTERLING)); return Collections.singletonList(action); } return null; From d5c20b91eb42c582464426e620ececc4b3040359 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 7 Jul 2017 08:41:49 -0400 Subject: [PATCH 14/25] Fix to 15U78 Engrossed Hillman Previously, another [MEN] Man had to be spotted even with 3 Free Peoples cultures. --- .../java/com/gempukku/lotro/cards/set15/men/Card15_078.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java index 444b46d12..718508c2b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java @@ -38,8 +38,8 @@ public class Card15_078 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER) - && PlayConditions.canSpot(game, Filters.not(self), Culture.MEN, Race.MAN) - && (PlayConditions.canSpot(game, 8, Filters.character) + && ((PlayConditions.canSpot(game, Filters.not(self), Culture.MEN, Race.MAN) + && PlayConditions.canSpot(game, 8, Filters.character)) || new CountCulturesEvaluator(Side.FREE_PEOPLE).evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null) >= 3)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( From 56594e20add4dabfe6c710c0fa184f887ec3f3ed Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 7 Jul 2017 08:44:20 -0400 Subject: [PATCH 15/25] Minor fix to 4R164 Orthanc Champion Previously, he was titled "Othanc Champion" --- .../java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java index 45158cd1b..98bda3e78 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card4_164 extends AbstractMinion { public Card4_164() { - super(5, 12, 2, 5, Race.URUK_HAI, Culture.ISENGARD, "Othanc Champion", null, true); + super(5, 12, 2, 5, Race.URUK_HAI, Culture.ISENGARD, "Orthanc Champion", null, true); addKeyword(Keyword.DAMAGE); } From 2019a381b8f517bddcafd5dac45e4b5d19f2cc91 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 7 Jul 2017 08:49:37 -0400 Subject: [PATCH 16/25] Minor fix to 15C130 Horseman of the North Previously, he was titled "Horesman of the North" --- .../java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java index ab96cba15..8204a89ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java @@ -28,7 +28,7 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; */ public class Card15_130 extends AbstractCompanion { public Card15_130() { - super(3, 5, 3, 6, Culture.ROHAN, Race.MAN, null, "Horesman of the North"); + super(3, 5, 3, 6, Culture.ROHAN, Race.MAN, null, "Horseman of the North"); } @Override From a052c5982aca0c39e9d28782f4654b6b7e2b4c5a Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 7 Jul 2017 09:02:06 -0400 Subject: [PATCH 17/25] Fix to 18U75 Ted Sandyman Previously, his regroup action was able to stack a [MEN] minion in play on a possession --- .../java/com/gempukku/lotro/cards/set18/men/Card18_075.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java index e10166be2..3b2c25330 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java @@ -56,7 +56,7 @@ public class Card18_075 extends AbstractMinion { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose a MEN minion", Culture.MEN, CardType.MINION) { + new ChooseActiveCardEffect(self, playerId, "Choose a MEN Man", Culture.MEN, Race.MAN) { @Override protected void cardSelected(LotroGame game, final PhysicalCard minion) { action.appendEffect( From bb74d44b0d623950c3143f82c0f72fce09c9572e Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 9 Jul 2017 22:11:02 -0400 Subject: [PATCH 18/25] Removed Hobbit format card lists Hoping to fix format tab --- .../async/handler/HallRequestHandler.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java index 62bd0867a..a7d487245 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java @@ -352,16 +352,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri result.append(""); //Additional Hobbit Draft format section if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("
  • Cards limited to 2 copies: "); - for (String blueprintId : lotroFormat.getLimit2Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - } - if (lotroFormat.getLimit3Cards().size() != 0) { - result.append("
  • Cards limited to 3 copies: "); - for (String blueprintId : lotroFormat.getLimit3Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); result.append("Click here for additional information"); } result.append(""); @@ -400,16 +390,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri result.append(""); //Additional Hobbit Draft format section if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("
  • Cards limited to 2 copies: "); - for (String blueprintId : lotroFormat.getLimit2Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - } - if (lotroFormat.getLimit3Cards().size() != 0) { - result.append("
  • Cards limited to 3 copies: "); - for (String blueprintId : lotroFormat.getLimit3Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); result.append("Click here for additional information"); } result.append(""); From 5f2ce1bf22227ae1ae6e4931cd72a15f16872629 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Mon, 10 Jul 2017 07:44:32 -0400 Subject: [PATCH 19/25] Reverted Hobbit format changes altogether When I can implement the changes I want reliably, I'll submit another request. Until then, I hope this repairs the Format Rules tab. --- .../gempukku/lotro/async/handler/HallRequestHandler.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java index a7d487245..63314206a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java @@ -350,10 +350,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri if (lotroFormat.getValidCards().size() == 0) result.append("none,"); result.append(""); - //Additional Hobbit Draft format section - if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("Click here for additional information"); - } result.append(""); responseWriter.writeHtmlResponse(result.toString()); @@ -388,10 +384,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri if (lotroFormat.getValidCards().size() == 0) result.append("none,"); result.append(""); - //Additional Hobbit Draft format section - if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("Click here for additional information"); - } result.append(""); } From 43422e6cdfed59e37a9949a620ee5886058dbc6d Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 11 Jul 2017 09:52:29 -0400 Subject: [PATCH 20/25] Corrected typo in 30_027 --- .../com/gempukku/lotro/cards/set30/gandalf/Card30_027.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java index eb7ee7298..99c361589 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card30_027 extends AbstractCompanion { public Card30_027() { - super(2, 7, 4, 6, Culture.GANDALF, Race.WIZARD, null, "Gandalf", "Powerful Guide", true); + super(2, 7, 4, 6, Culture.GANDALF, Race.WIZARD, null, "Gandalf", "The Grey", true); addKeyword(Keyword.WISE); } @@ -80,4 +80,4 @@ public class Card30_027 extends AbstractCompanion { } return null; } -} \ No newline at end of file +} From 14cddd4aa60ef1a75b51424c931a8cad1900800b Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 30 Jul 2017 13:08:52 -0400 Subject: [PATCH 21/25] Minor fix to 5R18 Fury of the White Rider Previously, it was titled "Fury of the White Raider" --- .../java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java index ecf1b619a..d164e4d52 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; */ public class Card5_018 extends AbstractEvent { public Card5_018() { - super(Side.FREE_PEOPLE, 3, Culture.GANDALF, "Fury of the White Raider", Phase.MANEUVER); + super(Side.FREE_PEOPLE, 3, Culture.GANDALF, "Fury of the White Rider", Phase.MANEUVER); addKeyword(Keyword.SPELL); } From ae66786b9a52392e27360ed92865868d6e86375b Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 30 Jul 2017 18:59:51 -0400 Subject: [PATCH 22/25] Fix to 15U113 Orkish Camp Previously, the Shadow player had to exert an [Orc] Orc rather than an [Orc] minion --- .../java/com/gempukku/lotro/cards/set15/orc/Card15_113.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java index c52f8a773..6dc4a8351 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java @@ -48,7 +48,7 @@ public class Card15_113 extends AbstractPermanent { action.appendCost( new RemoveTwilightEffect(2)); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ORC, Race.ORC)); + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ORC, CardType.MINION)); action.appendEffect( new RevealBottomCardsOfDrawDeckEffect(self, playerId, 1) { @Override From bb23dd145e444826f5f9ae0606d4d09e07107924 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 12 Aug 2017 08:20:29 -0400 Subject: [PATCH 23/25] Fix to 3R1 Book of Mazarbul Previously, the Free Peoples player was unable to transfer Book of Mazarbul to another companion --- .../java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java index 3badddd52..4a907df01 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java @@ -22,7 +22,7 @@ import java.util.List; * Game Text: Tale. Bearer must be a Dwarf. At the start of each fellowship phase when the fellowship is at site 4 * or higher, you may draw a card for each Dwarf companion. */ -public class Card3_001 extends AbstractAttachable { +public class Card3_001 extends AbstractAttachableFPPossession { public Card3_001() { super(Side.FREE_PEOPLE, CardType.POSSESSION, 2, Culture.DWARVEN, null, "Book of Mazarbul", null, true); addKeyword(Keyword.TALE); From 4a573606c747c76fe8a27b0380e04d5fac51b71a Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 20 Sep 2017 14:49:39 -0400 Subject: [PATCH 24/25] Fix to 3C112 Previously, the Free Peoples only had to spot 1 [Shire] companion --- .../java/com/gempukku/lotro/cards/set3/shire/Card3_112.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java index 4fe9b4c65..435f8f1a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set3.shire; import com.gempukku.lotro.cards.AbstractOldEvent; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.common.*; @@ -27,7 +28,7 @@ public class Card3_112 extends AbstractOldEvent { @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(), Culture.SHIRE, CardType.COMPANION); + && PlayConditions.canSpot(game, 2, Culture.SHIRE, CardType.COMPANION); } @Override From e31e32c8d473a441b01401fad666efb31c895d2b Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 28 Sep 2017 13:01:38 -0400 Subject: [PATCH 25/25] Minor fix to 13C24 Spring Forth Nimbly Previously, it was titled "Sprang Forth Nimbly" --- .../java/com/gempukku/lotro/cards/set13/elven/Card13_024.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java index 1cd6d400a..921c365e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java @@ -19,7 +19,7 @@ import com.gempukku.lotro.game.state.LotroGame; */ public class Card13_024 extends AbstractEvent { public Card13_024() { - super(Side.FREE_PEOPLE, 2, Culture.ELVEN, "Sprang Forth Nimbly", Phase.SKIRMISH); + super(Side.FREE_PEOPLE, 2, Culture.ELVEN, "Spring Forth Nimbly", Phase.SKIRMISH); } @Override