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

Checking in stubs for the FOTR starter supplements

Browse Source 
Added set 21, which is intended to represent set 1+.  Added this set to the card builder.  Added a PC FOTR format.  Updated the Race enum to include Warg.
This commit is contained in:
Christian 'ketura' McCarty
2021-01-06 00:15:56 -06:00
parent 8ba8c6fd1f
commit f6493a1ecd
17 changed files with 522 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/ban.html
View File

@@ -36,6 +36,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

391
gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set21.json Normal file
View File

@@ -0,0 +1,391 @@
{
"21_1": {
"title": "Blue Mountain Dwarf",
"culture": "dwarven",
"type": "companion",
"race": "dwarf",
"cost": 2,
"strength": 6,
"vitality": 2
},
"21_2": {
"title": "Stand Together",
"culture": "gandalf",
"type": "event",
"keyword": "maneuver",
"cost": 3
},
"21_3": {
"title": "Thrice Worthy and Beloved Barliman",
"culture": "gandalf",
"type": "condition",
"cost": 0,
"strength": 1
},
"21_4": {
"title": "Gondorian Broadsword",
"culture": "gondor",
"type": "possession",
"possession": "hand weapon",
"cost": 2,
"strength": 2
},
"21_5": {
"title": "Relics of the Second Age",
"culture": "gondor",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_6": {
"title": "Thrown Sword",
"culture": "gondor",
"type": "event",
"keyword": "skirmish",
"cost": 1
},
"21_7": {
"title": "Lurtz",
"subtitle": "Weapon of Saruman",
"culture": "isengard",
"type": "minion",
"race": "uruk-hai",
"cost": 7,
"strength": 12,
"vitality": 3,
"site": 5
},
"21_8": {
"title": "Strength of Servitude",
"culture": "isengard",
"type": "event",
"keyword": "response",
"cost": 1
},
"21_9": {
"title": "Uruk Swarmer",
"culture": "isengard",
"type": "minion",
"race": "uruk-hai",
"cost": 3,
"strength": 6,
"vitality": 2,
"site": 5
},
"21_10": {
"title": "Goblin Bow",
"culture": "moria",
"type": "possession",
"possession": "ranged weapon",
"cost": 1,
"strength": 1,
"vitality": 1
},
"21_11": {
"title": "Goblin Warchief",
"subtitle": "Captain of the Underhall",
"culture": "moria",
"type": "minion",
"race": "orc",
"cost": 4,
"strength": 9,
"vitality": 2,
"site": 4
},
"21_12": {
"title": "No Hope of Escape That Way",
"culture": "moria",
"type": "event",
"keyword": "maneuver",
"cost": 1
},
"21_13": {
"title": "The Old Forest",
"culture": "wraith",
"type": "condition",
"keyword": "support area",
"cost": 0
},
"21_14": {
"title": "Old Man Willow",
"subtitle": "Heart of the Withywindle",
"culture": "wraith",
"type": "minion",
"race": "tree",
"cost": 3,
"strength": 2,
"vitality": 6,
"site": 2
},
"21_15": {
"title": "And in the Darkness Bind Them",
"culture": "sauron",
"type": "condition",
"keyword": "support area",
"cost": 0
},
"21_16": {
"title": "Gladden Ambush",
"culture": "sauron",
"type": "event",
"keyword": "maneuver",
"cost": 0
},
"21_17": {
"title": "Bilbo",
"subtitle": "One Hundred and Eleventy",
"culture": "shire",
"type": "ally",
"race": "hobbit",
"cost": 2,
"strength": 2,
"vitality": 3,
"allyHome": "fellowship,1"
},
"21_18": {
"title": "Hobbit Concealment",
"culture": "shire",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_19": {
"title": "Sam",
"subtitle": "Hobbit of Hobbiton",
"culture": "shire",
"type": "companion",
"race": "hobbit",
"cost": 2,
"strength": 3,
"vitality": 4,
"signet": "frodo"
},
"21_20": {
"title": "Walking Stick",
"culture": "shire",
"type": "possession",
"possession": "staff",
"strength": 0
},
"21_21": {
"title": "Barred the Gates",
"culture": "dwarven",
"type": "condition",
"keyword": "support area",
"cost": 0
},
"21_22": {
"title": "Light-shaft",
"culture": "dwarven",
"type": "event",
"keyword": "regroup",
"cost": 0
},
"21_23": {
"title": "Longbeard's Axe",
"culture": "dwarven",
"type": "possession",
"possession": "hand weapon",
"cost": 1,
"strength": 2
},
"21_24": {
"title": "Venturing Dwarf",
"culture": "dwarven",
"type": "companion",
"race": "dwarf",
"cost": 2,
"strength": 5,
"vitality": 3
},
"21_25": {
"title": "Dazzling Flash",
"culture": "gandalf",
"type": "event",
"keyword": "skirmish",
"cost": 1
},
"21_26": {
"title": "No Time for Wonder",
"culture": "gandalf",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_27": {
"title": "Dagger of Westernesse",
"culture": "gondor",
"type": "artifact",
"possession": "hand weapon",
"cost": 0,
"strength": 2
},
"21_28": {
"title": "Goblin Avengers",
"culture": "moria",
"type": "minion",
"race": "orc",
"cost": 7,
"strength": 13,
"vitality": 3,
"site": 4
},
"21_29": {
"title": "Goblin Warren",
"culture": "moria",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_30": {
"title": "Thither We Are Going Against My Wish",
"culture": "moria",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_31": {
"title": "Hollin Snarler",
"culture": "sauron",
"type": "minion",
"race": "warg",
"cost": 3,
"strength": 8,
"vitality": 2,
"site": 3
},
"21_32": {
"title": "The Hunt is Up!",
"culture": "sauron",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_33": {
"title": "Hunting Pack",
"culture": "sauron",
"type": "minion",
"race": "warg",
"cost": 5,
"strength": 11,
"vitality": 3,
"site": 5
},
"21_34": {
"title": "Pippin",
"subtitle": "Fool of a Took",
"culture": "shire",
"type": "companion",
"race": "hobbit",
"cost": 1,
"strength": 3,
"vitality": 4,
"signet": "gandalf"
},
"21_35": {
"title": "Deft Aid",
"culture": "elven",
"type": "condition",
"site": 1
},
"21_36": {
"title": "Elven Flet",
"culture": "elven",
"type": "condition",
"keyword": "support area",
"cost": 1
},
"21_37": {
"title": "In Imladris it Dwells",
"culture": "elven",
"type": "event",
"keyword": "fellowship",
"cost": 0
},
"21_38": {
"title": "Rivendell Sentry",
"culture": "elven",
"type": "ally",
"race": "elf",
"cost": 2,
"strength": 5,
"vitality": 2,
"allyHome": "fellowship,4"
},
"21_39": {
"title": "Arroch",
"culture": "gondor",
"type": "possession",
"possession": "mount",
"cost": 2,
"vitality": 1
},
"21_40": {
"title": "The Deeds of the Steward's House",
"culture": "gondor",
"type": "condition",
"keyword": "support area",
"cost": 2
},
"21_41": {
"title": "They Have a Cave Troll",
"culture": "gondor",
"type": "event",
"keyword": "maneuver",
"cost": 1
},
"21_42": {
"title": "Isengard Attendant",
"culture": "isengard",
"type": "minion",
"race": "orc",
"cost": 3,
"strength": 7,
"vitality": 2,
"site": 4
},
"21_43": {
"title": "Stirruk",
"culture": "isengard",
"type": "possession",
"possession": "hand weapon",
"cost": 1,
"strength": 3,
"vitality": 1
},
"21_44": {
"title": "Uruk Batch",
"culture": "isengard",
"type": "minion",
"race": "uruk-hai",
"cost": 3,
"strength": 7,
"vitality": 2,
"site": 5
},
"21_45": {
"title": "Influence of Shadow",
"culture": "sauron",
"type": "condition",
"keyword": "support area",
"cost": 0
},
"21_46": {
"title": "Tower Shaman",
"culture": "sauron",
"type": "minion",
"race": "orc",
"cost": 4,
"strength": 6,
"vitality": 3,
"site": 6
},
"21_47": {
"title": "Udun Scimitar",
"culture": "sauron",
"type": "possession",
"possession": "hand weapon",
"cost": 2,
"strength": 2
},
}

