reimport

7 files changed, 133 insertions, 21 deletions

diff --git a/generate_model.js b/generate_model.js
index 9ee0a39..1744bc6 100644
--- a/generate_model.js
+++ b/generate_model.js
@@ -2,7 +2,7 @@
 
 var SequelizeAuto = require("sequelize-auto")
 
-var auto = new SequelizeAuto("vaintest", "vaintest", "vaintest", {
+var auto = new SequelizeAuto("vainweb", "vain", "vain", {
     host: "localhost",
     dialect: "mariadb",
     directory: "models",
diff --git a/models/event.js b/models/event.js
index b651e97..7173acc 100644
--- a/models/event.js
+++ b/models/event.js
@@ -48,11 +48,11 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.INTEGER(11),
       allowNull: true
     },
-    win_points: {
+    round: {
       type: DataTypes.INTEGER(11),
       allowNull: true
     },
-    bonus_points: {
+    position: {
       type: DataTypes.INTEGER(11),
       allowNull: true
     }
diff --git a/models/global_point.js b/models/global_point.js
index c5eefe3..4bb5de5 100644
--- a/models/global_point.js
+++ b/models/global_point.js
@@ -230,7 +230,7 @@ module.exports = function(sequelize, DataTypes) {
     },
     item_072_use: {
       type: DataTypes.BIGINT,
-      allowNull: false
+      allowNull: true
     }
   }, {
     tableName: 'global_point',
diff --git a/models/global_point_hero_vs_hero.js b/models/global_point_hero_vs_hero.js
index bb84307..34ebbff 100644
--- a/models/global_point_hero_vs_hero.js
+++ b/models/global_point_hero_vs_hero.js
@@ -230,7 +230,7 @@ module.exports = function(sequelize, DataTypes) {
     },
     item_072_use: {
       type: DataTypes.BIGINT,
-      allowNull: false
+      allowNull: true
     }
   }, {
     tableName: 'global_point_hero_vs_hero',
diff --git a/models/participant_phases.js b/models/participant_phases.js
index 4ada1db..dad65dd 100644
--- a/models/participant_phases.js
+++ b/models/participant_phases.js
@@ -252,18 +252,6 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.INTEGER(11),
       allowNull: true
     },
-    items: {
-      type: "BLOB",
-      allowNull: false
-    },
-    item_grants: {
-      type: "BLOB",
-      allowNull: false
-    },
-    item_sells: {
-      type: "BLOB",
-      allowNull: false
-    },
     ability_a_use: {
       type: DataTypes.INTEGER(5).UNSIGNED,
       allowNull: false
@@ -363,6 +351,22 @@ module.exports = function(sequelize, DataTypes) {
     heal_rcvd_healed_other: {
       type: "DOUBLE",
       allowNull: true
+    },
+    item_grants: {
+      type: "BLOB",
+      allowNull: true
+    },
+    item_sells: {
+      type: "BLOB",
+      allowNull: true
+    },
+    items: {
+      type: "BLOB",
+      allowNull: true
+    },
+    item_grants_indorder: {
+      type: "BLOB",
+      allowNull: false
     }
   }, {
     tableName: 'participant_phases',
diff --git a/models/player_point.js b/models/player_point.js
index f7b474e..84b443b 100644
--- a/models/player_point.js
+++ b/models/player_point.js
@@ -123,6 +123,118 @@ module.exports = function(sequelize, DataTypes) {
     impact_score: {
       type: DataTypes.INTEGER(10).UNSIGNED,
       allowNull: true
+    },
+    surrender: {
+      type: DataTypes.BIGINT,
+      allowNull: false
+    },
+    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_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_034_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_053_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
+    },
+    item_072_use: {
+      type: DataTypes.BIGINT,
+      allowNull: false
     }
   }, {
     tableName: 'player_point',
diff --git a/models/team.js b/models/team.js
index 89eec80..eab927f 100644
--- a/models/team.js
+++ b/models/team.js
@@ -21,10 +21,6 @@ module.exports = function(sequelize, DataTypes) {
       allowNull: false,
       defaultValue: sequelize.literal('CURRENT_TIMESTAMP')
     },
-    league_id: {
-      type: DataTypes.BIGINT,
-      allowNull: true
-    },
     name: {
       type: DataTypes.STRING(20),
       allowNull: false