Permalink
Browse files

Added timeshifted flag. FIxed some apostropheses which Fixes #20

  • Loading branch information...
1 parent 7e3beb3 commit 43a547fa62c56e8e704d327d01f20bbee9790efd @Sembiance Sembiance committed Jul 22, 2014
Showing with 161 additions and 11 deletions.
  1. +1 −1 json/FUT.json
  2. +1 −1 json/PLC.json
  3. +1 −1 json/TSB.json
  4. +136 −0 shared/C.js
  5. +1 −1 shared/shared.js
  6. +9 −1 web/changelog.json
  7. +3 −2 web/generate.js
  8. +9 −4 web/index.dust
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -1828,6 +1828,142 @@
{ match : {name : "Yavimaya Ancients"}, replace : {number : "31a", originalText : "{G}: Yavimaya Ancients gets +1/-2 until end of turn.", flavor : "\"We orphans of Fyndhorn have found no welcome in this alient place.\"\n\n — Taaveti of Kelsinko, elvish hunter"}},
{ match : {name : "Yavimaya Ants"}, replace : {number : "32", originalText : "Trample; haste (This creature may attack and {T} the turn it comes under your control.)\n\nCumulative upkeep {G}{G} (At the beginning of your upkeep, put an age counter on this creature, then sacrifice it unless you pay {G}{G} for each age counter on it.)"}}
],
+ FUT :
+ [
+ { match : {multiverseid : 136055}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136204}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136155}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136049}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130676}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126143}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130686}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130672}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132229}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130334}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136054}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130684}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126211}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130635}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136043}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132226}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136196}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126132}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136215}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132220}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132227}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126149}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126187}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136044}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130311}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132211}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130581}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136040}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130595}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130695}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126162}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130574}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136201}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130634}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136208}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136198}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126151}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130691}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126186}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126165}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126158}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136202}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130346}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130614}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130588}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136140}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136138}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136045}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130564}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136210}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136213}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126160}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136153}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136145}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126210}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136212}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136158}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130347}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136137}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136214}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136160}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130708}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136032}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130659}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130344}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130323}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136151}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130675}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136205}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136142}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136139}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130630}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130338}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136041}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130325}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130644}, replace : {timeshifted : true}},
+ { match : {multiverseid : 136141}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126178}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132222}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130702}, replace : {timeshifted : true}},
+ { match : {multiverseid : 132215}, replace : {timeshifted : true}}
+ ],
+ PLC :
+ [
+ { match : {multiverseid : 130715}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122321}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122373}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122360}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122423}, replace : {timeshifted : true}},
+ { match : {multiverseid : 128940}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122428}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122374}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122402}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122367}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122280}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122429}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122362}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122371}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122405}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122451}, replace : {timeshifted : true}},
+ { match : {multiverseid : 131006}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122481}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122324}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130714}, replace : {timeshifted : true}},
+ { match : {multiverseid : 125877}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126214}, replace : {timeshifted : true}},
+ { match : {multiverseid : 134738}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124033}, replace : {timeshifted : true}},
+ { match : {multiverseid : 125874}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126212}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124066}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124470}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124757}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122338}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122436}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130718}, replace : {timeshifted : true}},
+ { match : {multiverseid : 126818}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122282}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122325}, replace : {timeshifted : true}},
+ { match : {multiverseid : 130816}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122442}, replace : {timeshifted : true}},
+ { match : {multiverseid : 125873}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124445}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122285}, replace : {timeshifted : true}},
+ { match : {multiverseid : 124474}, replace : {timeshifted : true}},
+ { match : {multiverseid : 125879}, replace : {timeshifted : true}},
+ { match : {multiverseid : 131011}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122355}, replace : {timeshifted : true}},
+ { match : {multiverseid : 122366}, replace : {timeshifted : true}}
+ ],
+ TSB :
+ [
+ { match : "*", replace : {timeshifted : true}}
+ ],
DPA :
[
"numberCards",
View
@@ -166,7 +166,7 @@ exports.performSetCorrections = function(setCorrections, cards)
{
cards.forEach(function(card)
{
- if(setCorrection.match && Object.every(setCorrection.match, function(key, value) { return card[key]===value; }))
+ if(setCorrection.match && (setCorrection.match==="*" || (Object.every(setCorrection.match, function(key, value) { return card[key]===value; }))))
{
if(setCorrection.replace)
Object.forEach(setCorrection.replace, function(key, value) { card[key] = value; });
View
@@ -1,11 +1,19 @@
[
{
+ "version": "2.8.7",
+ "when": "2014-07-22",
+ "changes": [
+ "FUT, PLC, TSB: Cards that are timeshifted now have a 'timeshifted' field set to true."
+ ],
+ "updatedSetFiles" : ["FUT","FUT-x","PLC","PLC-x","TSB","TSB-x"]
+ },
+ {
"version": "2.8.6",
"when": "2014-07-15",
"changes": [
"DGM, DKA, ISD: Cards with split and double-faced layouts now have foreign names."
],
- "updatedSetFiles" : ["DGM-x", "DKA-x", "ISD-x"]
+ "updatedSetFiles" : ["DGM-x","DKA-x","ISD-x"]
},
{
"version": "2.8.5",
View
@@ -18,8 +18,8 @@ var dustData =
{
title : "Magic the Gathering card data in JSON format",
sets : [],
- version : "2.8.6",
- lastUpdated : "Jul 15, 2014",
+ version : "2.8.7",
+ lastUpdated : "Jul 22, 2014",
setCodesNotOnGatherer : C.SETS_NOT_ON_GATHERER.join(", ")
};
@@ -259,6 +259,7 @@ function checkSetCardDataTypes(setCode, cb)
printings : ["string"],
originalText : "string",
originalType : "string",
+ timeshifted : "boolean",
legalities : {}
};
View
@@ -204,7 +204,7 @@
<li>timeshifted purple</li>
</ul>
<p><br>
- Note that the 'Time Spiral "Timeshifted"' set does not have a booster field. This 'set' was actually a subset of the 'Time Spiral' set and it's cards are the 'timeshifted purple' booster card type mentioned above.<br>
+ Note that the 'Time Spiral "Timeshifted"' set does not have a booster field. This 'set' was actually a subset of the 'Time Spiral' set and its cards are the 'timeshifted purple' booster card type mentioned above.<br>
<br>
The "Magic: The Gathering—Conspiracy" expansion has an additional "draft-matters" type which can either be a "Conspiracy" type card or a card that affects drafting.<br>
<br>
@@ -242,7 +242,7 @@
<tr>
<td>name</td>
<td>"Research"</td>
- <td>The card name. For split, double-faced and flip cards, just the name of one side of the card. Basically each 'sub-card' has it's own record.</td>
+ <td>The card name. For split, double-faced and flip cards, just the name of one side of the card. Basically each 'sub-card' has its own record.</td>
</tr>
<tr>
<td>names</td>
@@ -282,7 +282,7 @@
<tr>
<td>subtypes</td>
<td>[ "Angel" ]</td>
- <td>The subtypes of the card. These appear to the right of the dash in a card type. Usually each word is it's own subtype. Example values: Trap, Arcane, Equipment, Aura, Human, Rat, Squirrel, etc.</td>
+ <td>The subtypes of the card. These appear to the right of the dash in a card type. Usually each word is its own subtype. Example values: Trap, Arcane, Equipment, Aura, Human, Rat, Squirrel, etc.</td>
</tr>
<tr>
<td>rarity</td>
@@ -352,6 +352,11 @@
<td>If the border for this specific card is DIFFERENT than the border specified in the top level set JSON, then it will be specified here. (Example: Unglued has silver borders, except for the lands which are black bordered)</td>
</tr>
<tr>
+ <td>timeshifted</td>
+ <td>true</td>
+ <td>If this card was a timeshifted card in the set.</td>
+ </tr>
+ <tr>
<td>hand</td>
<td>-3</td>
<td>Maximum hand size modifier. Only exists for Vanguard cards.</td>
@@ -675,7 +680,7 @@
<li>Bobby Wertman, rotaercz, Chris Bush, Patrick Rogers, Lewis, aeosynth, Pouncing Kavu</li>
<li>Florian, Carlo Luchessa, Sean Eshbaugh, Didero, laxika, Vlad Grigorescu</li>
<li>mini.dude_22, Nathan Nelson, Rudi v. Pelt, Javier Bueno Hedo, Eric Olson</li>
- <li>Michael Wybrow</li>
+ <li>Michael Wybrow, SpideR</li>
</ul>
</li>
<li><a href="http://wiki.mtgsalvation.com/article/Main_Page">MTG Salvation Wiki</a> for an AWESOME resource</li>

0 comments on commit 43a547f

Please sign in to comment.