diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
index 4e0d62229..034cb14ec 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
@@ -27,6 +27,7 @@
"culture": "gandalf",
"cost": 2,
"type": "artifact",
+ "possession": "staff",
"vitality": 1,
"target": "name(Gandalf)",
"effects": [
@@ -263,6 +264,7 @@
"type": "event",
"effect": {
"type": "removeKeyword",
+ "keyword": "fierce",
"until": "start(regroup)",
"filter": "choose(minion)"
}
@@ -290,4 +292,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_aragorn_starter.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_aragorn_starter.png
new file mode 100644
index 000000000..24c30f59f
Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_aragorn_starter.png differ
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_mauhur_starter.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_mauhur_starter.png
new file mode 100644
index 000000000..f05af2fe3
Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/hu_mauhur_starter.png differ
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_evil_man_starter.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_evil_man_starter.png
new file mode 100644
index 000000000..44dcaccc3
Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_evil_man_starter.png differ
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_uruk_rampage_starter.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_uruk_rampage_starter.png
new file mode 100644
index 000000000..7e94b6343
Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/ros_uruk_rampage_starter.png differ
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
index ca9629ade..ddaba1044 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
@@ -27,6 +27,9 @@ var packBlueprints = {
"(S)SH - Starter": "/gemp-lotr/images/boosters/sh_starter_selection.png",
"(S)BR - Starter": "/gemp-lotr/images/boosters/br_starter_selection.png",
"(S)BL - Starter": "/gemp-lotr/images/boosters/bl_starter_selection.png",
+
+ "(S)HU - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
+ "(S)RoS - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)FotR - Tengwar": "/gemp-lotr/images/boosters/fotr_tengwar_selection.png",
"(S)TTT - Tengwar": "/gemp-lotr/images/boosters/ttt_tengwar_selection.png",
@@ -92,12 +95,12 @@ var packBlueprints = {
"BL - Boromir Starter": "/gemp-lotr/images/boosters/bl_boromir_starter.png",
"BL - Booster": "/gemp-lotr/images/boosters/bl_booster.png",
- "HU - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
- "HU - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
+ "HU - Aragorn Starter": "/gemp-lotr/images/boosters/hu_aragorn_starter.png",
+ "HU - Mauhur Starter": "/gemp-lotr/images/boosters/hu_mauhur_starter.png",
"HU - Booster": "/gemp-lotr/images/boosters/hu_booster.png",
- "RoS - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
- "RoS - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
+ "RoS - Uruk Rampage Starter": "/gemp-lotr/images/boosters/ros_uruk_rampage_starter.png",
+ "RoS - Evil Man Starter": "/gemp-lotr/images/boosters/ros_evil_man_starter.png",
"RoS - Booster": "/gemp-lotr/images/boosters/ros_booster.png",
"TaD - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
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 93adc59bc..8d063c3c1 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -186,6 +186,7 @@
+
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java
index 0a38f7280..451d65330 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java
@@ -17,6 +17,7 @@ public class SealedLeagueProduct {
createTowersBlock();
createMovieBlock();
createWarOfTheRingBlock();
+ createHuntersBlock();
createMovieSpecialBlock();
createTSSpecialBlock();
}
@@ -206,7 +207,37 @@ public class SealedLeagueProduct {
_collections.put(SealedLeagueType.WAR_BLOCK.getSealedCode(), warOfTheRingBlock);
}
+
+private void createHuntersBlock() {
+ List huntersBlock = new ArrayList();
+ MutableCardCollection firstWeek = new DefaultCardCollection();
+ firstWeek.addItem("(S)HU - Starter", 1);
+ firstWeek.addItem("HU - Booster", 6);
+ huntersBlock.add(firstWeek);
+
+ MutableCardCollection secondWeek = new DefaultCardCollection();
+ secondWeek.addItem("(S)RoS - Starter", 1);
+ secondWeek.addItem("RoS - Booster", 6);
+ huntersBlock.add(secondWeek);
+
+ MutableCardCollection thirdWeek = new DefaultCardCollection();
+ thirdWeek.addItem("TaD - Booster", 6);
+ thirdWeek.addItem("19_5", 1);
+ thirdWeek.addItem("19_24", 1);
+ thirdWeek.addItem("19_23", 1);
+ thirdWeek.addItem("19_33", 1);
+ huntersBlock.add(thirdWeek);
+
+ MutableCardCollection fourthWeek = new DefaultCardCollection();
+ fourthWeek.addItem("HU - Booster", 2);
+ fourthWeek.addItem("RoS - Booster", 2);
+ fourthWeek.addItem("TaD - Booster", 2);
+ huntersBlock.add(fourthWeek);
+
+ _collections.put(SealedLeagueType.HUNTERS_BLOCK.getSealedCode(), huntersBlock);
+ }
+
public CardCollection getCollectionForSerie(String leagueCode, int serieIndex) {
return _collections.get(leagueCode).get(serieIndex);
}
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java
index 5324054c3..08885cdc9 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java
@@ -5,6 +5,7 @@ public enum SealedLeagueType {
TTT_BLOCK("ttt_block", "limited_ttt"),
MOVIE_BLOCK("movie", "limited_king"),
WAR_BLOCK("war_block", "limited_shadows"),
+ HUNTERS_BLOCK("hunters_block", "limited_hunters"),
MOVIE_SPECIAL_BLOCK("movie_special", "limited_king"),
TS_SPECIAL_BLOCK("ts_special", "limited_ttt");
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)HU - Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)HU - Starter.pack
new file mode 100644
index 000000000..2c13cb4fc
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)HU - Starter.pack
@@ -0,0 +1,2 @@
+1xHU - Aragorn Starter
+1xHU - Mauhur Starter
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RoS - Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RoS - Starter.pack
new file mode 100644
index 000000000..c15fbacef
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RoS - Starter.pack
@@ -0,0 +1,2 @@
+1xRoS - Uruk Rampage Starter
+1xRoS - Evil Man Starter
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Aragorn Starter.pack
new file mode 100644
index 000000000..44a82951e
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Aragorn Starter.pack
@@ -0,0 +1,65 @@
+#The Hunters Aragorn Starter Deck Card List
+#Ring-bearer (2 cards)
+# Frodo, Weary From the Journey
+# The One Ring, The Ruling Ring
+1x15_144
+1x15_2
+#Adventure Deck (9 cards)
+# Anduin Banks
+# Gate of Mordor
+# City Gates
+# Shores of Nen Hithoel
+# Slopes of Orodruin
+# Helm's Gate
+# Westemnet Village
+# Starkhorn
+# Trollshaw Forest
+1x11_227
+1x15_191
+1x15_189
+1x12_191
+1x12_192
+1x11_245
+1x11_264
+1x12_193
+1x11_260
+#Free Peoples (25 cards)
+# Gimli, Eager Hunter x 2
+# Elven Warrior x 3
+# Haldir, Sentry of the Golden Wood
+# Legolas, Fleet-footed Hunter x 2
+# Aragorn, Swift Hunter x 4
+# Sword of the Fallen x 4
+# Hobbit Sword x 2
+# Whatever End x 2
+# Focus x 3
+# No Quicker Path x 2
+2x15_5
+3x15_14
+1x15_17
+2x15_19
+4x15_54
+4x15_25
+2x15_145
+2x15_10
+3x15_15
+2x15_65
+#Shadow (25 cards)
+# Battlefield Recruit x 4
+# Battlefield Veteran x 4
+# Black Gate Sentry
+# Black Land Spy x 3
+# Desolation Orc
+# Scouting Orc x 4
+# Veteran War Chief x 4
+# Orkish Hunting Spear x 2
+# Orkish Camp x 2
+4x15_95
+4x15_96
+1x15_98
+3x15_105
+1x15_107
+4x15_116
+4x15_120
+2x15_114
+2x15_113
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Mauhur Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Mauhur Starter.pack
new file mode 100644
index 000000000..d14c8ed4d
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Mauhur Starter.pack
@@ -0,0 +1,61 @@
+#The Hunters Mauhur Starter Deck Card List
+#Ring-bearer (2 cards)
+# Frodo, Weary From the Journey
+# The One Ring, The Ruling Ring
+1x15_144
+1x15_2
+#Adventure Deck (9 cards)
+# Anduin Banks
+# Doors of Durin
+# Breeding Pit of Isengard
+# City Gates
+# Rohan Uplands
+# Fords of Isen
+# City of Kings
+# East Wall of Rohan
+# Harrowdale
+1x11_227
+1x13_190
+1x15_188
+1x15_189
+1x11_257
+1x13_191
+1x13_187
+1x15_190
+1x11_243
+#Free Peoples (25 cards)
+# Gamling, The Old x 2
+# Haleth, Son of Hama x 2
+# Rohirrim Soldier x 4
+# Rohirrim Warrior x 1
+# Eowyn, Willing Fighter x 2
+# Rider's Mount x 4
+# Rohirrim Axe x 4
+# Hobbit Sword x 2
+# Grim Trophy x 4
+2x15_126
+2x15_128
+4x15_138
+1x15_139
+2x15_125
+4x15_133
+4x15_136
+2x15_145
+4x15_127
+#Shadow (25 cards)
+# Charging Uruk x 4
+# Following Uruk x 2
+# Mauhur, Relentless Hunter x 4
+# Pursuing Uruk x 4
+# Searching Uruk x 2
+# Seeking Uruk x 2
+# Tracking Uruk x 4
+# Violent Hurl x 3
+4x15_156
+2x15_160
+4x15_164
+4x15_167
+2x15_168
+2x15_169
+4x15_171
+3x15_179
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Evil Man Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Evil Man Starter.pack
new file mode 100644
index 000000000..d3155f4a8
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Evil Man Starter.pack
@@ -0,0 +1,63 @@
+#Rise of Saruman Evil Man Starter Deck Card List
+#Ring-bearer (2 cards)
+# Frodo, Weary From the Journey
+# The One Ring, The Ruling Ring
+1x15_144
+1x15_2
+#Adventure Deck (9 cards)
+# Fortress of Orthanc
+# Doors of Durin
+# Expanding Marshland
+# Ettenmoors
+# Isengard Ruined
+# Flats of Rohan
+# Westfold Village
+# Imladris
+# Falls of Rauros
+1x11_241
+1x13_190
+1x11_238
+1x11_237
+1x15_192
+1x11_240
+1x15_194
+1x17_147
+1x17_146
+#Free Peoples (25 cards)
+# Damrod, Dunadan of Gondor x 2
+# Dunedain of the South x 4
+# Madril, Loyal Lieutenant x2
+# Ranger of the White Tree x 2
+# Ithilien Blade x 3
+# Ranger's Cloak x 4
+# Hobbit Sword x 2
+# Nimble Attack x 2
+# Portico x 2
+# Spirit of the White Tree x2
+2x15_57
+4x15_59
+2x17_30
+2x17_33
+3x15_62
+4x15_68
+2x15_145
+2x17_32
+2x15_59
+2x17_34
+#Shadow (25 cards)
+# Bold Easterling x 3
+# Easterling Dispatcher x 3
+# Easterling Scout x 3
+# Ravaging Wild Man x 2
+# Saruman, Coldly Still x 4
+# Vengeful Wild Man x 2
+# Beast of War x 4
+# Great Axe x 4
+3x15_73
+3x17_42
+3x15_77
+2x15_91
+4x17_48
+2x17_63
+4x17_40
+4x15_80
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Uruk Rampage Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Uruk Rampage Starter.pack
new file mode 100644
index 000000000..5b9de845c
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Uruk Rampage Starter.pack
@@ -0,0 +1,63 @@
+#Rise of Saruman Uruk Rampage Starter Deck Card List
+#Ring-bearer (2 cards)
+# Frodo, Weary From the Journey
+# The One Ring, The Ruling Ring
+1x15_144
+1x15_2
+#Adventure Deck (9 cards)
+# Dol Guldur
+# Gate of Mordor
+# Nurn
+# City Gates
+# Osgiliath Reclaimed
+# Helm's Gate
+# City of Kings
+# Old Forest Road
+# East Wall of Rohan
+1x17_145
+1x15_191
+1x17_148
+1x15_189
+1x11_252
+1x11_245
+1x13_187
+1x11_251
+1x15_190
+#Free Peoples (25 cards)
+# Elven Guardian x 3
+# Elven Warrior x 2
+# Haldir, Sentry of the Golden Wood
+# Orophin, Silvan Elf x 2
+# Rumil, Silvan Elf x 2
+# Elven Bow x 3
+# Sword of the Fallen x 4
+# Hobbit Sword x 2
+# Hearth and Hall x 2
+# Point Blank Range x4
+3x17_7
+2x15_14
+1x15_17
+2x17_11
+2x17_12
+3x15_13
+4x15_25
+2x15_145
+2x17_8
+4x15_23
+#Shadow (25 cards)
+# Saruman, Curunir x 2
+# Seeking Uruk x 2
+# White Hand Butcher x 4
+# White Hand Guard x 4
+# White Hand Slayer x 3
+# White Hand Vanquisher x 2
+# Spear of the White Hand x 4
+# Violent Hurl x 4
+2x17_115
+2x15_169
+4x17_122
+4x17_126
+3x17_131
+2x17_134
+4x17_117
+4x15_179
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 1131d657c..261134158 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -393,5 +393,14 @@
"maximumSameName":100,
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
"hall":false
+ },
+ {
+ "name":"Limited",
+ "code":"limited_hunters",
+ "sites":"SHADOWS",
+ "cancelRingBearerSkirmish":false,
+ "maximumSameName":100,
+ "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+ "hall":false
}
]
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
index 10387d733..c3ca09b38 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
@@ -61,6 +61,12 @@ BR - Saruman Starter
(S)BL - Starter
BL - Arwen Starter
BL - Boromir Starter
+(S)HU - Starter
+HU - Aragorn Starter
+HU - Mauhur Starter
+(S)RoS - Starter
+RoS - Uruk Rampage Starter
+RoS - Evil Man Starter
Special-01
Special-02
Special-03
@@ -89,4 +95,4 @@ TSSealedS3D3
(S)TSSealed-S1
(S)TSSealed-S2
(S)TSSealed-S3
-(S)TSBoosterChoice
\ No newline at end of file
+(S)TSBoosterChoice