diff --git a/BulkDataList.cs b/BulkDataList.cs index 67647ef..5c1e74f 100644 --- a/BulkDataList.cs +++ b/BulkDataList.cs @@ -1,6 +1,9 @@ using System; namespace Sharpfall { + //fyi: there's a Guid built in to .net. But it's not necessarily exactly identical to RFC4122's description of a uuid. + using UUID = System.String; + public class BulkDataList { public string @object { get; set; } @@ -10,7 +13,7 @@ namespace Sharpfall public class BulkMetaEntry { public string @object { get; set; } - public Guid id { get; set; } + public UUID id { get; set; } public string type { get; set; } public DateTime updated_at { get; set; } public Uri uri { get; set; } diff --git a/Card.cs b/Card.cs index e59361d..c2adad1 100644 --- a/Card.cs +++ b/Card.cs @@ -5,7 +5,6 @@ namespace Sharpfall { //fyi: there's a Guid built in to .net. But it's not necessarily exactly identical to RFC4122's description of a uuid. using UUID = System.String; - using Colors = IEnumerable; public class Card { public int? arena_id; //This card’s Arena ID, if any. A large percentage of cards are not available on Arena and do not have this ID. @@ -27,9 +26,9 @@ namespace Sharpfall public IEnumerable all_parts; //If this card is closely related to other cards, this property will be an array with Related Card Objects. public IEnumerable card_faces; //An array of Card Face objects, if this card is multifaced. public decimal cmc; //The card’s converted mana cost. Note that some funny cards have fractional mana costs. - public Colors color_identity; //This card’s color identity. - public Colors color_indicator; //The colors in this card’s color indicator, if any. A null value for this field indicates the card does not have one. - public Colors colors; //This card’s colors, if the overall card has colors defined by the rules. Otherwise the colors will be on the card_faces objects, see below. + public IEnumerable color_identity; //This card’s color identity. + public IEnumerable color_indicator; //The colors in this card’s color indicator, if any. A null value for this field indicates the card does not have one. + public IEnumerable colors; //This card’s colors, if the overall card has colors defined by the rules. Otherwise the colors will be on the card_faces objects, see below. public int? edhrec_rank; //This card’s overall rank/popularity on EDHREC. Not all cards are ranked. public string hand_modifier; //This card’s hand modifier, if it is Vanguard card. This value will contain a delta, such as -1. public IEnumerable keywords; //An array of keywords that this card uses, such as 'Flying' and 'Cumulative upkeep'. @@ -42,7 +41,7 @@ namespace Sharpfall public string oracle_text; //The Oracle text for this card, if any. public bool oversized; //True if this card is oversized. public string power; //This card’s power, if any. Note that some cards have powers that are not numeric, such as *. - public Colors produced_mana; //Colors of mana that this card could produce. + public IEnumerable produced_mana; //Colors of mana that this card could produce. public bool reserved; //True if this card is on the Reserved List. public string toughness; //This card’s toughness, if any. Note that some cards have toughnesses that are not numeric, such as *. public string type_line; //The type line of this card. diff --git a/CardFace.cs b/CardFace.cs index ad90909..388eb66 100644 --- a/CardFace.cs +++ b/CardFace.cs @@ -4,12 +4,11 @@ using System.Collections.Generic; namespace Sharpfall { using UUID = System.String; - using Colors = IEnumerable; public class CardFace { public string artist { get; set; } //The name of the illustrator of this card face. Newly spoiled cards may not have this field yet. - public Colors color_indicator { get; set; } //The colors in this face’s color indicator, if any. - public Colors colors { get; set; } //This face’s colors, if the game defines colors for the individual face of this card. + public IEnumerable color_indicator { get; set; } //The colors in this face’s color indicator, if any. + public IEnumerable colors { get; set; } //This face’s colors, if the game defines colors for the individual face of this card. public string flavor_text { get; set; } //The flavor text printed on this face, if any. public UUID illustration_id { get; set; } //A unique identifier for the card face artwork that remains consistent across reprints. Newly spoiled cards may not have this field yet. public Images image_uris { get; set; } //An object providing URIs to imagery for this face, if this is a double-sided card. If this card is not double-sided, then the image_uris property will be part of the parent object instead. diff --git a/RelatedCard.cs b/RelatedCard.cs index bfaa093..ed5d2fb 100644 --- a/RelatedCard.cs +++ b/RelatedCard.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; namespace Sharpfall { using UUID = System.String; - using Colors = IEnumerable; public class RelatedCard { public UUID id { get; set; } //An unique ID for this card in Scryfall’s database.