diff --git a/.gitignore b/.gitignore index 7af470c1..e8abab14 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,7 @@ sharedPlugins/scenario_loader/scenarios sharedPlugins/*/DISABLED \.cache-require-paths\.json + +\.vs/ + +bin/ diff --git a/network map.pptx b/network map.pptx new file mode 100644 index 00000000..d508e4bc Binary files /dev/null and b/network map.pptx differ diff --git a/sharedPlugins/remoteMap/DISABLED b/sharedPlugins/remoteMap/DISABLED deleted file mode 100644 index e69de29b..00000000 diff --git a/sharedPlugins/remoteMap/masterPlugin.js b/sharedPlugins/remoteMap/masterPlugin.js index e96cffa8..4fd54522 100644 --- a/sharedPlugins/remoteMap/masterPlugin.js +++ b/sharedPlugins/remoteMap/masterPlugin.js @@ -80,15 +80,15 @@ class masterPlugin { .split("|") // split into entities .map(str => str.replace("\n","")) // remove newlines that happen at the end of the last entity (maybe more as well???) .filter(str => str.length > 0) // remove blank entities - .filter(str => !str.includes("tree") && // don't send entities that can't be rendered anyways + .filter(str => + // !str.includes("tree") && // don't send entities that can't be rendered anyways !str.includes("dead") && - !str.includes("rock") && + // !str.includes("rock") && !str.includes("crude-oil") && !str.includes("remnants") && !str.includes("cliff") && !str.includes("player") && !str.includes("ore")) - .map(ent => ent.replace(/[-]/g, "_")) // replace - with _ .map(ent => ent.split(",") // split entity into properties .map(prop => [prop.split(":")[0], prop.split(":")[1]]) // split properties into KV pairs ) @@ -97,6 +97,10 @@ class masterPlugin { entity.forEach(property => entityObj[property[0]] = property[1]) return entityObj }) + .map(entity => { + entity.name = entity.name.replace(/[-]/g, "_") // replace - with _ in entity names as thats what factorio.blueprint-editor preffers + return entity + }) .filter(entity => Object.keys(entity).length > 1) ) })