update enum

Attribute.cs

@@ -2,15 +2,16 @@
 {
     using System;
 
-    public enum Attribute
+    [Flags]
+    public enum Attribute : int
     {
-        ATTRIBUTE_DARK = 0x20,
-        ATTRIBUTE_DEVINE = 0x40,
-        ATTRIBUTE_EARTH = 1,
-        ATTRIBUTE_FIRE = 4,
+        ATTRIBUTE_EARTH = 0x01,
+        ATTRIBUTE_WATER = 0x02,
+        ATTRIBUTE_FIRE = 0x04,
+        ATTRIBUTE_WIND = 0x08,
         ATTRIBUTE_LIGHT = 0x10,
-        ATTRIBUTE_WATER = 2,
-        ATTRIBUTE_WIND = 8
+        ATTRIBUTE_DARK = 0x20,
+        ATTRIBUTE_DEVINE = 0x40
     }
 }
 

Data.cs

@@ -9,12 +9,17 @@
         public int code;
         public int alias;
         public int setcode;
-        public int type;
+        public Type type;
         public int level;
-        public int attribute;
-        public int race;
+        public Attribute attribute;
+        public Race race;
         public int attack;
         public int defence;
+
+        public bool isType(Type typ)
+        {
+            return (type & typ) == typ;
+        }
     }
 }
 

Race.cs

@@ -2,31 +2,34 @@
 {
     using System;
 
-    public enum Race
+    [Flags]
+    public enum Race : int
     {
+        RACE_WARRIOR = 0x1,
+        RACE_SPELLCASTER = 0x2,
+        RACE_FAIRY = 0x4,
+        RACE_FIEND = 0x8,
+        RACE_ZOMBIE = 0x10,
+        RACE_MACHINE = 0x20,
         RACE_AQUA = 0x40,
+        RACE_PYRO = 0x80,
+        RACE_ROCK = 0x100,
+        RACE_WINDBEAST = 0x200,
+        RACE_PLANT = 0x400,
+        RACE_INSECT = 0x800,
+        RACE_THUNDER = 0x1000,
+        RACE_DRAGON = 0x2000,
         RACE_BEAST = 0x4000,
         RACE_BEASTWARRIOR = 0x8000,
-        RACE_DEVINE = 0x200000,
         RACE_DINOSAUR = 0x10000,
-        RACE_DRAGON = 0x2000,
-        RACE_FAIRY = 4,
-        RACE_FIEND = 8,
         RACE_FISH = 0x20000,
-        RACE_INSECT = 0x800,
-        RACE_MACHINE = 0x20,
-        RACE_PLANT = 0x400,
-        RACE_PSYCHO = 0x100000,
-        RACE_PYRO = 0x80,
-        RACE_REPTILE = 0x80000,
-        RACE_ROCK = 0x100,
         RACE_SEASERPENT = 0x40000,
-        RACE_SPELLCASTER = 2,
-        RACE_THUNDER = 0x1000,
-        RACE_WARRIOR = 1,
-        RACE_WINDBEAST = 0x200,
-        RACE_ZOMBIE = 0x10,
-        RACE_WYRM = 0x800000
+        RACE_REPTILE = 0x80000,
+        RACE_PSYCHO = 0x100000,
+        RACE_DEVINE = 0x200000,
+        RACE_CREATORGOD = 0x400000,
+        RACE_WYRM = 0x800000,
+        RACE_CYBERS = 0x1000000
     }
 }
 

Type.cs

@@ -2,31 +2,34 @@
 {
     using System;
 
-    public enum Type
+    [Flags]
+    public enum Type : int
     {
-        TYPE_CONTINUOUS = 0x20000,
-        TYPE_COUNTER = 0x100000,
-        TYPE_DUAL = 0x800,
+        TYPE_MONSTER = 0x1,
+        TYPE_SPELL = 0x2,
+        TYPE_TRAP = 0x4,
+        TYPE_NORMAL = 0x10,
         TYPE_EFFECT = 0x20,
-        TYPE_EQUIP = 0x40000,
-        TYPE_XYZ = 0x800000,
-        TYPE_FIELD = 0x80000,
-        TYPE_FLIP = 0x200000,
         TYPE_FUSION = 0x40,
-        TYPE_MONSTER = 1,
-        TYPE_NORMAL = 0x10,
-        TYPE_QUICKPLAY = 0x10000,
         TYPE_RITUAL = 0x80,
-        TYPE_SPELL = 2,
+        TYPE_TRAPMONSTER = 0x100,
         TYPE_SPIRIT = 0x200,
-        TYPE_SYNCRO = 0x2000,
+        TYPE_UNION = 0x400,
+        TYPE_DUAL = 0x800,
+        TYPE_TUNER = 0x1000,
+        TYPE_SYNCHRO = 0x2000,
         TYPE_TOKEN = 0x4000,
+        TYPE_QUICKPLAY = 0x10000,
+        TYPE_CONTINUOUS = 0x20000,
+        TYPE_EQUIP = 0x40000,
+        TYPE_FIELD = 0x80000,
+        TYPE_COUNTER = 0x100000,
+        TYPE_FLIP = 0x200000,
         TYPE_TOON = 0x400000,
-        TYPE_TRAP = 4,
-        TYPE_TRAPMONSTER = 0x100,
-        TYPE_TUNER = 0x1000,
-        TYPE_UNION = 0x400,
-        TYPE_PENDULUM = 0x1000000
+        TYPE_XYZ = 0x800000,
+        TYPE_PENDULUM = 0x1000000,
+        TYPE_SPSUMMON = 0x2000000,
+        TYPE_LINK = 0x4000000
     }
 }