smaller fixes

Author: piebro

README.md

@@ -7,7 +7,7 @@ I love the game Factorio and I really like the look of factories after growing f
 
 All factorio buildings and tiles with their bounding boxes and belt, pipe, rail, inserter, wire and electricity connections can be visualized. Everything is drawn in vector graphics (SVG) to be able to view it in any resolution.
 
-Use the [online demo](https://piebro.github.io/factorio-blueprint-visualizer/) to visualize your own blueprints. With the latest update, Blueprints from Factorio before version 2.0 might not work correctly.
+Use the [online demo](https://piebro.github.io/factorio-blueprint-visualizer/) to visualize your own blueprints. With the latest update, Blueprints from Factorio before version 2.0 might not work correctly. You can import older blueprints to factorio and export them again to update them.
 
 ## Examples
 

blueprintVisualizer.js

@@ -155,6 +155,9 @@ function getCurrentBlueprintEntityCount(currentBlueprint){
  for (const entity of currentBlueprint.entities) {
  entityCount[entity.name] = (entityCount[entity.name] || 0) + 1;
  }
+ for (const tile of currentBlueprint.tiles || []) {
+ entityCount[tile.name] = (entityCount[tile.name] || 0) + 1;
+ }
  return Object.entries(entityCount).sort((a, b) => b[1] - a[1]);
 }
 

drawingSettings.js

@@ -1,23 +1,25 @@
 const EXAMPLE_SETTINGS = [
  ["how to use: https://github.com/piebro/factorio-blueprint-visualizer/blob/master/draw_setting_documentation.md"],
  ["default settings", {'background': '#a2aebb', 'fill': 'none', 'fill-opacity': 1, 'stroke': 'none', 'stroke-linecap': 'round', 'stroke-width': 0.3, 'stroke-opacity': 1, 'scale': 0.85, 'rx': 0.1, 'ry': 0.1}],
- ["tiles", {'fill': '#420217', 'stroke': '#f3ffbd', 'stroke-width': 0.15, 'deny': [], 'scale': 0.7}],
+ ["tiles", {'fill': '#420217', 'stroke': '#f3ffbd', 'stroke-width': 0.15, 'deny': [], 'scale': 0.65}],
 
  ["pipes", {'stroke': '#c84c09'}],
  ["underground-pipes", {'stroke': '#c84c09'}],
  ["belts", {'stroke': '#f3ffbd'}],
  ["underground-belts", {'stroke': '#f3ffbd'}],
  ["inserters", {'stroke': '#f3ffbd'}],
 
- ["bbox", {'fill': '#247ba0', 'deny': ["pipe", "pipe-to-ground", "belts", "inserters", "solar-panel", "accumulator", "asteroid-collector", "cargo-bay", "space-platform-hub", "thruster"]}],
+ ["bbox", {'fill': '#247ba0', 'deny': ["pipe", "pipe-to-ground", "belts", "inserters", "solar-panel", "accumulator", "asteroid-collector", "cargo-bay", "space-platform-hub", "thruster", "rails"]}],
  ["bbox", {'fill': '#ff1654', 'allow': ["solar-panel"]}],
  ["bbox", {'fill': '#436436', 'allow': ["accumulator"]}],
  ["bbox", {'fill': '#70c1b3', 'allow': ["cargo-bay"]}],
- ["bbox", {'fill': '#b2dbbf', 'allow': ["asteroid-collector", "thruster", "space-platform-hub"]}],
+ ["bbox", {'fill': '#b2dbbf', 'allow': ["asteroid-collector", "thruster"]}],
+ ["bbox", {'fill': '#b2dbbf', 'allow': ["space-platform-hub"], "scale": 0.95}],
+ 
+ ["rails", {'stroke': '#c84c09'}],
+ ["heat-pipes", {'stroke': '#c84c09'}],
+ ["power-lines", {'stroke': '#f3ffbd'}], 
 
- ["heat-pipes", {'stroke': '#b2dbbf'}],
- ["power-lines", {'stroke': '#70c1b3'}], 
- ["rails", {'stroke': '#faa275'}],
 ]
 
 const PREDEFINED_COLOR_PALETTES = [

entityProperties.js

@@ -167,14 +167,14 @@ const buildingGenericTerms = {
  "power-generation": ["boiler", "steam-engine", "solar-panel", "nuclear-reactor", "fusion-generator", "fusion-reactor", "steam-turbine"],
  "production": ["accumulator", "agricultural-tower", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "beacon", "big-mining-drill", "biochamber", "biolab", "boiler", "burner-mining-drill", "captive-biter-spawner", "centrifuge", "chemical-plant", "cryogenic-plant", "electric-furnace", "electric-mining-drill", "electromagnetic-plant", "foundry", "fusion-generator", "fusion-reactor", "heat-exchanger", "heat-pipe", "heating-tower", "lab", "lightning-collector", "lightning-rod", "nuclear-reactor", "offshore-pump", "oil-refinery", "pumpjack", "recycler", "solar-panel", "steam-engine", "steam-turbine", "steel-furnace", "stone-furnace"],
  "production-machine": ["assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "biolab", "centrifuge", "chemical-plant", "cryogenic-plant", "electromagnetic-plant", "lab", "oil-refinery"],
+ "rails": ["curved-rail-a", "curved-rail-b", "elevated-curved-rail-a", "elevated-curved-rail-b", "elevated-half-diagonal-rail", "elevated-straight-rail", "half-diagonal-rail", "rail-chain-signal", "rail-ramp", "rail-signal", "rail-support", "straight-rail", "train-stop"],
  "robotic-logistics": ["roboport", "active-provider-chest", "buffer-chest", "passive-provider-chest", "requester-chest", "storage-chest"],
  "smelting-machine": ["electric-furnace", "foundry", "recycler", "steel-furnace", "stone-furnace"],
  "space": ["asteroid-collector", "cargo-bay", "cargo-landing-pad", "crusher", "rocket-silo", "space-platform-hub", "thruster"],
  "space-interactors": ["cargo-landing-pad", "rocket-silo"],
  "space-platform": ["asteroid-collector", "cargo-bay", "crusher", "thruster"],
  "space-related": ["space-platform-hub"],
  "storage": ["iron-chest", "steel-chest", "storage-tank", "wooden-chest"],
- "train-transport": ["curved-rail-a", "curved-rail-b", "elevated-curved-rail-a", "elevated-curved-rail-b", "elevated-half-diagonal-rail", "elevated-straight-rail", "half-diagonal-rail", "rail-chain-signal", "rail-ramp", "rail-signal", "rail-support", "straight-rail", "train-stop"],
  "turret": ["artillery-turret", "flamethrower-turret", "gun-turret", "laser-turret", "railgun-turret", "rocket-turret", "tesla-turret"],
 }
 
@@ -323,10 +323,21 @@ const artificialTilesSortedByLayer = [
  "foundation",
  "stone-path",
  "concrete",
+ "frozen-concrete",
  "hazard-concrete-left",
  "hazard-concrete-right",
  "space-platform-foundation",
+ "frozen-hazard-concrete-left",
+ "frozen-hazard-concrete-right",
  "refined-concrete",
+ "frozen-refined-concrete",
  "refined-hazard-concrete-left",
  "refined-hazard-concrete-right",
+ "frozen-refined-hazard-concrete-left",
+ "frozen-refined-hazard-concrete-right",
+ "ice-platform",
+ "artificial-yumako-soil",
+ "artificial-jellynut-soil",
+ "overgrowth-yumako-soil",
+ "overgrowth-jellynut-soil",
 ]

index.html

@@ -54,10 +54,27 @@
  const isInCodeMirror = event.target.closest('.CodeMirror');
  if (isInCodeMirror) return;
 
- if (event.key === 'ArrowLeft') {
- previousSetting();
- } else if (event.key === 'ArrowRight') {
- nextSetting();
+ switch(event.key) {
+ case 'ArrowLeft':
+ previousSetting();
+ break;
+ case 'ArrowRight':
+ nextSetting();
+ break;
+ case 'ArrowUp':
+ const selectUp = document.getElementById('blueprintSelection');
+ if (selectUp.selectedIndex > 0) {
+ selectUp.selectedIndex--;
+ blueprintSelectionOnChange(selectUp);
+ }
+ break;
+ case 'ArrowDown':
+ const selectDown = document.getElementById('blueprintSelection');
+ if (selectDown.selectedIndex < selectDown.options.length - 1) {
+ selectDown.selectedIndex++;
+ blueprintSelectionOnChange(selectDown);
+ }
+ break;
  }
  });
 

scripts/get_items.py

@@ -36,6 +36,7 @@
 CUSTOM_RENAME_GENERIC_TERMS = {
  "inserter": "inserters", # because inserter is also already an item name
  "belt": "belts",
+ "train-transport": "rails"
 }
 
 
@@ -170,18 +171,13 @@ def get_tile_layers(factorio_json):
  for tile_name, tile_data in factorio_json["tile"].items():
  if tile_name == "landfill":
  tiles.append((tile_name, -1))
- elif (
- "subgroup" in tile_data
- and tile_data["subgroup"] == "artificial-tiles"
- and "layer" in tile_data
- ):
+ elif "minable" in tile_data:
  tiles.append((tile_name, tile_data["layer"]))
 
  # Sort by layer number ascending
  tiles.sort(key=lambda x: x[1])
  return [name for name, _ in tiles]
 
-
 def generate_js_output(sorted_items, pipe_positions, heat_positions, fluid_recipes, tile_layers):
  """Generate JavaScript output strings."""
  js_output = ["// This file is generated by get_items.py\n"]