1.1.53 type hierarchy update

demodude4u · Feb 3, 2022 · 8585231 · 8585231
1 parent 00234e6
commit 8585231
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 61 deletions.
diff --git a/FactorioDataWrapper/res/exclude-data.json b/FactorioDataWrapper/res/exclude-data.json
@@ -1,11 +1,10 @@
 {
-   "recipes-and-items":[
-      "loader",
-      "fast-loader",
-      "express-loader",
-      "electric-energy-interface",
+	"recipes-and-items":[
+	  "loader",
+	  "fast-loader",
+	  "express-loader",
+	  "electric-energy-interface",
 	  "coin",
-	  "dummy-selection-tool",
 	  "simple-entity-with-force",
 	  "simple-entity-with-owner",
 	  "tank-cannon",
@@ -32,9 +31,9 @@
 	  "linked-chest",
 	  "player-port",
 	  "linked-belt"
-   ],
-    "technologies":[],
-    "fluids":[
+	],
+	"technologies":[],
+	"fluids":[
 	  "fluid-unknown"
 	]
-}
+}
diff --git a/FactorioDataWrapper/res/type-hiearchy.json b/FactorioDataWrapper/res/type-hiearchy.json
@@ -1,32 +1,32 @@
 {
-  "accumulator": "entity-with-health",
+  "accumulator": "entity-with-owner",
   "active-defense-equipment": "equipment",
   "ammo": "item",
   "ammo-category": null,
   "ammo-turret": "turret",
   "armor": "tool",
   "arrow": "entity",
-  "artillery-turret": "entity-with-health",
+  "artillery-turret": "entity-with-owner",
   "assembling-machine": "crafting-machine",
   "autoplace-control": null,
   "battery-equipment": "equipment",
-  "beacon": "entity-with-health",
+  "beacon": "entity-with-owner",
   "belt-immunity-equipment": "equipment",
   "blueprint": "selection-tool",
   "blueprint-book": "item-with-inventory",
-  "boiler": "entity-with-health",
+  "boiler": "entity-with-owner",
   "capsule": "item",
   "car": "vehicle",
   "cargo-wagon": "rolling-stock",
   "combat-robot": "flying-robot",
   "construction-robot": "robot-with-logistic-interface",
-  "container": "entity-with-health",
+  "container": "entity-with-owner",
   "corpse": "entity",
-  "crafting-machine": "entity-with-health",
+  "crafting-machine": "entity-with-owner",
   "curved-rail": "rail",
   "damage-type": null,
   "deconstruction-item": "selection-tool",
-  "electric-pole": "entity-with-health",
+  "electric-pole": "entity-with-owner",
   "electric-turret": "turret",
   "energy-shield-equipment": "equipment",
   "entity": null,
@@ -37,77 +37,75 @@
   "fluid": null,
   "fluid-wagon": "rolling-stock",
   "flying-text": "entity",
-  "flying-robot": "entity-with-health",
+  "flying-robot": "entity-with-owner",
   "furnace": "crafting-machine",
-  "generator": "entity-with-health",
+  "generator": "entity-with-owner",
   "generator-equipment": "equipment",
   "gun": "item",
-  "heat-pipe": "entity-with-health",
-  "inserter": "entity-with-health",
+  "heat-pipe": "entity-with-owner",
+  "inserter": "entity-with-owner",
   "item": null,
   "item-entity": "entity",
   "item-group": null,
   "item-subgroup": null,
   "item-with-inventory": "item-with-label",
   "item-with-label": "item",
-  "lab": "entity-with-health",
-  "lamp": "entity-with-health",
-  "land-mine": "entity-with-health",
+  "lab": "entity-with-owner",
+  "lamp": "entity-with-owner",
+  "land-mine": "entity-with-owner",
   "locomotive": "rolling-stock",
   "logistic-container": "container",
   "logistic-robot": "robot-with-logistic-interface",
   "map-settings": null,
-  "market": "entity-with-health",
-  "mining-drill": "entity-with-health",
+  "market": "entity-with-owner",
+  "mining-drill": "entity-with-owner",
   "mining-tool": "tool",
   "module": "item",
   "movement-bonus-equipment": "equipment",
   "night-vision-equipment": "equipment",
   "noise-layer": null,
   "optimized-particle": null,
-  "pipe": "entity-with-health",
-  "pipe-to-ground": "entity-with-health",
-  "character": "entity-with-health",
-  "player-port": "entity-with-health",
-  "programmable-speaker": "entity-with-health",
+  "pipe": "entity-with-owner",
+  "pipe-to-ground": "entity-with-owner",
+  "character": "entity-with-owner",
+  "player-port": "entity-with-owner",
+  "programmable-speaker": "entity-with-owner",
   "projectile": "entity",
-  "pump": "entity-with-health",
-  "radar": "entity-with-health",
-  "rail": "entity-with-health",
+  "pump": "entity-with-owner",
+  "radar": "entity-with-owner",
+  "rail": "entity-with-owner",
   "rail-remnants": "corpse",
   "rail-signal": "rail-signal-base",
-  "rail-signal-base": "entity-with-health",
-  "reactor": "entity-with-health",
+  "rail-signal-base": "entity-with-owner",
+  "reactor": "entity-with-owner",
   "recipe": null,
   "recipe-category": null,
   "repair-tool": "tool",
   "resource": "entity",
-  "roboport": "entity-with-health",
+  "roboport": "entity-with-owner",
   "robot-with-logistic-interface": "flying-robot",
-  "rocket-defense": "entity-with-health",
   "selection-tool": "item-with-label",
-  "smart-container": "container",
   "smoke": "entity",
-  "solar-panel": "entity-with-health",
+  "solar-panel": "entity-with-owner",
   "solar-panel-equipment": "equipment",
   "splitter": "transport-belt-connectable",
   "sticker": "entity",
   "straight-rail": "rail",
   "technology": null,
   "tile": null,
   "tool": "item",
-  "train-stop": "entity-with-health",
+  "train-stop": "entity-with-owner",
   "rolling-stock": "vehicle",
   "transport-belt": "transport-belt-connectable",
-  "transport-belt-connectable": "entity-with-health",
+  "transport-belt-connectable": "entity-with-owner",
   "tree": "entity-with-health",
-  "turret": "entity-with-health",
+  "turret": "entity-with-owner",
   "underground-belt": "transport-belt-connectable",
-  "unit": "entity-with-health",
-  "unit-spawner": "entity-with-health",
-  "vehicle": "entity-with-health",
+  "unit": "entity-with-owner",
+  "unit-spawner": "entity-with-owner",
+  "vehicle": "entity-with-owner",
   "virtual-signal": null,
-  "wall": "entity-with-health",
+  "wall": "entity-with-owner",
   "achievement": null,
   "build-entity-achievement": "achievement",
   "construct-with-robots-achievement": "achievement",
@@ -126,27 +124,27 @@
   "train-path-achievement": "achievement",
   "ambient-sound": null,
   "arithmetic-combinator": "combinator",
-  "combinator": "entity-with-health",
-  "constant-combinator": "entity-with-health",
+  "combinator": "entity-with-owner",
+  "constant-combinator": "entity-with-owner",
   "decider-combinator": "combinator",
   "fluid-turret": "turret",
   "font": null,
-  "gate": "entity-with-health",
+  "gate": "entity-with-owner",
   "gui-style": null,
   "loader": "transport-belt-connectable",
   "loader-1x1": "transport-belt-connectable",
-  "offshore-pump": "entity-with-health",
-  "power-switch": "entity-with-health",
+  "offshore-pump": "entity-with-owner",
+  "power-switch": "entity-with-owner",
   "rail-chain-signal": "rail-signal-base",
   "resource-category": null,
   "roboport-equipment": "equipment",
   "rocket-silo": "assembling-machine",
-  "storage-tank": "entity-with-health",
+  "storage-tank": "entity-with-owner",
   "item-with-entity-data": "item",
   "simple-entity": "entity-with-health",
   "item-with-tags": "item-with-label",
   "entity-ghost": "entity",
-  "electric-energy-interface": "entity-with-health",
+  "electric-energy-interface": "entity-with-owner",
   "leaf-particle": "particle",
   "flame-thrower-explosion": "explosion",
   "equipment-category": null,
@@ -155,8 +153,8 @@
   "character-corpse": "entity",
   "optimized-decorative": null,
   "smoke-with-trigger": "smoke",
-  "simple-entity-with-force": "entity-with-health",
-  "simple-entity-with-owner": "entity-with-health",
+  "simple-entity-with-force": "simple-entity-with-owner",
+  "simple-entity-with-owner": "entity-with-owner",
   "rocket-silo-rocket-shadow": "entity",
   "rocket-silo-rocket": "entity",
   "item-request-proxy": "entity",
@@ -191,21 +189,21 @@
   "speech-bubble": "entity",
   "mouse-cursor": null,
   "sprite": null,
-  "heat-interface": "entity-with-health",
+  "heat-interface": "entity-with-owner",
   "upgrade-item": "selection-tool",
   "shortcut" : null,
   "trigger-target-type" : null,
   "particle": "entity",
   "custom-input" : null,
   "sound" : null,
-  "burner-generator" : "entity-with-health",
+  "burner-generator" : "entity-with-owner",
   "tile-effect" : null,
   "spidertron-remote" : "item",
   "spider-vehicle" : "vehicle",
   "spider-leg" : "entity-with-health",
-  "linked-container" : "entity-with-health",
+  "linked-container" : "entity-with-owner",
   "tips-and-tricks-item-category" : null,
   "tips-and-tricks-item" : null,
-  "linked-belt" : "transport-belt-connectable"
-
+  "linked-belt" : "transport-belt-connectable",
+  "entity-with-owner": "entity-with-health"
 }