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

Merge branch 'master' into card-dev

Browse Source 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json
#	gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json
#	gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json
#	gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt
#	gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
#	gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
This commit is contained in:
Christian 'ketura' McCarty
2021-03-12 22:26:53 -06:00
parent 8fe56b02f0 2b47d26fdb
commit b0cd05e0a9
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json
View File

@@ -396,4 +396,4 @@
} }
} }
} }
} }

2
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json
View File

@@ -201,4 +201,4 @@
} }
] ]
} }
} }

2
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json
View File

@@ -301,4 +301,4 @@
] ]
} }
} }
} }

1
gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt Normal file
View File

@@ -0,0 +1 @@
52R32

2
gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt Normal file
View File

@@ -0,0 +1,2 @@
53R42
53R68

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

@@ -149,7 +149,7 @@
}, },
{ {
"setId": "51", "setId": "51",
"setName": "PC Errata", "setName": "PC FotR Errata",
"rarityFile": "/set51-rarity.txt", "rarityFile": "/set51-rarity.txt",
"originalSet": false, "originalSet": false,
"merchantable": false, "merchantable": false,
@@ -157,9 +157,18 @@
"playable": true "playable": true
}, },
{ {
"setId": "101", "setId": "52",
"setName": "PC FOTR Supplements", "setName": "PC MoM Errata",
"rarityFile": "/set101-rarity.txt", "rarityFile": "/set52-rarity.txt",
"originalSet": false,
"merchantable": false,
"needsLoading": false,
"playable": true
},
{
"setId": "53",
"setName": "PC RotEL Errata",
"rarityFile": "/set53-rarity.txt",
"originalSet": false, "originalSet": false,
"merchantable": false, "merchantable": false,
"needsLoading": false, "needsLoading": false,