diff --git a/java_parser/src/main/java/yasp/Main.java b/java_parser/src/main/java/yasp/Main.java index b4ad1c54d..2c520f46f 100644 --- a/java_parser/src/main/java/yasp/Main.java +++ b/java_parser/src/main/java/yasp/Main.java @@ -455,7 +455,14 @@ public void processWardEntity(Context ctx, Entity e, boolean entityLeft) entry.x = x; entry.y = y; entry.z = z; - entry.type = isObserver ? "obs" : "sen"; + if (entityLeft) + { + entry.type = isObserver ? "obs_left" : "sen_left"; + } + else + { + entry.type = isObserver ? "obs" : "sen"; + } entry.key = Arrays.toString(pos); entry.entityleft = entityLeft; entry.ehandle = e.getHandle(); diff --git a/processors/populate.js b/processors/populate.js index b1eda8df9..35581c816 100644 --- a/processors/populate.js +++ b/processors/populate.js @@ -7,9 +7,6 @@ function populate(e, container) case 'player_slot': container.players[e.key].player_slot = e.value; break; - case 'log': - container.log.push(JSON.parse(JSON.stringify(e))); - break; case 'chat': container.chat.push(JSON.parse(JSON.stringify(e))); break; @@ -92,5 +89,4 @@ function populate(e, container) break; } } - module.exports = populate; \ No newline at end of file diff --git a/processors/processExpand.js b/processors/processExpand.js index ef10789b0..f8395d753 100644 --- a/processors/processExpand.js +++ b/processors/processExpand.js @@ -428,9 +428,6 @@ function processExpand(entries, meta) var e2 = JSON.parse(JSON.stringify(e)); e2.type = "obs_log"; expand(e2); - var e4 = JSON.parse(JSON.stringify(e)); - e4.type = "log"; - expand(e4); var e3 = JSON.parse(JSON.stringify(e)); //key is a JSON array of position data e3.key = JSON.parse(e3.key); @@ -442,14 +439,11 @@ function processExpand(entries, meta) var e2 = JSON.parse(JSON.stringify(e)); e2.type = "sen_log"; expand(e2); - var e4 = JSON.parse(JSON.stringify(e)); - e4.type = "log"; - expand(e4); var e3 = JSON.parse(JSON.stringify(e)); e3.key = JSON.parse(e3.key); e3.posData = true; expand(e3); - } + }, }; //define the types we want to put into each array //null means all types diff --git a/sql/cassandra.cql b/sql/cassandra.cql index 6de8d3110..5b075cbf6 100644 --- a/sql/cassandra.cql +++ b/sql/cassandra.cql @@ -25,8 +25,7 @@ CREATE TABLE matches ( radiant_gold_adv text, radiant_xp_adv text, teamfights text, - version int, - log text, + version int ); CREATE TABLE player_matches ( diff --git a/sql/create_tables.sql b/sql/create_tables.sql index 8c23cdad4..134bda3f7 100644 --- a/sql/create_tables.sql +++ b/sql/create_tables.sql @@ -37,8 +37,7 @@ CREATE TABLE matches ( radiant_gold_adv integer[], radiant_xp_adv integer[], teamfights json[], - version integer, - log json[] + version integer ); CREATE TABLE player_matches ( diff --git a/util/utility.js b/util/utility.js index 3d436b320..ba4d11fb1 100644 --- a/util/utility.js +++ b/util/utility.js @@ -357,7 +357,6 @@ function getParseSchema() "teamfights": [], "objectives": [], "chat": [], - "log": [], "radiant_gold_adv": [], "radiant_xp_adv": [], "players": Array.apply(null, new Array(10)).map(function()