reimport

5 files changed, 204 insertions, 32 deletions

diff --git a/models/global_point.js b/models/global_point.js
index abba690..8bbde9c 100644
--- a/models/global_point.js
+++ b/models/global_point.js
@@ -124,20 +124,104 @@ module.exports = function(sequelize, DataTypes) {
       type: "DOUBLE",
       allowNull: true
     },
-    items: {
-      type: "BLOB",
+    item_001_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_004_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_014_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_015_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_017_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_018_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_020_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     },
-    item_grants: {
-      type: "BLOB",
+    item_024_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     },
-    item_uses: {
-      type: "BLOB",
+    item_025_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     },
-    item_sells: {
-      type: "BLOB",
+    item_026_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_028_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_029_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_039_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_041_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_043_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_048_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_049_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_050_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_057_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_063_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_066_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_068_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_069_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_070_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_071_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     }
   }, {
diff --git a/models/global_point_phase.js b/models/global_point_phase.js
index 41614bb..6be342a 100644
--- a/models/global_point_phase.js
+++ b/models/global_point_phase.js
@@ -184,18 +184,6 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.BIGINT,
       allowNull: false
     },
-    items: {
-      type: "BLOB",
-      allowNull: false
-    },
-    item_grants: {
-      type: "BLOB",
-      allowNull: false
-    },
-    item_sells: {
-      type: "BLOB",
-      allowNull: false
-    },
     ability_a_use: {
       type: DataTypes.BIGINT,
       allowNull: false
@@ -256,12 +244,104 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.BIGINT,
       allowNull: false
     },
-    item_uses: {
-      type: "BLOB",
+    item_001_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_004_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_014_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_015_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     },
-    player_damage: {
-      type: "BLOB",
+    item_017_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_018_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_020_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_024_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_025_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_026_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_028_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_029_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_039_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_041_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_043_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_048_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_049_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_050_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_057_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_063_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_066_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_068_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_069_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_070_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    item_071_use: {
+      type: DataTypes.BIGINT,
       allowNull: false
     }
   }, {
diff --git a/models/item.js b/models/item.js
index 0168c1b..f264de6 100644
--- a/models/item.js
+++ b/models/item.js
@@ -28,13 +28,9 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.STRING(191),
       allowNull: false
     },
-    active: {
-      type: DataTypes.STRING(191),
-      allowNull: false
-    },
-    passive: {
-      type: DataTypes.STRING(191),
-      allowNull: false
+    is_activable: {
+      type: DataTypes.INTEGER(1),
+      allowNull: true
     }
   }, {
     tableName: 'item',
diff --git a/models/tournament.js b/models/tournament.js
index 27de855..81bee88 100644
--- a/models/tournament.js
+++ b/models/tournament.js
@@ -43,6 +43,18 @@ module.exports = function(sequelize, DataTypes) {
     region: {
       type: DataTypes.STRING(191),
       allowNull: true
+    },
+    owner: {
+      type: DataTypes.STRING(191),
+      allowNull: true
+    },
+    registrations_open: {
+      type: DataTypes.INTEGER(1),
+      allowNull: true
+    },
+    roster_locked: {
+      type: DataTypes.INTEGER(1),
+      allowNull: true
     }
   }, {
     tableName: 'tournament',
diff --git a/models/users.js b/models/users.js
index b82ba74..ee05256 100644
--- a/models/users.js
+++ b/models/users.js
@@ -33,7 +33,7 @@ module.exports = function(sequelize, DataTypes) {
       allowNull: true
     },
     access_type: {
-      type: DataTypes.ENUM('free','loyal','plus','premium'),
+      type: DataTypes.ENUM('free','loyal','plus','premium','admin','super_admin'),
       allowNull: false
     }
   }, {