1
gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/game.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/hall.html
View File

@@ -29,6 +29,7 @@
<script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/index.html
View File

@@ -39,6 +39,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/js.inc
View File

@@ -22,6 +22,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
View File

@@ -110,6 +110,7 @@ var CardFilter = Class.extend({
+ "<option value='0-32'>All Sets</option>"
+ "<option value='0-19'>Official Sets</option>"
+ "<option value='30-32'>The Hobbit Sets</option>"
+ "<option value='21'>Player's Council Sets</option>"
+ "<option disabled>----------</option>"
+ "<option value='fotr_block'>Fellowship Block</option>"
+ "<option value='ttt_block'>Towers Block</option>"
@@ -144,6 +145,7 @@ var CardFilter = Class.extend({
+ "<option value='17'>17 - Rise of Saruman</option>"
+ "<option value='18'>18 - Treachery & Deceit</option>"
+ "<option value='19'>19 - Ages End</option>"
+ "<option value='21'>1+ - Fellowship Supplement</option>"
+ "<option value='30'>30 - The Hobbit: Main Deck</option>"
+ "<option value='31'>31 - The Hobbit: Expansion 1</option>"
+ "<option value='32'>32 - The Hobbit: Expansion 2</option>"

3
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
View File

@@ -215,6 +215,9 @@ var Card = Class.extend({
return img;
//Additional Hobbit Draft blueprints
img = hobbit[blueprintId];
if (img != null)
return img;
img = set21[blueprintId];
if (img != null)
return img;
return null;

49
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js Normal file
View File

@@ -0,0 +1,49 @@
var set21 = {
'21_1': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_1.jpg',
'21_2': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_2.jpg',
'21_3': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_3.jpg',
'21_4': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_4.jpg',
'21_5': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_5.jpg',
'21_6': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_6.jpg',
'21_7': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_7.jpg',
'21_8': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_8.jpg',
'21_9': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_9.jpg',
'21_10': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_10.jpg',
'21_11': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_11.jpg',
'21_12': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_12.jpg',
'21_13': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_13.jpg',
'21_14': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_14.jpg',
'21_15': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_15.jpg',
'21_16': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_16.jpg',
'21_17': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_17.jpg',
'21_18': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_18.jpg',
'21_19': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_19.jpg',
'21_20': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_20.jpg',
'21_21': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_21.jpg',
'21_22': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_22.jpg',
'21_23': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_23.jpg',
'21_24': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_24.jpg',
'21_25': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_25.jpg',
'21_26': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_26.jpg',
'21_27': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_27.jpg',
'21_28': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_28.jpg',
'21_29': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_29.jpg',
'21_30': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_30.jpg',
'21_31': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_31.jpg',
'21_32': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_32.jpg',
'21_33': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_33.jpg',
'21_34': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_34.jpg',
'21_35': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_35.jpg',
'21_36': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_36.jpg',
'21_37': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_37.jpg',
'21_38': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_38.jpg',
'21_39': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_39.jpg',
'21_40': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_40.jpg',
'21_41': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_41.jpg',
'21_42': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_42.jpg',
'21_43': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_43.jpg',
'21_44': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_44.jpg',
'21_45': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_45.jpg',
'21_46': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_46.jpg',
'21_47': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_47.jpg'
}

1
gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
View File

@@ -44,6 +44,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/set21.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

47
gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt Normal file
View File

@@ -0,0 +1,47 @@
21S1
21S2
21S3
21S4
21S5
21S6
21S7
21S8
21S9
21S10
21S11
21S12
21S13
21S14
21S15
21S16
21S17
21S18
21S19
21S20
21S21
21S22
21S23
21S24
21S25
21S26
21S27
21S28
21S29
21S30
21S31
21S32
21S33
21S34
21S35
21S36
21S37
21S38
21S39
21S40
21S41
21S42
21S43
21S44
21S45
21S46
21S47

9
gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
View File

@@ -146,5 +146,14 @@
"merchantable": false,
"needsLoading": false,
"playable": false
},
{
"setId": "21",
"setName": "PC FOTR Supplements",
"rarityFile": "/set21-rarity.txt",
"originalSet": false,
"merchantable": false,
"needsLoading": false,
"playable": true
}
]

5
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Race.java
View File

@@ -7,7 +7,10 @@ public enum Race implements Filterable {
GOBLIN("Goblin"),
//Additional Hobbit Draft races
DRAGON("Dragon"), EAGLE("Eagle"), BIRD("Bird");
DRAGON("Dragon"), EAGLE("Eagle"), BIRD("Bird"),
//PC Races
WARG("Warg");
private String _humanReadable;

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

@@ -402,5 +402,13 @@
"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":"PC-Fellowship Block",
"code":"pc_fotr_block",
"sites":"FELLOWSHIP",
"cancelRingBearerSkirmish":true,
"set":[1, 2, 3, 21],
"banned":["1_1"]
}
]